diff --git a/xpcom/components/nsServiceManager.cpp b/xpcom/components/nsServiceManager.cpp
index 50241ff392e..2a12d24f076 100644
--- a/xpcom/components/nsServiceManager.cpp
+++ b/xpcom/components/nsServiceManager.cpp
@@ -166,7 +166,7 @@ nsServiceManager::nsServiceManager(void)
 }
 
 static PRBool
-DeleteEntry(nsHashKey *aKey, void *aData, void* closure)
+DeleteEntry(nsHashKey *aKey, void *aData)
 {
     nsServiceEntry* entry = (nsServiceEntry*)aData;
     entry->mService->Release();
diff --git a/xpcom/src/Makefile b/xpcom/src/Makefile
index 1838e85eaba..c81976d83f9 100644
--- a/xpcom/src/Makefile
+++ b/xpcom/src/Makefile
@@ -22,6 +22,7 @@ LIBRARY_NAME	= xpcom
 CPPSRCS		= nsDebug.cpp \
 		  nsHashtable.cpp \
 		  nsID.cpp \
+		  nsServiceManager.cpp \
 		  nsSupportsArray.cpp \
 		  nsRepository.cpp \
 		  nsMalloc.cpp \
@@ -36,6 +37,7 @@ EXPORTS		= nsCom.h \
 		  nsIFactory.h \
 		  nsISupports.h \
 		  nsIPtr.h \
+		  nsIServiceManager.h \
 		  nsISupportsArray.h \
 		  nsRepository.h \
 		  nsIEnumerator.h \
diff --git a/xpcom/src/Makefile.in b/xpcom/src/Makefile.in
index 6d95e69c52c..ab52370a5cf 100644
--- a/xpcom/src/Makefile.in
+++ b/xpcom/src/Makefile.in
@@ -27,6 +27,7 @@ LIBRARY_NAME	= xpcom
 CPPSRCS		= nsDebug.cpp \
 		  nsHashtable.cpp \
 		  nsID.cpp \
+		  nsServiceManager.cpp \
 		  nsSupportsArray.cpp \
 		  nsRepository.cpp \
 		  nsMalloc.cpp \
@@ -41,6 +42,7 @@ EXPORTS		= nsCom.h \
 		  nsIFactory.h \
 		  nsISupports.h \
 		  nsIPtr.h \
+		  nsIServiceManager.h \
 		  nsISupportsArray.h \
 		  nsRepository.h \
 		  nsIEnumerator.h \
diff --git a/xpcom/src/nsServiceManager.cpp b/xpcom/src/nsServiceManager.cpp
index 50241ff392e..2a12d24f076 100644
--- a/xpcom/src/nsServiceManager.cpp
+++ b/xpcom/src/nsServiceManager.cpp
@@ -166,7 +166,7 @@ nsServiceManager::nsServiceManager(void)
 }
 
 static PRBool
-DeleteEntry(nsHashKey *aKey, void *aData, void* closure)
+DeleteEntry(nsHashKey *aKey, void *aData)
 {
     nsServiceEntry* entry = (nsServiceEntry*)aData;
     entry->mService->Release();