diff --git a/rdf/include/Makefile b/rdf/include/Makefile
index f090034f360..e69de29bb2d 100644
--- a/rdf/include/Makefile
+++ b/rdf/include/Makefile
@@ -1,38 +0,0 @@
-#!gmake
-#
-# 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.
-
-#
-# 
-#
-
-MODULE	= rdf
-DEPTH	= ../..
-EXPORTS	= \
-	rdf.h 			\
-	rdfc.h 			\
-	htrdf.h 		\
-	vocab.h			\
-	jsec2rdf.h		\
-	nsIRDFService.h 	\
-	nsIRDFDataSource.h	\
-	nsIRDFDataBase.h	\
-	nsIRDFCursor.h		\
-	nsIRDFObserver.h	\
-	nsRDFCIDs.h		\
-	$(NULL)
-
-include $(DEPTH)/config/rules.mk
diff --git a/rdf/include/makefile.win b/rdf/include/makefile.win
index f4d72c95434..713861575c6 100644
--- a/rdf/include/makefile.win
+++ b/rdf/include/makefile.win
@@ -28,7 +28,7 @@ EXPORTS	= rdf.h \
 	nsIRDFDataBase.h \
 	nsIRDFObserver.h \
 	nsIRDFCursor.h \
-        nsRDFCIDs.h \
+        nsRDFCID.h \
 	htrdf.h \
 	vocab.h \
 	jsec2rdf.h \
diff --git a/rdf/include/nsRDFCID.h b/rdf/include/nsRDFCID.h
new file mode 100644
index 00000000000..3ba1f54e5a5
--- /dev/null
+++ b/rdf/include/nsRDFCID.h
@@ -0,0 +1,31 @@
+/* -*- 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.
+ */
+
+#ifndef nsRDFCID_h__
+#define nsRDFCID_h__
+
+// {2564E6E0-79C9-11d2-B51D-000000000000}
+#define NS_RDFTREEDATAMODEL_CID \
+{ 0x2564e6e0, 0x79c9, 0x11d2, { 0xb5, 0x1d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+// {6B13A9C0-79C9-11d2-B51D-000000000000}
+#define NS_RDFTOOLBARDATAMODEL_CID \
+{ 0x6b13a9c0, 0x79c9, 0x11d2, { 0xb5, 0x1d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+
+#endif // nsRDFCID_h__
diff --git a/rdf/include/nsRDFCIDs.h b/rdf/include/nsRDFCIDs.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/rdf/src/nsRDFFactory.cpp b/rdf/src/nsRDFFactory.cpp
index cee3ad3285a..dc3a495804c 100644
--- a/rdf/src/nsRDFFactory.cpp
+++ b/rdf/src/nsRDFFactory.cpp
@@ -20,7 +20,7 @@
 #include "nsIFactory.h"
 #include "nsRDFTreeDataModel.h"
 #include "nsRDFToolbarDataModel.h"
-#include "nsRDFCIDs.h"
+#include "nsRDFCID.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);