diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 2df925d4d3a3..6309875ec91b 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -95,7 +95,6 @@ EXPORTS		= \
 		nsStubImageDecoderObserver.h \
 		nsStubMutationObserver.h \
 		nsTextFragment.h \
-		nsTObserverArray.h \
 		$(NULL)
 
 CPPSRCS		= \
@@ -130,7 +129,7 @@ CPPSRCS		= \
 		nsGkAtoms.cpp \
 		nsHTMLContentSerializer.cpp \
 		nsImageLoadingContent.cpp \
-                nsLineBreaker.cpp \
+		nsLineBreaker.cpp \
 		nsLoadListenerProxy.cpp \
 		nsMappedAttributes.cpp \
 		nsNameSpaceManager.cpp \
@@ -153,7 +152,6 @@ CPPSRCS		= \
 		nsSyncLoadService.cpp \
 		nsTextFragment.cpp \
 		nsTextNode.cpp \
-		nsTObserverArray.cpp \
 		nsTreeWalker.cpp \
 		nsXMLContentSerializer.cpp \
 		nsXMLHttpRequest.cpp \
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index 9e1756d18244..67b2c8c9ea78 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -109,6 +109,7 @@ SDK_HEADERS = \
 		nsServiceManagerUtils.h \
 		nsVersionComparator.h \
 		nsIClassInfoImpl.h \
+		nsTObserverArray.h \
 		$(NULL)
 
 EXPORTS = \
diff --git a/content/base/src/nsTObserverArray.cpp b/xpcom/glue/nsTObserverArray.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from content/base/src/nsTObserverArray.cpp
rename to xpcom/glue/nsTObserverArray.cpp
diff --git a/content/base/src/nsTObserverArray.h b/xpcom/glue/nsTObserverArray.h
old mode 100755
new mode 100644
similarity index 98%
rename from content/base/src/nsTObserverArray.h
rename to xpcom/glue/nsTObserverArray.h
index b53ad0f509a4..2a8bcbd46c73
--- a/content/base/src/nsTObserverArray.h
+++ b/xpcom/glue/nsTObserverArray.h
@@ -40,7 +40,7 @@
 
 #include "nsVoidArray.h"
 
-class nsTObserverArray_base {
+class NS_COM_GLUE nsTObserverArray_base {
   public:
     class Iterator_base;
     friend class Iterator_base;
@@ -169,7 +169,7 @@ class nsTObserverArray : public nsTObserverArray_base {
       return mObservers.Count() == 0;
     }
 
-    T* SafeObserverAt(PRInt32 aIndex) {
+    T* SafeObserverAt(PRInt32 aIndex) const {
       return NS_STATIC_CAST(T*, mObservers.SafeElementAt(aIndex));
     }
 
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
index ed6d865ed499..72dd772031a0 100644
--- a/xpcom/glue/objs.mk
+++ b/xpcom/glue/objs.mk
@@ -63,6 +63,7 @@ XPCOM_GLUE_SRC_LCPPSRCS =        \
   nsVoidArray.cpp                \
   nsTArray.cpp                   \
   nsThreadUtils.cpp              \
+  nsTObserverArray.cpp           \
   $(NULL)
 
 XPCOM_GLUE_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/, $(XPCOM_GLUE_SRC_LCPPSRCS))