diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 9a100af8d4d..4ccca64ba7e 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-15  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* lib/gdi32/.cvsignore: Ignore *.gch.
+	* lib/gdi32/include/precomp.h: New file.
+	* lib/gdi32/Makefile (TARGET_PCH): Set to include/precomp.h.
+	* lib/gdi32/*/*.c: Use pre-compiled header.
+
 2004-08-15  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* lib/msvcrt/.cvsignore: Ignore *.gch.
diff --git a/reactos/lib/gdi32/.cvsignore b/reactos/lib/gdi32/.cvsignore
index 0a57412f946..fd6205f3dd6 100644
--- a/reactos/lib/gdi32/.cvsignore
+++ b/reactos/lib/gdi32/.cvsignore
@@ -3,3 +3,4 @@
 *.dll
 *.o
 *.map
+*.gch
diff --git a/reactos/lib/gdi32/include/internal/font.h b/reactos/lib/gdi32/include/internal/font.h
index 35b0cf01da2..16cc5ad586d 100644
--- a/reactos/lib/gdi32/include/internal/font.h
+++ b/reactos/lib/gdi32/include/internal/font.h
@@ -1,4 +1,4 @@
-/* $Id: font.h,v 1.1 2004/03/23 00:18:54 gvg Exp $
+/* $Id: font.h,v 1.2 2004/08/15 18:40:07 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,8 +11,6 @@
 #ifndef GDI32_FONT_H_INCLUDED
 #define GDI32_FONT_H_INCLUDED
 
-#include <windows.h>
-
 BOOL FASTCALL TextMetricW2A(TEXTMETRICA *tma, TEXTMETRICW *tmw);
 BOOL FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw);
 BOOL FASTCALL NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw);
diff --git a/reactos/lib/gdi32/include/precomp.h b/reactos/lib/gdi32/include/precomp.h
new file mode 100644
index 00000000000..d65edc66586
--- /dev/null
+++ b/reactos/lib/gdi32/include/precomp.h
@@ -0,0 +1,3 @@
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ntos.h>
diff --git a/reactos/lib/gdi32/main/dllmain.c b/reactos/lib/gdi32/main/dllmain.c
index a9c60dfdb77..6018f853232 100644
--- a/reactos/lib/gdi32/main/dllmain.c
+++ b/reactos/lib/gdi32/main/dllmain.c
@@ -1,13 +1,13 @@
 /*
  * dllmain.c
  *
- * $Revision: 1.9 $
- * $Author: navaraf $
- * $Date: 2004/04/09 20:03:11 $
+ * $Revision: 1.10 $
+ * $Author: chorns $
+ * $Date: 2004/08/15 18:40:07 $
  *
  */
 
-#include <windows.h>
+#include "precomp.h"
 #include <win32k/win32k.h>
 #include <internal/heap.h>
 
diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile
index e28ca6e1ae6..77d472c5207 100644
--- a/reactos/lib/gdi32/makefile
+++ b/reactos/lib/gdi32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.38 2004/05/29 21:24:43 hbirr Exp $
+# $Id: makefile,v 1.39 2004/08/15 18:40:07 chorns Exp $
 
 PATH_TO_TOP = ../..
 
@@ -8,6 +8,8 @@ TARGET_NAME = gdi32
 
 TARGET_BASE = $(TARGET_BASE_LIB_GDI32)
 
+TARGET_PCH = include/precomp.h
+
 TARGET_SDKLIBS = rosrtl.a ntdll.a advapi32.a kernel32.a
 
 TARGET_CFLAGS = \
diff --git a/reactos/lib/gdi32/misc/heap.c b/reactos/lib/gdi32/misc/heap.c
index 1930496d2d3..9097f587f63 100644
--- a/reactos/lib/gdi32/misc/heap.c
+++ b/reactos/lib/gdi32/misc/heap.c
@@ -1,10 +1,4 @@
-// heap.c
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#define NTOS_MODE_USER
-#include <ntos.h>
+#include "precomp.h"
 #include <debug.h>
 
 // global variables in a dll are process-global
