diff --git a/mozilla/content/xul/document/public/nsIController.idl b/mozilla/content/xul/document/public/nsIController.idl
index 7fc947e2190..b7e0b1d0c6b 100644
--- a/mozilla/content/xul/document/public/nsIController.idl
+++ b/mozilla/content/xul/document/public/nsIController.idl
@@ -17,9 +17,11 @@
  */
 
 #include "nsISupports.idl"
-interface nsIDOMXULFocusTracker;
+interface nsIDOMXULCommandDispatcher;
 
 [scriptable, uuid(D5B61B82-1DA4-11d3-BF87-00105A1B0627)]
 interface nsIController : nsISupports {
-	attribute nsIDOMXULFocusTracker focusTracker;
+	attribute nsIDOMXULCommandDispatcher commandDispatcher;
+	boolean IsCommandEnabled(in string command);
+	void DoCommand(in string command);
 };
diff --git a/mozilla/rdf/base/idl/nsIController.idl b/mozilla/rdf/base/idl/nsIController.idl
index 7fc947e2190..b7e0b1d0c6b 100644
--- a/mozilla/rdf/base/idl/nsIController.idl
+++ b/mozilla/rdf/base/idl/nsIController.idl
@@ -17,9 +17,11 @@
  */
 
 #include "nsISupports.idl"
-interface nsIDOMXULFocusTracker;
+interface nsIDOMXULCommandDispatcher;
 
 [scriptable, uuid(D5B61B82-1DA4-11d3-BF87-00105A1B0627)]
 interface nsIController : nsISupports {
-	attribute nsIDOMXULFocusTracker focusTracker;
+	attribute nsIDOMXULCommandDispatcher commandDispatcher;
+	boolean IsCommandEnabled(in string command);
+	void DoCommand(in string command);
 };
diff --git a/mozilla/rdf/base/idl/nsIGenericCommandSet.idl b/mozilla/rdf/base/idl/nsIGenericCommandSet.idl
deleted file mode 100644
index c97934c2ec8..00000000000
--- a/mozilla/rdf/base/idl/nsIGenericCommandSet.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(D5B61B81-1DA4-11d3-BF87-00105A1B0627)]
-interface nsIGenericCommandSet : nsISupports {
-    boolean IsCommandEnabled(in string command);
-	void DoCommand(in string command);
-};