diff --git a/config/config.mak b/config/config.mak
index 62ab33571fb..cdf7ef86e64 100644
--- a/config/config.mak
+++ b/config/config.mak
@@ -285,10 +285,6 @@ NECKO=1
 CFLAGS=$(CFLAGS) -DNECKO
 
 
-!if defined(XPCOM_STANDALONE)
-CFLAGS=$(CFLAGS) -DXPCOM_STANDALONE
-!endif
-
 !if defined(XPCONNECT_STANDALONE)
 CFLAGS=$(CFLAGS) -DXPCONNECT_STANDALONE
 !endif
diff --git a/netwerk/test/PropertiesTest.cpp b/netwerk/test/PropertiesTest.cpp
index 75d8a70c187..c10de1af714 100644
--- a/netwerk/test/PropertiesTest.cpp
+++ b/netwerk/test/PropertiesTest.cpp
@@ -36,8 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef XPCOM_STANDALONE
-
 #include "nsXPCOM.h"
 #include "nsIEventQueueService.h"
 #include "nsIPersistentProperties2.h"
@@ -62,11 +60,9 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
 /***************************************************************************/
 
-#endif
 int
 main(int argc, char* argv[])
 {
-#ifndef XPCOM_STANDALONE
   nsresult ret;
 
 
@@ -180,6 +176,5 @@ main(int argc, char* argv[])
     delete[] pVal;
 	  ret = propEnum->Next();
   }
-#endif
   return 0;
 }
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index f305bcc9c03..06c4a8bbc20 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -58,10 +58,6 @@ CPPSRCS		= \
 		nsNativeCharsetUtils.cpp \
 		$(NULL)
 
-#ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
-#CPPSRCS		+= nsLocalFileUnicode.cpp
-#endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS		+= nsLocalFileOS2.cpp
 #else
diff --git a/xpcom/io/nsLocalFileUnicode.cpp b/xpcom/io/nsLocalFileUnicode.cpp
deleted file mode 100644
index e69de29bb2d..00000000000