diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index 78b42622975..668e49c0778 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -154,16 +154,7 @@ NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
 
 CFGFILE=$(OBJDIR)\cmd.cfg
 
-INCS=$(INCS) -I$(DEPTH)\include \
-             -I$(DIST)\include \
-             -I$(PUBLIC)\img \
-             -I$(PUBLIC)\util \
-             -I$(PUBLIC)\coreincl \
-             -I$(PUBLIC)\dbm
-
-!ifndef NO_LAYERS
-INCS=$(INCS) -I$(DEPTH)\lib\liblayer\include
-!endif 
+INCS=$(INCS) -I$(XPDIST)\include -I$(DIST)\include -I$(DEPTH)\include
 
 # Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
 !if "$(MOZ_BITS)" == "16"
diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak
index 88dd975cadf..353880fa25f 100644
--- a/mozilla/config/rules.mak
+++ b/mozilla/config/rules.mak
@@ -229,8 +229,8 @@ $(JAVA_DESTPATH)\$(PACKAGE): $(JAVA_DESTPATH)
 $(JMCSRCDIR):
     -mkdir $(JMCSRCDIR)
 
-$(XPDIST)\public\$(MODULE):
-    -mkdir $(XPDIST:/=\)\public\$(MODULE:/=\)
+$(XPDIST)\include:
+    -mkdir $(XPDIST:/=\)\include
 
 !ifdef IDL_GEN
 #//------------------------------------------------------------------------
@@ -598,11 +598,11 @@ export:: $(JMC_STUBS) $(OBJDIR) $(JMC_OBJS)
 #//
 #//------------------------------------------------------------------------
 !if "$(EXPORTS)" != "$(NULL)"
-export:: $(XPDIST)\public\$(MODULE)
-    for %f in ($(EXPORTS)) do $(MAKE_INSTALL:/=\) %f $(XPDIST:/=\)\public\$(MODULE:/=\)
+export:: $(XPDIST)\include
+    for %f in ($(EXPORTS)) do $(MAKE_INSTALL:/=\) %f $(XPDIST:/=\)\include
 
 clobber::
-    -for %g in ($(EXPORTS)) do $(RM) $(XPDIST:/=\)\public\$(MODULE:/=\)\%g
+    -for %g in ($(EXPORTS)) do $(RM) $(XPDIST:/=\)\include\%g
 clobber_all:: clobber
 !endif # EXPORTS
 
@@ -656,11 +656,11 @@ XPIDL_TYPELIBS=$(XPIDL_TYPELIBS:.\=.\_xpidlgen\)
 .idl{$(XPIDL_GEN_DIR)}.xpt:
         $(XPIDL_PROG) -m typelib $(XPIDL_INCLUDES) -o $* $<
 
-!ifndef XPILD_MODULE
-XPILD_MODULE = $(MODULE)
+!ifndef XPIDL_MODULE
+XPIDL_MODULE = $(MODULE)
 !endif
 
-TYPELIB = $(XPIDL_GEN_DIR)\$(XPILD_MODULE).xpt
+TYPELIB = $(XPIDL_GEN_DIR)\$(XPIDL_MODULE).xpt
 
 $(TYPELIB): $(XPIDL_TYPELIBS)
         @echo +++ make: Creating typelib: $(TYPELIB)
@@ -692,10 +692,10 @@ export:: $(XPDIST)\idl
         @echo.
         -for %i in ($(XPIDLSRCS:/=\)) do $(MAKE_INSTALL) %i $(XPDIST)\idl
 
-export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(XPDIST)\public\$(MODULE)
+export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(XPDIST)\include
         @echo +++ make: exporting generated XPIDL header files
         @echo.
-        -for %i in ($(XPIDL_HEADERS:/=\)) do $(MAKE_INSTALL) %i $(XPDIST)\public\$(MODULE)
+        -for %i in ($(XPIDL_HEADERS:/=\)) do $(MAKE_INSTALL) %i $(XPDIST)\include
 
 !ifndef NO_GEN_XPT
 install:: $(XPIDL_GEN_DIR) $(TYPELIB)
diff --git a/mozilla/dbm/include/Makefile.win b/mozilla/dbm/include/Makefile.win
index 617e71f1c48..51e96b2c286 100644
--- a/mozilla/dbm/include/Makefile.win
+++ b/mozilla/dbm/include/Makefile.win
@@ -46,7 +46,7 @@ MAKE_OBJ_TYPE=EXE
 #// install headers
 #//
 #//------------------------------------------------------------------------
