diff --git a/mozilla/caps/Makefile.in b/mozilla/caps/Makefile.in
index 45dbe026a18..02c7654ca5f 100644
--- a/mozilla/caps/Makefile.in
+++ b/mozilla/caps/Makefile.in
@@ -21,6 +21,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS =	include src 
+DIRS =	public include src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/caps/include/Makefile.in b/mozilla/caps/include/Makefile.in
index b9bb37993ca..187dd3fdc89 100644
--- a/mozilla/caps/include/Makefile.in
+++ b/mozilla/caps/include/Makefile.in
@@ -23,7 +23,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS	= nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h
+EXPORTS	= nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h nsCCapsManagerFactory.h nsCCapsManager.h
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 8682aa577ec..1000993c514 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -684,6 +684,7 @@ base/src/Makefile
 base/src/unix/Makefile
 base/tests/Makefile
 caps/Makefile
+caps/public/Makefile
 caps/include/Makefile
 caps/src/Makefile
 cmd/Makefile
@@ -796,10 +797,6 @@ modules/progress/Makefile
 modules/progress/public/Makefile
 modules/progress/src/Makefile
 modules/rdf/Makefile
-modules/rdf/classes/Makefile
-modules/rdf/classes/netscape/Makefile
-modules/rdf/classes/netscape/rdf/Makefile
-modules/rdf/classes/netscape/rdf/core/Makefile
 modules/rdf/include/Makefile
 modules/rdf/src/Makefile
 modules/schedulr/Makefile