diff --git a/editor/Makefile.in b/editor/Makefile.in
index 842297cfbc07..01833501190d 100644
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@@ -25,8 +25,8 @@ include $(DEPTH)/config/autoconf.mk
 DIRS = public
 
 ifdef MOZ_EDITOR
-DIRS += core
-# Add "DIRS += guimgr" after building on all platforms
+DIRS += core guimgr
+
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
diff --git a/editor/guimgr/public/Makefile.in b/editor/guimgr/public/Makefile.in
index e8488d216dc7..59fe9243fab1 100644
--- a/editor/guimgr/public/Makefile.in
+++ b/editor/guimgr/public/Makefile.in
@@ -26,7 +26,7 @@ DEFINES =
 
 EXPORTS =               \
     nsIEditGuiManager.h \
-    nsIGuiMgrFactory.h  \
+    nsIGuiManagerFactory.h  \
     $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/editor/guimgr/src/Makefile.in b/editor/guimgr/src/Makefile.in
index 26cf961d4f57..cd839b419bf3 100644
--- a/editor/guimgr/src/Makefile.in
+++ b/editor/guimgr/src/Makefile.in
@@ -27,7 +27,7 @@ LIBRARY_NAME = editguimgr
 
 CPPSRCS =                   \
 	nsEditGuiManager.cpp	\
-	nsEditGuiManagerFactory.cpp \
+	nsGuiManagerFactory.cpp \
     $(NULL)
 
 MODULE = editguimgr