-INSTALL_DIR=$(PUBLIC)\dbm
+INSTALL_DIR=$(XPDIST)\include
 INSTALL_FILE_LIST= nsres.h cdefs.h mcom_db.h ncompat.h winfile.h
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/dom/public/html/makefile.win b/mozilla/dom/public/html/makefile.win
index 54aadb53398..21cb579ee32 100644
--- a/mozilla/dom/public/html/makefile.win
+++ b/mozilla/dom/public/html/makefile.win
@@ -90,8 +90,8 @@ MODULE=dom
 
 include <$(DEPTH)\config\rules.mak>
 
-export:: $(XPDIST)\public\$(MODULE)
-    for %f in ($(EXPORTS2)) do $(MAKE_INSTALL:/=\) %f $(XPDIST:/=\)\public\$(MODULE:/=\)
+export:: $(XPDIST)\include
+    for %f in ($(EXPORTS2)) do $(MAKE_INSTALL:/=\) %f $(XPDIST:/=\)\include
 
 clobber:: $(XPDIST)\public\$(MODULE)
-    -for %g in ($(EXPORTS2)) do $(RM) $(XPDIST:/=\)\public\$(MODULE:/=\)\%g
+    -for %g in ($(EXPORTS2)) do $(RM) $(XPDIST:/=\)\include\%g
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index 7d2f893e5c6..f6a115fd977 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -146,8 +146,8 @@ LLFLAGS= /NODEFAULTLIB msvcirt.lib msvcrt.lib
 
 include <$(DEPTH)\config\rules.mak>
 
-export:: generate
-	$(MAKE_INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)\$(MODULE)
+export:: generate $(XPDIST)\include
+	$(MAKE_INSTALL) $(EXTRA_EXPORTS) $(XPDIST)\include
 
 libs:: generate $(DLL)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
diff --git a/mozilla/include/makefile.win b/mozilla/include/makefile.win
index db7d94c0e43..1676175e919 100644
--- a/mozilla/include/makefile.win
+++ b/mozilla/include/makefile.win
@@ -43,7 +43,7 @@ DEPTH = ..
 #//
 #//------------------------------------------------------------------------
 #INSTALL_FILE_LIST=*.h
-#INSTALL_DIR=$(XPDIST)\public\coreincl
+#INSTALL_DIR=$(XPDIST)\include
 
 #//------------------------------------------------------------------------
 #//
diff --git a/mozilla/js/src/liveconnect/makefile.win b/mozilla/js/src/liveconnect/makefile.win
index 7f2d8a1fce6..d248d2b2d59 100644
--- a/mozilla/js/src/liveconnect/makefile.win
+++ b/mozilla/js/src/liveconnect/makefile.win
@@ -96,7 +96,7 @@ OBJS=                                       \
 #// install headers
 #//
 #//------------------------------------------------------------------------
-INSTALL_DIR=$(PUBLIC)\js
+INSTALL_DIR=$(XPDIST)\include
 INSTALL_FILE_LIST=	\
 	jsjava.h \
 !ifdef MOZ_OJI
diff --git a/mozilla/js/src/makefile.win b/mozilla/js/src/makefile.win
index c017399bad2..bfb7b8d3fc2 100644
--- a/mozilla/js/src/makefile.win
+++ b/mozilla/js/src/makefile.win
@@ -109,7 +109,7 @@ OBJS =					\
 #// install headers
 #//
 #//------------------------------------------------------------------------
-INSTALL_DIR=$(PUBLIC)\js
+INSTALL_DIR=$(XPDIST)\include
 INSTALL_FILE_LIST=	\
 	js.msg		\
 	jsapi.h		\
diff --git a/mozilla/modules/libimg/public/makefile.win b/mozilla/modules/libimg/public/makefile.win
index 35985b8c094..6f2536017e3 100644
--- a/mozilla/modules/libimg/public/makefile.win
+++ b/mozilla/modules/libimg/public/makefile.win
@@ -35,11 +35,7 @@ LOCAL_JMC_SUBDIR = .
 #//------------------------------------------------------------------------
 
 INSTALL_FILE_LIST=*.h 
-!if "$(MOZ_BITS)" != "16"
-INSTALL_DIR=$(PUBLIC)\img
-!else
-INSTALL_DIR=$(PUBLIC)\win16
-!endif
+INSTALL_DIR=$(XPDIST)\include
 
 LCFLAGS		= $(LCFLAGS) /TP
 
diff --git a/mozilla/modules/libimg/public_com/makefile.win b/mozilla/modules/libimg/public_com/makefile.win
index 7207e85040a..c01d6849413 100644
--- a/mozilla/modules/libimg/public_com/makefile.win
+++ b/mozilla/modules/libimg/public_com/makefile.win
@@ -32,11 +32,7 @@ DEPTH = ..\..\..
 #//------------------------------------------------------------------------
 
 INSTALL_FILE_LIST=*.h 
