remove PCH support in dmake-module

68 files changed, 38 insertions, 453 deletions

diff --git a/accessibility/inc/makefile.mk b/accessibility/inc/makefile.mk
index 3afcad166928..4d0eb53daa47 100644
--- a/accessibility/inc/makefile.mk
+++ b/accessibility/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
index 00f08bda77c7..b126f0fabdea 100644
--- a/autodoc/source/mkinc/fullcpp.mk
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -39,17 +39,3 @@ CFLAGS+= -GR
     "$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
 CFLAGSCXX+= -frtti
 .ENDIF
-
-
-
-# Precompiled Headers
-.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
-
-PCH_NAME=autodoc
-.IF "$(debug)"==""
-CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd
-.ENDIF
-
-.ENDIF  # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
diff --git a/bridges/inc/makefile.mk b/bridges/inc/makefile.mk
index de828a78479f..a7ab4cd1d086 100644
--- a/bridges/inc/makefile.mk
+++ b/bridges/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
 
 .INCLUDE :  target.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/cli_ure/inc/makefile.mk b/cli_ure/inc/makefile.mk
index 09c36cba2db2..8f13775a7725 100644
--- a/cli_ure/inc/makefile.mk
+++ b/cli_ure/inc/makefile.mk
@@ -38,11 +38,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/codemaker/inc/makefile.mk b/codemaker/inc/makefile.mk
index 99789bfe38da..8d7b0a7af7cd 100644
--- a/codemaker/inc/makefile.mk
+++ b/codemaker/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
 
 .INCLUDE :  target.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 3dd2fc4d4811..57c635fe0c33 100755
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
@@ -33,6 +33,3 @@ VISIBILITY_HIDDEN = TRUE
 .INCLUDE: settings.mk
 .INCLUDE: target.mk
 
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
-.ENDIF
diff --git a/configure.in b/configure.in
index 4ddf3654dcf4..2f8cf7ff03d4 100644
--- a/configure.in
+++ b/configure.in
@@ -2639,7 +2639,7 @@ AC_SUBST(HYPH_SYSTEM_DIR)
 AC_SUBST(THES_SYSTEM_DIR)
 
 dnl ===================================================================
-dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
+dnl ENABLE_PCH i now a no-op
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable pch feature])
 AC_MSG_RESULT([no, obsolete])
diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 51a3f225b30a..86bf408ed793 100755
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk
index 3103f63571d4..4c800586c674 100644
--- a/cosv/source/fullcpp.mk
+++ b/cosv/source/fullcpp.mk
@@ -36,18 +36,6 @@
 # RTTI
 CFLAGS+= -GR
 
-.IF "$(NP_LOCALBUILD)"!=""
-
-# Precompiled Headers
-PCH_NAME=  cosv
-.IF "$(DBG_LEVEL)"<"2"
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
-.ENDIF
-
-.ENDIF
-
 .ENDIF
 
 .IF "$(COM)"=="GCC"
diff --git a/cppu/inc/makefile.mk b/cppu/inc/makefile.mk
index 47a2532efc68..e8f3eba9fb1a 100644
--- a/cppu/inc/makefile.mk
+++ b/cppu/inc/makefile.mk
@@ -38,11 +38,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/cppuhelper/inc/makefile.mk b/cppuhelper/inc/makefile.mk
index 0208c0dbf93d..5b85c1fb7332 100644
--- a/cppuhelper/inc/makefile.mk
+++ b/cppuhelper/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 54341a3f75d4..bd2f191f3e2d 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -37,12 +37,6 @@ VISIBILITY_HIDDEN := TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# TODO:  On Windows, test_dp_version.cxx fails due to BOOL redefinition between
-# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this
-# hack to temporarily disable PCH will become unnecessary with the fix for issue
-# 112600:
-CFLAGSCXX += -DDISABLE_PCH_HACK
-
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_dp_version.obj
 SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
