diff --git a/mozilla/string/public/Makefile.in b/mozilla/string/public/Makefile.in
index 83af26ed3c2..37fe4778b66 100644
--- a/mozilla/string/public/Makefile.in
+++ b/mozilla/string/public/Makefile.in
@@ -31,18 +31,23 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= string
 
 SDK_HEADERS =  \
+		nsAlgorithm.h			\
 		nsAString.h			\
 		nsBufferHandle.h		\
+		nsCharTraits.h			\
+		nsStringDefines.h		\
 		nsStringFragment.h		\
+		nsStringFwd.h			\
+		nsStringIterator.h		\
+		nsStringIteratorUtils.h		\
+		nsStringTraits.h		\
 		$(NULL)
 
 EXPORTS		=				\
 		nsAFlatString.h			\
-		nsAlgorithm.h			\
 		nsASingleFragmentString.h	\
 		nsAStringGenerator.h		\
 		nsBufferHandleUtils.h		\
-		nsCharTraits.h			\
 		nsDependentConcatenation.h	\
 		nsDependentString.h		\
 		nsDependentSubstring.h		\
@@ -54,11 +59,6 @@ EXPORTS		=				\
 		nsSharableString.h		\
 		nsSharedBufferList.h		\
 		nsSlidingString.h		\
-		nsStringDefines.h		\
-		nsStringFwd.h			\
-		nsStringIterator.h		\
-		nsStringIteratorUtils.h		\
-		nsStringTraits.h		\
 		nsXPIDLString.h			\
 		$(NULL)			
 
diff --git a/mozilla/string/public/nsAString.h b/mozilla/string/public/nsAString.h
index 1f946e4bd47..a755d21fd87 100644
--- a/mozilla/string/public/nsAString.h
+++ b/mozilla/string/public/nsAString.h
@@ -810,8 +810,10 @@ operator> ( const nsACString& lhs, const nsACString& rhs )
   }
 
   // Once you've got strings, you shouldn't need to do anything else to have concatenation
+#ifndef XPCOM_GLUE
 #ifndef nsDependentConcatenation_h___
 #include "nsDependentConcatenation.h"
 #endif
+#endif 
 
 #endif // !defined(nsAString_h___)
diff --git a/mozilla/xpcom/string/public/Makefile.in b/mozilla/xpcom/string/public/Makefile.in
index 83af26ed3c2..37fe4778b66 100644
--- a/mozilla/xpcom/string/public/Makefile.in
+++ b/mozilla/xpcom/string/public/Makefile.in
@@ -31,18 +31,23 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= string
 
 SDK_HEADERS =  \
+		nsAlgorithm.h			\
 		nsAString.h			\
 		nsBufferHandle.h		\
+		nsCharTraits.h			\
+		nsStringDefines.h		\
 		nsStringFragment.h		\
+		nsStringFwd.h			\
+		nsStringIterator.h		\
+		nsStringIteratorUtils.h		\
+		nsStringTraits.h		\
 		$(NULL)
 
 EXPORTS		=				\
 		nsAFlatString.h			\
-		nsAlgorithm.h			\
 		nsASingleFragmentString.h	\
 		nsAStringGenerator.h		\
 		nsBufferHandleUtils.h		\
-		nsCharTraits.h			\
 		nsDependentConcatenation.h	\
 		nsDependentString.h		\
 		nsDependentSubstring.h		\
@@ -54,11 +59,6 @@ EXPORTS		=				\
 		nsSharableString.h		\
 		nsSharedBufferList.h		\
 		nsSlidingString.h		\
-		nsStringDefines.h		\
-		nsStringFwd.h			\
-		nsStringIterator.h		\
-		nsStringIteratorUtils.h		\
-		nsStringTraits.h		\
 		nsXPIDLString.h			\
 		$(NULL)			
 
diff --git a/mozilla/xpcom/string/public/nsAString.h b/mozilla/xpcom/string/public/nsAString.h
index 1f946e4bd47..a755d21fd87 100644
--- a/mozilla/xpcom/string/public/nsAString.h
+++ b/mozilla/xpcom/string/public/nsAString.h
@@ -810,8 +810,10 @@ operator> ( const nsACString& lhs, const nsACString& rhs )
   }
 
   // Once you've got strings, you shouldn't need to do anything else to have concatenation
+#ifndef XPCOM_GLUE
 #ifndef nsDependentConcatenation_h___
 #include "nsDependentConcatenation.h"
 #endif
+#endif 
 
 #endif // !defined(nsAString_h___)