diff --git a/reactos/lib/gdi32/misc/stubs.c b/reactos/lib/gdi32/misc/stubs.c
index 5f780ad4d0e..adbef8fed07 100644
--- a/reactos/lib/gdi32/misc/stubs.c
+++ b/reactos/lib/gdi32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.63 2004/07/09 20:28:20 navaraf Exp $
+/* $Id: stubs.c,v 1.64 2004/08/15 18:40:07 chorns Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -8,6 +8,8 @@
  * remove its stub from this file.
  *
  */
+
+/* Can't use precomp.h because of this */
 #ifdef UNICODE
 #undef UNICODE
 #endif
diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c
index 49d37c07d84..9c218919a48 100644
--- a/reactos/lib/gdi32/misc/stubsa.c
+++ b/reactos/lib/gdi32/misc/stubsa.c
@@ -1,4 +1,4 @@
-/* $Id: stubsa.c,v 1.32 2004/07/09 20:28:20 navaraf Exp $
+/* $Id: stubsa.c,v 1.33 2004/08/15 18:40:07 chorns Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -8,6 +8,8 @@
  * remove its stub from this file.
  *
  */
+
+/* Can't use precomp.h because of this */
 #ifdef UNICODE
 #undef UNICODE
 #endif
diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c
index 17177db650c..3fc39a53f34 100644
--- a/reactos/lib/gdi32/misc/stubsw.c
+++ b/reactos/lib/gdi32/misc/stubsw.c
@@ -1,4 +1,4 @@
-/* $Id: stubsw.c,v 1.30 2004/07/23 20:41:08 jfilby Exp $
+/* $Id: stubsw.c,v 1.31 2004/08/15 18:40:07 chorns Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -8,10 +8,8 @@
  * remove its stub from this file.
  *
  */
-#ifndef UNICODE
-#define UNICODE
-#endif//UNICODE
-#include <windows.h>
+
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
diff --git a/reactos/lib/gdi32/misc/wingl.c b/reactos/lib/gdi32/misc/wingl.c
index 62be71639c3..e647eef31a4 100644
--- a/reactos/lib/gdi32/misc/wingl.c
+++ b/reactos/lib/gdi32/misc/wingl.c
@@ -21,12 +21,8 @@
  *
  */
 
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <string.h>
-
 #define NDEBUG
 #include <win32k/debug1.h>
 
diff --git a/reactos/lib/gdi32/objects/bitblt.c b/reactos/lib/gdi32/objects/bitblt.c
index 61f95e33dee..c38c9cd0b71 100644
--- a/reactos/lib/gdi32/objects/bitblt.c
+++ b/reactos/lib/gdi32/objects/bitblt.c
@@ -1,4 +1,4 @@
-/* $Id: bitblt.c,v 1.22 2004/04/25 14:46:54 weiden Exp $
+/* $Id: bitblt.c,v 1.23 2004/08/15 18:40:07 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -7,13 +7,7 @@
  * PROGRAMMER:
  */
 
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 #include <debug.h>
 
diff --git a/reactos/lib/gdi32/objects/brush.c b/reactos/lib/gdi32/objects/brush.c
index ee9d627fa60..0022462c7a8 100644
--- a/reactos/lib/gdi32/objects/brush.c
+++ b/reactos/lib/gdi32/objects/brush.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 
diff --git a/reactos/lib/gdi32/objects/clip.c b/reactos/lib/gdi32/objects/clip.c
index a67d178643b..071588e8a1c 100644
--- a/reactos/lib/gdi32/objects/clip.c
+++ b/reactos/lib/gdi32/objects/clip.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: clip.c,v 1.7 2004/04/25 16:40:39 weiden Exp $
+/* $Id: clip.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
  *
  * PROJECT:         ReactOS gdi32.dll
  * FILE:            lib/gdi32/objects/clip.c
@@ -26,7 +26,7 @@
  *      2003/06/26  GvG  Created
  */
 