index 29b98e89a4f4..060094cf563d 100755
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=embeddedobj
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/extensions/inc/makefile.mk b/extensions/inc/makefile.mk
index 9ea45ec08e14..82d75bea7f8b 100644
--- a/extensions/inc/makefile.mk
+++ b/extensions/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/filter/inc/makefile.mk b/filter/inc/makefile.mk
index ae44f91ba667..fe07083fcee5 100644
--- a/filter/inc/makefile.mk
+++ b/filter/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
index 8d04d47bc375..46244439f075 100644
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/idlc/inc/makefile.mk b/idlc/inc/makefile.mk
index e912e1defb35..07d7afadfe8e 100644
--- a/idlc/inc/makefile.mk
+++ b/idlc/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/io/inc/makefile.mk b/io/inc/makefile.mk
index e327f58d0e22..1a0bae8da30d 100644
--- a/io/inc/makefile.mk
+++ b/io/inc/makefile.mk
@@ -38,12 +38,3 @@ TARGET=inc
 .ENDIF 		# L10N_framework
 
 .INCLUDE :  target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-.ENDIF 		# L10N_framework
-
diff --git a/javaunohelper/inc/makefile.mk b/javaunohelper/inc/makefile.mk
index b9f61c2e18d7..072e7df13332 100644
--- a/javaunohelper/inc/makefile.mk
+++ b/javaunohelper/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/inc/makefile.mk
index 8acb7b245357..3aec902c90e9 100644
--- a/jvmfwk/inc/makefile.mk
+++ b/jvmfwk/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/l10ntools/inc/makefile.mk b/l10ntools/inc/makefile.mk
index ce0925c51b26..8d628b14e43a 100644
--- a/l10ntools/inc/makefile.mk
+++ b/l10ntools/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
 
 .INCLUDE :  target.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/lingucomponent/inc/makefile.mk b/lingucomponent/inc/makefile.mk
index bf9eb26a3585..ca92f6c28a79 100644
--- a/lingucomponent/inc/makefile.mk
+++ b/lingucomponent/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/odk/inc/makefile.mk b/odk/inc/makefile.mk
index c22fda1d96e2..47ac06c4ded2 100644
--- a/odk/inc/makefile.mk
+++ b/odk/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/registry/inc/makefile.mk b/registry/inc/makefile.mk
index 1a212316147a..203cb8582424 100644
--- a/registry/inc/makefile.mk
+++ b/registry/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sal/inc/makefile.mk b/sal/inc/makefile.mk
index 19d6b36fe084..c1eadac3cb42 100644
--- a/sal/inc/makefile.mk
+++ b/sal/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index e76388af7ff4..efd011fa0b60 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -32,10 +32,6 @@ TARGET=oslall
 ENABLE_EXCEPTIONS=TRUE
 USE_LDUMP2=TRUE
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
 MULTITHREAD_OBJ=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 2ec11e16f58b..58d496f6e7d6 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -35,10 +35,6 @@ TARGET=cpposl
 .ENDIF
 USE_LDUMP2=TRUE
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
 TARGETTYPE=CUI
 
 ENABLE_EXCEPTIONS=TRUE