-!if "$(MOZ_BITS)" != "16"
-INSTALL_DIR=$(PUBLIC)\img
-!else
-INSTALL_DIR=$(PUBLIC)\win16
-!endif
+INSTALL_DIR=$(XPDIST)\include
 
 LCFLAGS		= $(LCFLAGS) /TP
 
diff --git a/mozilla/modules/security/freenav/makefile.win b/mozilla/modules/security/freenav/makefile.win
index a544eaf4e34..00b0b84a272 100644
--- a/mozilla/modules/security/freenav/makefile.win
+++ b/mozilla/modules/security/freenav/makefile.win
@@ -78,7 +78,7 @@ LIBRARY	= .\$(OBJDIR)\$(LIBNAME).lib
 #// install headers
 #//
 #//------------------------------------------------------------------------
-INSTALL_DIR=$(PUBLIC)\security
+INSTALL_DIR=$(XPDIST)\include
 INSTALL_FILE_LIST=base64.h cert.h preenc.h seccomon.h secerr.h sechash.h secnav.h secrng.h secstubn.h secstubs.h secstubt.h ssl.h sslerr.h zig.h secprefs.rc rosetta.h
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win
index 7d2f893e5c6..f6a115fd977 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -146,8 +146,8 @@ LLFLAGS= /NODEFAULTLIB msvcirt.lib msvcrt.lib
 
 include <$(DEPTH)\config\rules.mak>
 
-export:: generate
-	$(MAKE_INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)\$(MODULE)
+export:: generate $(XPDIST)\include
+	$(MAKE_INSTALL) $(EXTRA_EXPORTS) $(XPDIST)\include
 
 libs:: generate $(DLL)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
diff --git a/mozilla/sun-java/stubs/include/makefile.win b/mozilla/sun-java/stubs/include/makefile.win
index 42e7a59b641..0bad021f01a 100644
--- a/mozilla/sun-java/stubs/include/makefile.win
+++ b/mozilla/sun-java/stubs/include/makefile.win
@@ -38,11 +38,7 @@ DEPTH= ..\..\..
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" != "16"
-INSTALL_DIR=$(PUBLIC)\java
-!else
-INSTALL_DIR=$(PUBLIC)\win16
-!endif
+INSTALL_DIR=$(XPDIST)\include
 
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/sun-java/stubs/jri/makefile.win b/mozilla/sun-java/stubs/jri/makefile.win
index 62ba493e2f7..9fe4dc084c4 100644
--- a/mozilla/sun-java/stubs/jri/makefile.win
+++ b/mozilla/sun-java/stubs/jri/makefile.win
@@ -38,11 +38,7 @@ DEPTH= ..\..\..
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" != "16"
-INSTALL_DIR=$(PUBLIC)\java
-!else
-INSTALL_DIR=$(PUBLIC)\win16
-!endif
+INSTALL_DIR=$(XPDIST)\include
 
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/sun-java/stubs/src/makefile.win b/mozilla/sun-java/stubs/src/makefile.win
index e4d4ad46db4..f6dee26dbc0 100644
--- a/mozilla/sun-java/stubs/src/makefile.win
+++ b/mozilla/sun-java/stubs/src/makefile.win
@@ -80,11 +80,7 @@ LINCS= $(LINCS) \
 		$(NULL)
 !endif
 
-!if "$(MOZ_BITS)" != "16"
-INSTALL_DIR=$(PUBLIC)\java
-!else
-INSTALL_DIR=$(PUBLIC)\win16
-!endif
+INSTALL_DIR=$(XPDIST)\include
 
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/xpfe/components/history/public/makefile.win b/mozilla/xpfe/components/history/public/makefile.win
index b6c1ee14966..9b2b4c75421 100644
--- a/mozilla/xpfe/components/history/public/makefile.win
+++ b/mozilla/xpfe/components/history/public/makefile.win
@@ -25,10 +25,3 @@ XPIDLSRCS =                   \
 
 include <$(DEPTH)\config\rules.mak>
 
-# XXX Ugh. Because of the MODULE rule, we'd normally install the
-# generated nsIGlobalHistory.h into $(PUBLIC)\history. This rule makes
-# sure it gets installed in $(PUBLIC)\xpfe\components, as well. We
-# really need to get rid of this fragmented include structure crap.
-
-export::
-    $(MAKE_INSTALL) $(XPIDL_GEN_DIR)\nsIGlobalHistory.h $(PUBLIC)\xpfe\components
\ No newline at end of file