diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index e1d17a39088..59bc140c967 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-16  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* drivers/net/ndis/include/.cvsignore: New file.
+	* drivers/net/ndis/.cvsignore: Add *.d.
+	* drivers/net/ndis/Makefile (TARGET_PCH): Set to include/ndissys.h.
+	* drivers/net/ndis/*.c: Use pre-compiled header.
+
 2004-08-16  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* drivers/net/afd/include/.cvsignore: New file.
diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile
index fb486a25200..3bffb757306 100644
--- a/reactos/drivers/net/ndis/Makefile
+++ b/reactos/drivers/net/ndis/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2004/07/29 05:00:43 arty Exp $
+# $Id: Makefile,v 1.21 2004/08/15 23:12:32 chorns Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -6,6 +6,8 @@ TARGET_TYPE = export_driver
 
 TARGET_NAME = ndis
 
+TARGET_PCH = include/ndissys.h
+
 TARGET_CFLAGS = -I./include -DNDIS_WRAPPER -Wall -Werror
 
 TARGET_OBJECTS = \
diff --git a/reactos/drivers/net/ndis/include/.cvsignore b/reactos/drivers/net/ndis/include/.cvsignore
new file mode 100644
index 00000000000..a62c258e052
--- /dev/null
+++ b/reactos/drivers/net/ndis/include/.cvsignore
@@ -0,0 +1,2 @@
+*.o
+*.gch
diff --git a/reactos/drivers/net/ndis/include/ndissys.h b/reactos/drivers/net/ndis/include/ndissys.h
index 80bd1158031..dbc39862a47 100644
--- a/reactos/drivers/net/ndis/include/ndissys.h
+++ b/reactos/drivers/net/ndis/include/ndissys.h
@@ -23,6 +23,9 @@
 #include <net/ndis.h>
 #endif /* _MSC_VER */
 
+#include "miniport.h"
+#include "protocol.h"
+
 #include <debug.h>
 
 /* Exported functions */
diff --git a/reactos/drivers/net/ndis/include/protocol.h b/reactos/drivers/net/ndis/include/protocol.h
index 3666614f8e7..4a9c9551b1e 100644
--- a/reactos/drivers/net/ndis/include/protocol.h
+++ b/reactos/drivers/net/ndis/include/protocol.h
@@ -8,11 +8,6 @@
 #ifndef __PROTOCOL_H
 #define __PROTOCOL_H
 