diff --git a/sal/osl/w32/makefile.mk b/sal/osl/w32/makefile.mk
index 08e8745a9dcd..7b40397a3904 100644
--- a/sal/osl/w32/makefile.mk
+++ b/sal/osl/w32/makefile.mk
@@ -32,10 +32,6 @@ TARGET=cpposl
 ENABLE_EXCEPTIONS=TRUE
 USE_LDUMP2=TRUE
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
 MULTITHREAD_OBJ=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 60953f84b919..83cb0ed23df2 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -32,10 +32,6 @@ TARGET=cpprtl
 ENABLE_EXCEPTIONS=TRUE
 USE_LDUMP2=TRUE
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
 TARGETTYPE=CUI
 
 # --- Settings -----------------------------------------------------
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
index 45c81ca14582..e3ad66f8fa4f 100644
--- a/scp2/source/accessories/makefile.mk
+++ b/scp2/source/accessories/makefile.mk
@@ -28,8 +28,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=accessories
 TARGETTYPE=CUI
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index fb4342e4a891..b058351ae310 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=activex
 TARGETTYPE=CUI
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index ead15b19776c..3386005f5138 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=base
 TARGETTYPE=CUI
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
index f7882a3041b1..9a8c0a5e90dd 100644
--- a/scp2/source/binfilter/makefile.mk
+++ b/scp2/source/binfilter/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=binfilter
 TARGETTYPE=CUI
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index e049057f7335..3a1fa4768058 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=calc
 TARGETTYPE=CUI
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 442f21266a08..7ce0257c58a4 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=canvas
 TARGETTYPE=CUI
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index 5e8101488270..925b9a697202 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=crashrep
 TARGETTYPE=CUI
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
index 605300dad7ca..740fc100da13 100644
--- a/scp2/source/draw/makefile.mk
+++ b/scp2/source/draw/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=draw
 TARGETTYPE=CUI
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
index 00b23aeec030..a2c6299d8d6e 100644
--- a/scp2/source/extensions/makefile.mk
+++ b/scp2/source/extensions/makefile.mk
@@ -29,8 +29,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=extensions
 TARGETTYPE=CUI
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 43c2440695a9..eb9120dbe4cc 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=gnome
 TARGETTYPE=CUI
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
index 522a22d36b28..00514837d294 100644
--- a/scp2/source/graphicfilter/makefile.mk
+++ b/scp2/source/graphicfilter/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=graphicfilter
 TARGETTYPE=CUI
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a67e8608ab6..44bbc2f4f32f 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=impress
 TARGETTYPE=CUI
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
index 49f50ab16162..05be4d6e2f6e 100644
--- a/scp2/source/javafilter/makefile.mk
+++ b/scp2/source/javafilter/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=javafilter
 TARGETTYPE=CUI
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 32d713812ee9..02323ff57b3b 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=kde
 TARGETTYPE=CUI
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
index b622097ee65d..055e3a93e238 100644
--- a/scp2/source/math/makefile.mk
+++ b/scp2/source/math/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=math
 TARGETTYPE=CUI
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
index 4b3ce930483f..dd14e9bd910b 100644
--- a/scp2/source/onlineupdate/makefile.mk
+++ b/scp2/source/onlineupdate/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=update
 TARGETTYPE=CUI
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 2a89eca10f85..be79403524c8 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -26,8 +26,6 @@
 #*************************************************************************
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=ooo
 TARGETTYPE=CUI
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index f3bff44cb582..dffc045ab05e 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=python
 TARGETTYPE=CUI
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
index 283d220733e3..bb40db2a24ff 100644
--- a/scp2/source/quickstart/makefile.mk
+++ b/scp2/source/quickstart/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=quickstart
 TARGETTYPE=CUI
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
index edcad2e17abe..debb27f20d62 100644
--- a/scp2/source/testtool/makefile.mk
+++ b/scp2/source/testtool/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=testtool
 TARGETTYPE=CUI
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 0c193c21538a..98b716b37e77 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=winexpext
 TARGETTYPE=CUI
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
index 136079bec377..6fd453df0373 100644
--- a/scp2/source/writer/makefile.mk
+++ b/scp2/source/writer/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=writer
 TARGETTYPE=CUI
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
index a9c6c9f77888..5c586f2542b9 100644
--- a/scp2/source/xsltfilter/makefile.mk
+++ b/scp2/source/xsltfilter/makefile.mk
@@ -27,8 +27,6 @@
 
 PRJ=..$/..
 
-PRJPCH=
-
 PRJNAME=scp2
 TARGET=xsltfilter
 TARGETTYPE=CUI
diff --git a/sdext/inc/makefile.mk b/sdext/inc/makefile.mk
index 637bde83fa99..8851cad25f8c 100644
--- a/sdext/inc/makefile.mk
+++ b/sdext/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk
index c297cb4f77e9..0cef5fadb652 100755
--- a/shell/inc/makefile.mk
+++ b/shell/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index cc2d8dfa62c5..67008452e9ee 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -32,11 +32,11 @@ $(OBJ)/%.obj : %.cxx
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-.IF "$(noadjust)"==""   
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(noadjust)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(noadjust)"==""   
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(noadjust)"==""
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
@@ -56,9 +56,9 @@ $(OBJ)/%.obj : %.cpp
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
@@ -78,9 +78,9 @@ $(OBJ)/%.obj : %.cc
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@$(RM) $@
@@ -91,70 +91,26 @@ $(OBJ)/%.obj : %.cc
 .ENDIF
 .ENDIF
 
