diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
index 1e312cc1b75..5c4e02395fe 100644
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -35,7 +35,6 @@ CPPSRCS =				\
 	nsHistoryDataSource.cpp		\
 	nsRelatedLinksDataSource.cpp	\
 	nsXULContentSink.cpp		\
-	nsXULDataSource.cpp		\
 	$(NULL)
 
 EXPORTS = \
diff --git a/rdf/datasource/src/makefile.win b/rdf/datasource/src/makefile.win
index 49b95c54b3c..be281b3dd58 100644
--- a/rdf/datasource/src/makefile.win
+++ b/rdf/datasource/src/makefile.win
@@ -30,7 +30,6 @@ CPP_OBJS=\
         .\$(OBJDIR)\nsRelatedLinksDataSource.obj \
         .\$(OBJDIR)\nsLocalStore.obj            \
         .\$(OBJDIR)\nsXULContentSink.obj        \
-        .\$(OBJDIR)\nsXULDataSource.obj         \
 	$(NULL)
 
 # XXX Note the dependency on $(DEPTH)\rdf\base\src: we use rdfutil.h over
diff --git a/rdf/datasource/src/nsFTPDataSource.cpp b/rdf/datasource/src/nsFTPDataSource.cpp
index 62427ca6f9b..0d0bcf4d487 100644
--- a/rdf/datasource/src/nsFTPDataSource.cpp
+++ b/rdf/datasource/src/nsFTPDataSource.cpp
@@ -26,7 +26,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsEnumeratorUtils.h"
 #include "nsString.h"
diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp
index 8fec74a639c..a6eccd66ee6 100644
--- a/rdf/datasource/src/nsFileSystemDataSource.cpp
+++ b/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -28,7 +28,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsString.h"
 #include "nsVoidArray.h"  // XXX introduces dependency on raptorbase
diff --git a/rdf/datasource/src/nsFindDataSource.cpp b/rdf/datasource/src/nsFindDataSource.cpp
index 6d12096e516..33a0b79ff06 100644
--- a/rdf/datasource/src/nsFindDataSource.cpp
+++ b/rdf/datasource/src/nsFindDataSource.cpp
@@ -27,7 +27,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "nsEnumeratorUtils.h"
diff --git a/rdf/datasource/src/nsHistoryDataSource.cpp b/rdf/datasource/src/nsHistoryDataSource.cpp
index 85abdce3534..027ce9bba75 100644
--- a/rdf/datasource/src/nsHistoryDataSource.cpp
+++ b/rdf/datasource/src/nsHistoryDataSource.cpp
@@ -27,7 +27,6 @@
 #include "nscore.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
 #include "nsString.h"
diff --git a/rdf/datasource/src/nsRelatedLinksDataSource.cpp b/rdf/datasource/src/nsRelatedLinksDataSource.cpp
index fc82d4db564..90fa52a2410 100644
--- a/rdf/datasource/src/nsRelatedLinksDataSource.cpp
+++ b/rdf/datasource/src/nsRelatedLinksDataSource.cpp
@@ -27,7 +27,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsEnumeratorUtils.h"
 #include "nsString.h"
diff --git a/rdf/datasource/src/nsXULContentSink.cpp b/rdf/datasource/src/nsXULContentSink.cpp
index b40db98bde1..7ab18528a89 100644
--- a/rdf/datasource/src/nsXULContentSink.cpp
+++ b/rdf/datasource/src/nsXULContentSink.cpp
@@ -49,6 +49,7 @@
 #include "nsIParser.h"
 #include "nsIPresShell.h"
 #include "nsIRDFContainer.h"
+#include "nsIRDFContainerUtils.h"
 #include "nsIRDFDocument.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFService.h"