-#include <windows.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 /*
diff --git a/reactos/lib/gdi32/objects/dc.c b/reactos/lib/gdi32/objects/dc.c
index 9d5000a5292..fe74b83622b 100644
--- a/reactos/lib/gdi32/objects/dc.c
+++ b/reactos/lib/gdi32/objects/dc.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 #include <rosrtl/logfont.h>
 
diff --git a/reactos/lib/gdi32/objects/fillshap.c b/reactos/lib/gdi32/objects/fillshap.c
index 5b7e81143f3..29ee777abfb 100644
--- a/reactos/lib/gdi32/objects/fillshap.c
+++ b/reactos/lib/gdi32/objects/fillshap.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 /*
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index cf391af7638..f69b9ed473f 100644
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.7 2004/07/23 20:41:09 jfilby Exp $
+/* $Id: font.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -8,15 +8,8 @@
  *
  */
 
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#include <windows.h>
+#include "precomp.h"
 #include <rosrtl/logfont.h>
-#include <ddk/ntddk.h>
-#define NTOS_MODE_USER
-#include <ntos.h>
 #include <win32k/font.h>
 #include <win32k/text.h>
 #include <internal/font.h>
diff --git a/reactos/lib/gdi32/objects/line.c b/reactos/lib/gdi32/objects/line.c
index 015d913d7a5..44980c15365 100644
--- a/reactos/lib/gdi32/objects/line.c
+++ b/reactos/lib/gdi32/objects/line.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 
diff --git a/reactos/lib/gdi32/objects/linedda.c b/reactos/lib/gdi32/objects/linedda.c
index 005cf23b30e..9edf21d150a 100644
--- a/reactos/lib/gdi32/objects/linedda.c
+++ b/reactos/lib/gdi32/objects/linedda.c
@@ -27,8 +27,7 @@
  * NOTES:            Adapted from Wine
  */
 
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 #include <debug.h>
 
diff --git a/reactos/lib/gdi32/objects/metafile.c b/reactos/lib/gdi32/objects/metafile.c
index bd641d98ef4..ed5db02b4f1 100644
--- a/reactos/lib/gdi32/objects/metafile.c
+++ b/reactos/lib/gdi32/objects/metafile.c
@@ -1,13 +1,5 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
+#include "precomp.h"
 #include <string.h>
-#include <windows.h>
-#include <ddk/ntddk.h>
-#define NTOS_MODE_USER
-#include <ntos.h>
 #include <internal/heap.h>
 #include <win32k/kapi.h>
 #include <win32k/metafile.h>
diff --git a/reactos/lib/gdi32/objects/pen.c b/reactos/lib/gdi32/objects/pen.c
index 90854ac80a8..9ff2a9d9e7a 100644
--- a/reactos/lib/gdi32/objects/pen.c
+++ b/reactos/lib/gdi32/objects/pen.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 
diff --git a/reactos/lib/gdi32/objects/region.c b/reactos/lib/gdi32/objects/region.c
index cfcd00f5960..0f53ef9f643 100644
--- a/reactos/lib/gdi32/objects/region.c
+++ b/reactos/lib/gdi32/objects/region.c
@@ -1,10 +1,4 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
+#include "precomp.h"
 #include <win32k/kapi.h>
 
 
diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/lib/gdi32/objects/text.c
index dc21a606310..5fd4c4e55ee 100644
--- a/reactos/lib/gdi32/objects/text.c
+++ b/reactos/lib/gdi32/objects/text.c
@@ -1,11 +1,5 @@
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
+#include "precomp.h"
 #include <string.h>
-#include <windows.h>
-#include <ddk/ntddk.h>
 #include <win32k/kapi.h>
 #include <internal/font.h>
 #include <rosrtl/logfont.h>