-.IF "$(ENABLE_PCH)"!=""
-PCHOUTDIR=$(SLO)/pch
-PCHEXOUTDIR=$(SLO)/pch_ex
-
-$(SLO)/precompiled.% .PHONY:
-    -$(MKDIRHIER) $(SLO)/pch
-.IF "$(COM)"=="MSC"
-    $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
-.ELSE			# "$(COM)"=="MSC"
-    @$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF			# "$(COM)"=="MSC"
-    @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
-
-$(SLO)/precompiled_ex.% .PHONY:
-    -$(MKDIRHIER) $(SLO)/pch_ex
-.IF "$(COM)"=="MSC"
-    $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
-.ELSE			# "$(COM)"=="MSC"
-    @$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF			# "$(COM)"=="MSC"
-    @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
-
-.INCLUDE .IGNORE : $(INCCOM)/pch.mk
-.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
 $(SLO)/%.obj : %.cxx
     @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(ENABLE_PCH)"!=""
-# just a helper var	
-    @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
-# cleanup first
-    @noop $(assign ACT_PCH_SWITCHES:=$(NULL))
-# eq: first string is a copy of the compile line,
-# second generated by pch creation
-# use pch with exception support
-    @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL)))
-# use pch without exception support
-    @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL)))
-.ENDIF			# "$(ENABLE_PCH)"!=""
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE			# "$(GUI)"=="UNX"
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 .ELSE
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-.ENDIF		    # "$(COM)"=="GCC"	
+    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+.ENDIF		    # "$(COM)"=="GCC"
 .ENDIF			# "$(GUI)"=="UNX"
 .IF "$(nodep)"==""
 # fixme: write to file
@@ -170,9 +126,9 @@ $(SLO)/%.obj : %.cpp
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
@@ -196,9 +152,9 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
@@ -221,9 +177,9 @@ $(SLO)/%.obj : $(MISC)/%.cc
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
@@ -238,9 +194,9 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
@@ -263,11 +219,11 @@ $(OBJ)/%.obj : %.c
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-.IF "$(noadjust)"==""   
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(noadjust)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF			# "$(noadjust)"==""   
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF			# "$(noadjust)"==""
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
@@ -290,9 +246,9 @@ $(OBJ)/%.obj : $(MISC)/%.c
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
@@ -312,9 +268,9 @@ $(SLO)/%.obj : $(MISC)/%.c
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
@@ -335,9 +291,9 @@ $(SLO)/%.obj : %.c
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
     @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
@@ -518,20 +474,20 @@ $(MISC)/o_%.dpcc : %.m
 
 $(MISC)/s_%.dpcc : $(MISC)/%.m
     @@-$(RM) $@
-.IF "$(GUI)"=="UNX"	
+.IF "$(GUI)"=="UNX"
     $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE			# "$(GUI)"=="UNX"	
+.ELSE			# "$(GUI)"=="UNX"
     $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF			# "$(GUI)"=="UNX"	
+.ENDIF			# "$(GUI)"=="UNX"
     @echo $@ : $(SLO)/$(<:b).obj >> $@
 
 $(MISC)/o_%.dpcc : $(MISC)/%.m
     @@-$(RM) $@
-.IF "$(GUI)"=="UNX"	
+.IF "$(GUI)"=="UNX"
     $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE			# "$(GUI)"=="UNX"	
+.ELSE			# "$(GUI)"=="UNX"
     $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF			# "$(GUI)"=="UNX"	
+.ENDIF			# "$(GUI)"=="UNX"
     @echo $@ : $(OBJ)/$(<:b).obj >> $@
 
 # dependency dummy for *.s files
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5eb6dbf63e45..a80ea3340077 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -38,10 +38,6 @@ force_dmake_to_error
 
 # --- common tool makros --------------------------------------
 
-.IF "$(USE_PCH)"!=""
-ENABLE_PCH=TRUE
-.ENDIF			# "$(USE_PCH)"!=""
-
 .INCLUDE : unitools.mk
 
 .INCLUDE : minor.mk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 7fb14d39776f..a3231a69d7d6 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -99,10 +99,6 @@ CFLAGSCXX+=-Wno-deprecated-declarations
 CFLAGSCXX += -D_GLIBCXX_DEBUG
 .ENDIF # !PRODUCT
 
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
 # Compiler flags for compiling static object in multi threaded environment with graphical user interface
 CFLAGSOBJGUIMT=
 # Compiler flags for compiling static object in multi threaded environment with character user interface
@@ -268,4 +264,3 @@ RCSETVERSION=
 # platform specific identifier for shared libs
 DLLPRE=lib
 DLLPOST=.so