-#include <ndissys.h>
-#include <net/ndis.h>
-#include "miniport.h"
-
-
 typedef struct _PROTOCOL_BINDING {
     LIST_ENTRY                    ListEntry;        /* Entry on global list */
     KSPIN_LOCK                    Lock;             /* Protecting spin lock */
diff --git a/reactos/drivers/net/ndis/ndis/.cvsignore b/reactos/drivers/net/ndis/ndis/.cvsignore
index ecc3f45a042..a62c258e052 100644
--- a/reactos/drivers/net/ndis/ndis/.cvsignore
+++ b/reactos/drivers/net/ndis/ndis/.cvsignore
@@ -1,2 +1,2 @@
 *.o
-*.map
+*.gch
diff --git a/reactos/drivers/net/ndis/ndis/40gone.c b/reactos/drivers/net/ndis/ndis/40gone.c
index 10df2afa8dd..ecf3a9573bb 100644
--- a/reactos/drivers/net/ndis/ndis/40gone.c
+++ b/reactos/drivers/net/ndis/ndis/40gone.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/50gone.c b/reactos/drivers/net/ndis/ndis/50gone.c
index b9d27cfe2d9..51b863ca76b 100644
--- a/reactos/drivers/net/ndis/ndis/50gone.c
+++ b/reactos/drivers/net/ndis/ndis/50gone.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/buffer.c b/reactos/drivers/net/ndis/ndis/buffer.c
index a7e878e5044..8fd5f599f4a 100644
--- a/reactos/drivers/net/ndis/ndis/buffer.c
+++ b/reactos/drivers/net/ndis/ndis/buffer.c
@@ -7,8 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <buffer.h>
 
+#include <buffer.h>
 
 
 __inline ULONG SkipToOffset(
diff --git a/reactos/drivers/net/ndis/ndis/cl.c b/reactos/drivers/net/ndis/ndis/cl.c
index bc554f466e0..7159e40bff6 100644
--- a/reactos/drivers/net/ndis/ndis/cl.c
+++ b/reactos/drivers/net/ndis/ndis/cl.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/cm.c b/reactos/drivers/net/ndis/ndis/cm.c
index dca33e48384..5b68352cf34 100644
--- a/reactos/drivers/net/ndis/ndis/cm.c
+++ b/reactos/drivers/net/ndis/ndis/cm.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/co.c b/reactos/drivers/net/ndis/ndis/co.c
index c0e5f897e1d..31736e034a8 100644
--- a/reactos/drivers/net/ndis/ndis/co.c
+++ b/reactos/drivers/net/ndis/ndis/co.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/config.c b/reactos/drivers/net/ndis/ndis/config.c
index bfafbe49e73..78fe9c9e90b 100644
--- a/reactos/drivers/net/ndis/ndis/config.c
+++ b/reactos/drivers/net/ndis/ndis/config.c
@@ -31,7 +31,7 @@
  *     - All the routines in this file are PASSIVE_LEVEL only, and all memory is PagedPool
  */
 
-#include <miniport.h>
+#include "ndissys.h"
 
 #define NDIS_VERSION 0x00040000          /* the version of NDIS we claim to be to miniport drivers */
 #define PARAMETERS_KEY L"Parameters"     /* The parameters subkey under the device-specific key */
diff --git a/reactos/drivers/net/ndis/ndis/control.c b/reactos/drivers/net/ndis/ndis/control.c
index c8806469422..3d8bdd485dd 100644
--- a/reactos/drivers/net/ndis/ndis/control.c
+++ b/reactos/drivers/net/ndis/ndis/control.c
@@ -9,7 +9,8 @@
  *   CSH 01/08-2000 Created
  *   3 Oct 2003 Vizzini - Formatting and minor bugfixes
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/enum.c b/reactos/drivers/net/ndis/ndis/enum.c
index 7705946783e..bfae54590ae 100644
--- a/reactos/drivers/net/ndis/ndis/enum.c
+++ b/reactos/drivers/net/ndis/ndis/enum.c
@@ -16,8 +16,7 @@
  *     - Break these functions up a bit; i hate 200-line functions
  */
 
-#include <ndissys.h>
-#include <miniport.h>
+#include "ndissys.h"
 
 /* Registry path to the enumeration database */
 #define ENUM_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum"
diff --git a/reactos/drivers/net/ndis/ndis/hardware.c b/reactos/drivers/net/ndis/ndis/hardware.c
index 128597b6d1b..d625f86320f 100644
--- a/reactos/drivers/net/ndis/ndis/hardware.c
+++ b/reactos/drivers/net/ndis/ndis/hardware.c
@@ -13,9 +13,8 @@
  * TODO:
  *    - Fix HalGetBusDataByOffset() param 2 in most calls below
  */
-#include <ndis.h>
-#include <ndissys.h>
-#include "../include/miniport.h"
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/io.c b/reactos/drivers/net/ndis/ndis/io.c
index f581bfdf12e..0b681113a11 100644
--- a/reactos/drivers/net/ndis/ndis/io.c
+++ b/reactos/drivers/net/ndis/ndis/io.c
@@ -10,8 +10,8 @@
  *   20 Aug 2003 Vizzini - DMA support
  *   3  Oct 2003 Vizzini - Formatting and minor bugfixes
  */
-#include <ndissys.h>
-#include <miniport.h>
+
+#include "ndissys.h"
 
 
 VOID STDCALL HandleDeferredProcessing(
diff --git a/reactos/drivers/net/ndis/ndis/main.c b/reactos/drivers/net/ndis/ndis/main.c
index ceb8d7e0822..b9fd018975c 100644
--- a/reactos/drivers/net/ndis/ndis/main.c
+++ b/reactos/drivers/net/ndis/ndis/main.c
@@ -10,10 +10,9 @@
  *   20 Aug 2003 Vizzini - NDIS4/5 revisions
  *   3  Oct 2003 Vizzini - formatting and minor bugfixing
  */
+
 #include <roscfg.h>
-#include <ndissys.h>
-#include <protocol.h>
-#include <miniport.h>
+#include "ndissys.h"
 
 
 #ifdef DBG
diff --git a/reactos/drivers/net/ndis/ndis/memory.c b/reactos/drivers/net/ndis/ndis/memory.c
index 8a7eeddeebb..2d975ad20a5 100644
--- a/reactos/drivers/net/ndis/ndis/memory.c
+++ b/reactos/drivers/net/ndis/ndis/memory.c
@@ -10,8 +10,8 @@
  *   15 Aug 2003 Vizzini - DMA support
  *   3  Oct 2003 Vizzini - formatting and minor bugfixing
  */
-#include <ndissys.h>
-#include <miniport.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/miniport.c b/reactos/drivers/net/ndis/ndis/miniport.c
index c39aafaae9b..5e25e4392f1 100644
--- a/reactos/drivers/net/ndis/ndis/miniport.c
+++ b/reactos/drivers/net/ndis/ndis/miniport.c
@@ -11,8 +11,7 @@
  *   3  Oct 2003 vizzini - SendPackets support
  */
 #include <roscfg.h>
-#include <miniport.h>
-#include <protocol.h>
+#include "ndissys.h"
 
 #ifdef DBG
 #include <buffer.h>
diff --git a/reactos/drivers/net/ndis/ndis/protocol.c b/reactos/drivers/net/ndis/ndis/protocol.c
index cf6c4b8d933..d14fa4d8413 100644
--- a/reactos/drivers/net/ndis/ndis/protocol.c
+++ b/reactos/drivers/net/ndis/ndis/protocol.c
@@ -10,9 +10,7 @@
  *   09-13-2003 Vizzini Updates for SendPackets support
  */
 #include <roscfg.h>
-#include <ndissys.h>
-#include <miniport.h>
-#include <protocol.h>
+#include "ndissys.h"
 #include <buffer.h>
 
 #define SERVICES_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"
diff --git a/reactos/drivers/net/ndis/ndis/string.c b/reactos/drivers/net/ndis/ndis/string.c
index e1fac0011a7..39c9976dfc7 100644
--- a/reactos/drivers/net/ndis/ndis/string.c
+++ b/reactos/drivers/net/ndis/ndis/string.c
@@ -9,7 +9,8 @@
  *   CSH 01/08-2000 Created
  *   Vizzini 08-Oct-2003  Error checking, documentation, and formatting
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/stubs.c b/reactos/drivers/net/ndis/ndis/stubs.c
index 96c5739360c..4113cb5b25a 100644
--- a/reactos/drivers/net/ndis/ndis/stubs.c
+++ b/reactos/drivers/net/ndis/ndis/stubs.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 01/08-2000 Created
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 /*
diff --git a/reactos/drivers/net/ndis/ndis/time.c b/reactos/drivers/net/ndis/ndis/time.c
index 93bc196a562..175680b455a 100644
--- a/reactos/drivers/net/ndis/ndis/time.c
+++ b/reactos/drivers/net/ndis/ndis/time.c
@@ -18,7 +18,8 @@
  *     - Nearly this entire file is PAGED_CODE (with the exception of the
  *       MiniportTimerDpc() function)
  */
-#include <ndissys.h>
+
+#include "ndissys.h"
 
 
 VOID STDCALL