diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index cba71805c2f5..1dc9f3e9dcb4 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -40,7 +40,6 @@ LOCAL_INCLUDES	= \
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
-		nsDebug.cpp              \
 		$(NULL)
 
 SDK_HEADERS     = \
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
index a0c1f21d3907..c59a20a0cce5 100644
--- a/xpcom/glue/objs.mk
+++ b/xpcom/glue/objs.mk
@@ -36,6 +36,7 @@
 
 XPCOM_GLUE_SRC_LCSRCS =              \
 		nsCOMPtr.cpp         \
+		nsDebug.cpp          \
 		nsGenericFactory.cpp \
 		nsIInterfaceRequestorUtils.cpp \
 		nsMemory.cpp         \
diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
index d96ca7011ad4..ef0035becf8c 100644
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -57,7 +57,6 @@ CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS)     \
 		nsXPCOMGlue.cpp              \
 		nsGREDirServiceProvider.cpp  \
-		nsDebugGlue.cpp		     \
 		$(NULL)
 
 SDK_HEADERS     = \
diff --git a/xpcom/glue/standalone/nsGREDirServiceProvider.cpp b/xpcom/glue/standalone/nsGREDirServiceProvider.cpp
index d765a8cc333a..ce9e94b7fbbd 100644
--- a/xpcom/glue/standalone/nsGREDirServiceProvider.cpp
+++ b/xpcom/glue/standalone/nsGREDirServiceProvider.cpp
@@ -305,8 +305,8 @@ nsGREDirServiceProvider::AddGRELocationToPath()
 
   mPathEnvString = PR_smprintf("%s=%s;%s",
                                XPCOM_SEARCH_KEY,
-                               path,
-                               grePath);
+                               grePath,
+                               path);
   PR_SetEnv(mPathEnvString);
   free(grePath);
 }