-PCHPOST=.gch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 06f11687f6b0..6ddb15af841e 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -106,8 +106,6 @@ LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
 DLLPRE=lib
 # We don't use dynamic shared libraries on iOS
 DLLPOST=.a
-# Precompiled header file extension
-PCHPOST=.gch
 
 STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
 STDLIBGUIMT=$(STDLIBCUIMT)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8471cee9a6bc..b0c862ec17c1 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -132,11 +132,6 @@ CFLAGSDBGUTIL=
 # Flag to specify output file to compiler/linker
 CFLAGSOUTOBJ=-o
 
-# Flags to enable precompiled headers
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
 # ---------------------------------
 #  Optimization flags
 # ---------------------------------
@@ -216,8 +211,6 @@ LINKFLAGSOPT=
 DLLPRE=lib
 # File extension to identify dynamic shared libraries on MacOS X
 DLLPOST=.dylib
-# Precompiled header file extension
-PCHPOST=.gch
 
 # We don't use mapping on MacOS X
 #LINKVERSIONMAPFLAG=-Wl,--version-script
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index d36bee6adb7c..6795d0f8f68c 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -55,10 +55,6 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 PICSWITCH:=
 
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
 CFLAGSOBJGUIST=
 CFLAGSOBJCUIST=
 CFLAGSOBJGUIMT=-D_MT
@@ -169,8 +165,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-PCHPOST=.gch
-
 ADVAPI32LIB=-ladvapi32
 SHELL32LIB=-lshell32
 GDI32LIB=-lgdi32
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 3c4bbf8619aa..a86b78b001e1 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -124,16 +124,6 @@ CFLAGS_NO_EXCEPTIONS=
 CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
 .ENDIF
 
-# with the current debug switches PCH won't work
-# anyway. so keep the existing .pch intact and don't
-# touch it
-.IF "$(debug)"!=""
-ENABLE_PCH:=
-.ENDIF "$(debug)"!=""
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
 .IF "$(CALL_CDECL)"=="TRUE"
 CFLAGSCALL=-Gd
 .ELSE			# "$(CALL_CDECL)"=="TRUE"
@@ -333,8 +323,6 @@ MT=mt.exe
 MTFLAGS=$(NOLOGO)
 
 
-PCHPOST=.pch
-
 CSC*=$(FLIPCMD) csc
 VBC*=vbc
 
diff --git a/stoc/inc/makefile.mk b/stoc/inc/makefile.mk
index 11c064b3a0a7..1fb6092e8286 100644
--- a/stoc/inc/makefile.mk
+++ b/stoc/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/store/inc/makefile.mk b/store/inc/makefile.mk
index b9c077c13605..11f807dfa862 100644
--- a/store/inc/makefile.mk
+++ b/store/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
index 636cf5288618..26dc9580b40d 100644
--- a/testtools/inc/makefile.mk
+++ b/testtools/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
index 1ed22bada671..3e86b0a51124 100644
--- a/ucb/inc/makefile.mk
+++ b/ucb/inc/makefile.mk
@@ -37,12 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-.IF "$(L10N_framework)"==""
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-.ENDIF 		# L10N_framework
diff --git a/udm/source/mkinc/fullcpp.mk b/udm/source/mkinc/fullcpp.mk
index 5faca9c6cbf4..b87fd8dea755 100644
--- a/udm/source/mkinc/fullcpp.mk
+++ b/udm/source/mkinc/fullcpp.mk
@@ -31,9 +31,6 @@
 # Has to be included AFTER settings.mk !
 
 
-# Precompiled header:
-
-
 .IF "$(GUI)"=="WNT"
 
 # RTTI
@@ -41,19 +38,6 @@
 CFLAGS+= -GR
 .ENDIF
 
-.IF "$(NP_LOCALBUILD)"!=""
-
-
-# Precompiled Headers
-PCH_NAME=  udm
-.IF "$(DBG_LEVEL)"<"2"
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
-.ENDIF
-
-.ENDIF
-
 .ENDIF
 
 # Or should we simple check for $(COM)==GCC ?
diff --git a/xmerge/inc/makefile.mk b/xmerge/inc/makefile.mk
index ed1c6f3d4ded..4388dd45721f 100644
--- a/xmerge/inc/makefile.mk
+++ b/xmerge/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
index d75d3614c0ab..7bf85a32918f 100755
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
 
 .INCLUDE :  target.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-