2004-08-15 Casper S. Hornstrup <chorns@users.sourceforge.net>

* ntoskrnl/include/.cvsignore: New file. * ntoskrnl/include/ntoskrnl.h: Ditto. * ntoskrnl/*/*.c: Use pre-compiled header. * ntoskrnl/Makefile: Support pre-compiled header. * tools/helper.mk: .pch files are now .gch files. svn path=/trunk/; revision=10550
2024-06-26 07:51:52 +00:00 · 2004-08-15 16:39:12 +00:00 · 2004-08-15 16:39:12 +00:00 · 1bf0775833
parent 41ca6025bd
commit 1bf0775833
254 changed files with 558 additions and 1479 deletions
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@ -1,3 +1,11 @@
+2004-08-15  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* ntoskrnl/include/.cvsignore: New file.
+	* ntoskrnl/include/ntoskrnl.h: Ditto.
+	* ntoskrnl/*/*.c: Use pre-compiled header.
+	* ntoskrnl/Makefile: Support pre-compiled header.
+	* tools/helper.mk: .pch files are now .gch files.
+
 2004-07-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>

 	* Makefile (DLLS): Add gdiplus.
--- a/reactos/ntoskrnl/.cvsignore
+++ b/reactos/ntoskrnl/.cvsignore
@ -7,6 +7,7 @@ ntoskrnl.map
 ntoskrnl.dbg
 bugcodes.rc
 msg*.bin
+*.d
 *.o
 *.sym
 *.exe
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.138 2004/08/12 06:04:21 ion Exp $
+# $Id: Makefile,v 1.139 2004/08/15 16:38:59 chorns Exp $
 #
 # ReactOS Operating System
 #
@ -559,7 +559,7 @@ NTOSKRNL_LD_FLAGS := \
 	-Wl,--section-alignment,0x1000 \
 	-Wl,--entry,_NtProcessStartup

-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).all.o $(IE_DATA) $(NTOSKRNL_LIBS)
 	$(CC) \
 		-Wl,-T,ntoskrnl.lnk \
 		-nostartfiles \
@ -568,7 +568,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
 		-o junk.tmp \
 		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,--base-file,base.tmp \
-		$(TARGETNAME).o -lgcc \
+		$(TARGETNAME).all.o -lgcc \
 		$(NTOSKRNL_LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
@ -586,11 +586,11 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
 		-o $(TARGETNAME).nostrip.exe \
 		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,temp.exp \
-		$(TARGETNAME).o -lgcc \
+		$(TARGETNAME).all.o -lgcc \
 		$(NTOSKRNL_LIBS)
 	- $(RM) temp.exp

-$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
+$(TARGETNAME).exe: $(TARGETNAME).all.o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
 	- $(CC) \
 		-Wl,-T,$(LINKER_SCRIPT) \
 		-nostartfiles \
@ -599,7 +599,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
 		-o junk.tmp \
 		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,--base-file,base.tmp \
-		$(TARGETNAME).o -lgcc \
+		$(TARGETNAME).all.o -lgcc \
 		$(NTOSKRNL_LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
@ -617,12 +617,12 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
 		-o $(TARGETNAME).exe \
 		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,temp.exp \
-		$(TARGETNAME).o -lgcc \
+		$(TARGETNAME).all.o -lgcc \
 		$(NTOSKRNL_LIBS)
 	- $(RM) temp.exp

-$(TARGETNAME).dbg.o: $(TARGETNAME).o
-	$(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).o
+$(TARGETNAME).dbg.o: $(TARGETNAME).all.o
+	$(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).all.o

 $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(NTOSKRNL_LIBS)
 	$(CC) \
@ -668,10 +668,10 @@ else
 	$(NM) --numeric-sort $(TARGETNAME).nostrip.exe > $(TARGETNAME).map
 endif

-$(TARGETNAME).o: $(OBJECTS)
+$(TARGETNAME).all.o: $(OBJECTS)
 	$(LD) \
 		-r \
-		-o $(TARGETNAME).o \
+		-o $(TARGETNAME).all.o \
 		$(OBJECTS)

 $(PATH_TO_TOP)/include/reactos/bugcodes.h bugcodes.rc: ntoskrnl.mc
@ -693,10 +693,10 @@ test:
 	-

 clean:
-	- $(RM) $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \
+	- $(RM) depend.d $(MK_PCHNAME) $(MK_PCHFAKE) $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \
              ex/i386/*.o inbv/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o \
              ps/*.o ps/i386/*.o rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o \
-              mm/i386/*.o fs/*.o po/*.o lpc/*.o kd/*.o $(TARGETNAME).o \
+              mm/i386/*.o fs/*.o po/*.o lpc/*.o kd/*.o $(TARGETNAME).all.o \
              junk.tmp base.tmp temp.exp $(TARGETNAME).exe \
              $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \
              $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
@ -731,9 +731,40 @@ ex/napi.o: ex/napi.c $(PATH_TO_TOP)/include/ntdll/napi.h

 ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h

+TARGET_PCH = include/ntoskrnl.h
+
+# Precompiled header support
+# When using PCHs, use dependency tracking to keep the .gch files up-to-date.
+
+MK_PCHNAME =
+ifeq ($(ROS_USE_PCH),yes)
+MK_PCHNAME = $(TARGET_PCH).gch
+
+PCH_CC := $(CC)
+
+# GCC generates wrong dependencies for header files.
+MK_PCHFAKE = $(TARGET_PCH:.h=.o)
+ifneq ($(MAKECMDGOALS),clean)
+$(MK_PCHFAKE):
+	- $(RTOUCH) $(MK_PCHFAKE)
+
+$(MK_PCHNAME): depend.d
+	- $(RTOUCH) $(MK_PCHNAME)
+	- $(PCH_CC) $(CFLAGS) $(TARGET_PCH)
+
+depend.d: $(MK_PCHFAKE) $(PATH_TO_TOP)/include/reactos/bugcodes.h
+	- $(RTOUCH) depend.d
+	- $(PCH_CC) $(CFLAGS) $(TARGET_PCH) -M -MF depend.d
+
+-include depend.d
+
+endif
+
+endif # ROS_USE_PCH
+
 %.o: %.cc
 	$(CC) $(CFLAGS) -c $< -o $@
-%.o: %.c
+%.o: %.c $(MK_PCHNAME)
 	$(CC) $(CFLAGS) -c $< -o $@
 %.o: %.S
 	$(AS) $(ASFLAGS) -c $< -o $@
--- a/reactos/ntoskrnl/cc/cacheman.c
+++ b/reactos/ntoskrnl/cc/cacheman.c
@ -28,9 +28,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/cc.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.29 2004/08/01 21:57:34 navaraf Exp $
+/* $Id: copy.c,v 1.30 2004/08/15 16:38:59 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,14 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@ -9,14 +9,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cc/mdl.c
+++ b/reactos/ntoskrnl/cc/mdl.c
@ -9,14 +9,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cc/misc.c
+++ b/reactos/ntoskrnl/cc/misc.c
@ -1,13 +1,6 @@
 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cc/pin.c
+++ b/reactos/ntoskrnl/cc/pin.c
@ -1,4 +1,4 @@
-/* $Id: pin.c,v 1.15 2004/06/21 04:11:44 ion Exp $
+/* $Id: pin.c,v 1.16 2004/08/15 16:39:00 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,14 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.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: view.c,v 1.75 2004/08/10 01:49:36 navaraf Exp $
+/* $Id: view.c,v 1.76 2004/08/15 16:39:00 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/cc/view.c
@ -51,13 +51,7 @@
 */
 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <internal/mm.h>
-#include <internal/cc.h>
-#include <internal/pool.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/import.c
+++ b/reactos/ntoskrnl/cm/import.c
@ -1,4 +1,4 @@
-/* $Id: import.c,v 1.29 2004/05/09 12:23:35 ekohl Exp $
+/* $Id: import.c,v 1.30 2004/08/15 16:39:00 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -9,11 +9,7 @@

 /* INCLUDES *****************************************************************/

-
-#include <ddk/ntddk.h>
-#include <string.h>
-#include <roscfg.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/ntfunc.c
+++ b/reactos/ntoskrnl/cm/ntfunc.c
@ -8,13 +8,7 @@

 /* INCLUDES *****************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <string.h>
-#include <roscfg.h>
-#include <internal/ob.h>
-#include <internal/se.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@ -6,14 +6,7 @@
 * UPDATE HISTORY:
 */

-#include <ddk/ntddk.h>
-#include <string.h>
-#include <roscfg.h>
-#include <internal/ob.h>
-#include <internal/mm.h>
-#include <ntos/minmax.h>
-#include <reactos/bugcodes.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/registry.c
+++ b/reactos/ntoskrnl/cm/registry.c
@ -1,4 +1,4 @@
-/* $Id: registry.c,v 1.124 2004/05/30 21:40:47 navaraf Exp $
+/* $Id: registry.c,v 1.125 2004/08/15 16:39:00 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,15 +11,7 @@
 *                  Created 22/05/98
 */

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <limits.h>
-#include <string.h>
-#include <roscfg.h>
-#include <internal/ob.h>
-#include <reactos/bugcodes.h>
-#include <rosrtl/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/regobj.c
+++ b/reactos/ntoskrnl/cm/regobj.c
@ -6,15 +6,7 @@
 * UPDATE HISTORY:
 */

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <string.h>
-#include <roscfg.h>
-#include <internal/ob.h>
-#include <ntos/minmax.h>
-#include <reactos/bugcodes.h>
-#include <rosrtl/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/cm/rtlfunc.c
+++ b/reactos/ntoskrnl/cm/rtlfunc.c
@ -8,13 +8,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
-#include <rosrtl/minmax.h>
-#include <roscfg.h>
-#include <limits.h>
-#include <string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/dbg/dbgctrl.c
+++ b/reactos/ntoskrnl/dbg/dbgctrl.c
@ -25,11 +25,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ldr.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/dbg/errinfo.c
+++ b/reactos/ntoskrnl/dbg/errinfo.c
@ -27,8 +27,7 @@

 /* INCLUDES ******************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/ntoskrnl/dbg/kdb.c
+++ b/reactos/ntoskrnl/dbg/kdb.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: kdb.c,v 1.27 2004/08/10 19:49:25 hbirr Exp $
+/* $Id: kdb.c,v 1.28 2004/08/15 16:39:00 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/dbg/kdb.c
@ -28,17 +28,9 @@

 /* INCLUDES ******************************************************************/

-#include <internal/ctype.h>
-#include <ddk/ntddk.h>
-#include <internal/ke.h>
-#include <internal/ps.h>
-#include <limits.h>
-#include <internal/kd.h>
-#include <internal/mm.h>
-#include <internal/i386/mm.h>
+#include <ntoskrnl.h>
 #include "kdb.h"
 #include "kjs.h"
-
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/dbg/kdb_keyboard.c
+++ b/reactos/ntoskrnl/dbg/kdb_keyboard.c
@ -26,11 +26,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>

--- a/reactos/ntoskrnl/dbg/kdb_serial.c
+++ b/reactos/ntoskrnl/dbg/kdb_serial.c
@ -29,11 +29,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/minmax.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>

--- a/reactos/ntoskrnl/dbg/kdb_stabs.c
+++ b/reactos/ntoskrnl/dbg/kdb_stabs.c
@ -27,21 +27,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ntoskrnl.h>
-#include <internal/ke.h>
-#include <internal/i386/segment.h>
-#include <internal/i386/mm.h>
-#include <internal/module.h>
-#include <internal/mm.h>
-#include <internal/ps.h>
-#include <internal/trap.h>
-#include <ntdll/ldr.h>
-#include <internal/safe.h>
-#include <internal/kd.h>
-#include <rosrtl/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/dbg/print.c
+++ b/reactos/ntoskrnl/dbg/print.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: print.c,v 1.18 2004/08/13 05:00:35 ion Exp $
+/* $Id: print.c,v 1.19 2004/08/15 16:39:00 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -30,10 +30,9 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>
+
 /* FUNCTIONS ****************************************************************/

 #if 0
--- a/reactos/ntoskrnl/dbg/profile.c
+++ b/reactos/ntoskrnl/dbg/profile.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: profile.c,v 1.7 2004/02/10 16:22:57 navaraf Exp $
+/* $Id: profile.c,v 1.8 2004/08/15 16:39:00 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/dbg/profile.c
@ -28,9 +28,7 @@

 /* INCLUDES *****************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <internal/ldr.h>
+#include <ntoskrnl.h>
 #include "kdb.h"

 #define NDEBUG
--- a/reactos/ntoskrnl/dbg/rdebug.c
+++ b/reactos/ntoskrnl/dbg/rdebug.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: rdebug.c,v 1.5 2003/10/12 21:21:40 hbirr Exp $
+/* $Id: rdebug.c,v 1.6 2004/08/15 16:39:00 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -29,9 +29,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ntoskrnl.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/dbg/user.c
+++ b/reactos/ntoskrnl/dbg/user.c
@ -26,11 +26,7 @@

 /* INCLUDES ******************************************************************/

-#include <internal/ntoskrnl.h>
-#include <napi/dbg.h>
-#include <internal/ps.h>
-#include <internal/dbg.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/ex/btree.c
+++ b/reactos/ntoskrnl/ex/btree.c
@ -24,9 +24,8 @@
 * UPDATE HISTORY:
 *      15-03-2002  CSH  Created
 */
-#include <ddk/ntddk.h>
-#include <internal/ex.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/callback.c
+++ b/reactos/ntoskrnl/ex/callback.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: callback.c,v 1.11 2004/06/19 08:48:00 navaraf Exp $
+/* $Id: callback.c,v 1.12 2004/08/15 16:39:01 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/ex/callback.c
@ -34,11 +34,9 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
-#include <internal/debug.h>
-#include <internal/ob.h>
+#include <ntoskrnl.h>
 #include <internal/callbacks.h>
+#include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/

@ -54,7 +52,7 @@
 * RETURNS:
 * TRUE if the Callback Object Type was successfully created.
 */
-BOOLEAN
+VOID
 ExpInitializeCallbacks(VOID)
 {
   OBJECT_ATTRIBUTES ObjectAttributes;
@ -94,7 +92,7 @@ ExpInitializeCallbacks(VOID)
   /* Fail if it wasn't created successfully */
   if (!NT_SUCCESS(Status))
   {
-      return FALSE;
+      return;
   }

   /* Initialize the Object */
@ -117,7 +115,7 @@ ExpInitializeCallbacks(VOID)
   /* Fail if couldn't create */
   if (!NT_SUCCESS(Status))
   {
-      return FALSE;
+      return;
   }

   /* Close Handle... */
@ -152,11 +150,10 @@ ExpInitializeCallbacks(VOID)
      /* Make sure Global Callbacks have been created */
      if (!NT_SUCCESS(Status))
      {
-         return FALSE;
+         return;
      }
   }
   /* Everything successful */
-   return TRUE;
 }

 /*
--- a/reactos/ntoskrnl/ex/fmutex.c
+++ b/reactos/ntoskrnl/ex/fmutex.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: fmutex.c,v 1.20 2003/07/12 01:09:10 dwelch Exp $
+/* $Id: fmutex.c,v 1.21 2004/08/15 16:39:01 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/ex/fmutex.c
@ -29,8 +29,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/ex/hashtab.c
+++ b/reactos/ntoskrnl/ex/hashtab.c
@ -27,8 +27,7 @@
 * UPDATE HISTORY:
 *      15-03-2002  CSH  Created
 */
-#include <ddk/ntddk.h>
-#include <internal/ex.h>
+#include <ntoskrnl.h>

 #define NDEBUG
 #include <internal/debug.h>
--- a/reactos/ntoskrnl/ex/i386/interlck.c
+++ b/reactos/ntoskrnl/ex/i386/interlck.c
@ -1,10 +1,9 @@
-/* $Id: interlck.c,v 1.7 2004/08/07 19:13:26 ion Exp $
+/* $Id: interlck.c,v 1.8 2004/08/15 16:39:01 chorns Exp $
 *
 * reactos/ntoskrnl/ex/i386/interlck.c
 *
 */
-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>

 #if defined(__GNUC__)

--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@ -26,9 +26,7 @@
 *                  Created 11/09/99
 */

-#include <ddk/ntddk.h>
-#include <internal/ex.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/interlck.c
+++ b/reactos/ntoskrnl/ex/interlck.c
@ -1,4 +1,4 @@
-/* $Id: interlck.c,v 1.14 2004/06/23 21:37:06 ion Exp $
+/* $Id: interlck.c,v 1.15 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,10 +11,10 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 #ifdef ExInterlockedDecrementLong
--- a/reactos/ntoskrnl/ex/list.c
+++ b/reactos/ntoskrnl/ex/list.c
@ -1,4 +1,4 @@
-/* $Id: list.c,v 1.12 2004/06/23 21:01:27 ion Exp $
+/* $Id: list.c,v 1.13 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -13,11 +13,7 @@

 /* INCLUDES *****************************************************************/

-//#ifdef __USE_W32API
-//#define NONAMELESSUNION
-//#endif
-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/lookas.c
+++ b/reactos/ntoskrnl/ex/lookas.c
@ -1,4 +1,4 @@
-/* $Id: lookas.c,v 1.13 2003/12/30 18:52:03 fireball Exp $
+/* $Id: lookas.c,v 1.14 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -14,11 +14,7 @@

 /* INCLUDES *****************************************************************/

-//#ifdef __USE_W32API
-// #define NONAMELESSUNION
-//#endif
-#include <ddk/ntddk.h>
-#include <internal/ex.h>
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/napi.c
+++ b/reactos/ntoskrnl/ex/napi.c
@ -8,11 +8,9 @@

 /* INCLUDES *****************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <internal/debug.h>
-
+#include <ntoskrnl.h>
 #include <ntdll/napi.h>
+#include <internal/debug.h>

 /* GLOBALS ******************************************************************/

--- a/reactos/ntoskrnl/ex/power.c
+++ b/reactos/ntoskrnl/ex/power.c
@ -11,14 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ps.h>
-#include <internal/io.h>
-#include <internal/mm.h>
-#include <internal/po.h>
-#include <internal/cc.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@ -1,4 +1,4 @@
-/* $Id: resource.c,v 1.27 2003/12/30 18:52:03 fireball Exp $
+/* $Id: resource.c,v 1.28 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -36,17 +36,9 @@
 #define ResourceOwnedExclusive 0x80
 #define ResourceDisableBoost   0x08

-//#ifdef __USE_W32API
-//#define NONAMELESSUNION
-//#endif
-
-
 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ke.h>
-#include <internal/pool.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/rundown.c
+++ b/reactos/ntoskrnl/ex/rundown.c
@ -25,11 +25,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ldr.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/stree.c
+++ b/reactos/ntoskrnl/ex/stree.c
@ -27,9 +27,8 @@
 * UPDATE HISTORY:
 *      15-03-2002  CSH  Created
 */
-#include <ddk/ntddk.h>
-#include <internal/ex.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/synch.c
+++ b/reactos/ntoskrnl/ex/synch.c
@ -25,11 +25,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ldr.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@ -1,4 +1,4 @@
-/* $Id: sysinfo.c,v 1.43 2004/07/31 09:44:36 hbirr Exp $
+/* $Id: sysinfo.c,v 1.44 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -14,16 +14,7 @@

 /* INCLUDES *****************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <ddk/halfuncs.h>
-#include <internal/ex.h>
-#include <internal/io.h>
-#include <internal/ldr.h>
-#include <internal/safe.h>
-#include <internal/ps.h>
-#include <internal/mm.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/time.c
+++ b/reactos/ntoskrnl/ex/time.c
@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.20 2004/06/23 21:01:27 ion Exp $
+/* $Id: time.c,v 1.21 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,12 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ex.h>
-#include <internal/safe.h>
-#include <ddk/halfuncs.h>
-#include <ddk/kefuncs.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>


--- a/reactos/ntoskrnl/ex/util.c
+++ b/reactos/ntoskrnl/ex/util.c
@ -25,11 +25,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <roscfg.h>
-#include <internal/ldr.h>
-#include <internal/kd.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@ -24,13 +24,8 @@
 * UPDATE HISTORY:
 *      04-06-2001  CSH  Created
 */
-#include <limits.h>
-#include <ddk/ntddk.h>
-#include <internal/ex.h>
-#include <internal/ob.h>
-#include <rosrtl/string.h>
-#include <wchar.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/work.c
+++ b/reactos/ntoskrnl/ex/work.c
@ -1,4 +1,4 @@
-/* $Id: work.c,v 1.18 2003/10/12 17:05:44 hbirr Exp $
+/* $Id: work.c,v 1.19 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:          See COPYING in the top level directory
 * PROJECT:            ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-
-#include <internal/ps.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/ex/zone.c
+++ b/reactos/ntoskrnl/ex/zone.c
@ -1,4 +1,4 @@
-/* $Id: zone.c,v 1.7 2003/12/30 18:52:03 fireball Exp $
+/* $Id: zone.c,v 1.8 2004/08/15 16:39:01 chorns Exp $
 *
 * COPYRIGHT:     See COPYING in the top level directory
 * PROJECT:       ReactOS kernel
@ -9,7 +9,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
+#include <ntoskrnl.h>

 /* FUNCTIONS ***************************************************************/

--- a/reactos/ntoskrnl/fs/dbcsname.c
+++ b/reactos/ntoskrnl/fs/dbcsname.c
@ -1,10 +1,10 @@
-/* $Id: dbcsname.c,v 1.4 2003/07/10 06:27:13 royce Exp $
+/* $Id: dbcsname.c,v 1.5 2004/08/15 16:39:01 chorns Exp $
 *
 * reactos/ntoskrnl/fs/dbcsname.c
 *
 */
-#include <ntos.h>
-#include <ddk/ntifs.h>
+
+#include <ntoskrnl.h>


 /**********************************************************************
--- a/reactos/ntoskrnl/fs/filelock.c
+++ b/reactos/ntoskrnl/fs/filelock.c
@ -1,13 +1,10 @@
-/* $Id: filelock.c,v 1.13 2004/08/12 06:04:21 ion Exp $
+/* $Id: filelock.c,v 1.14 2004/08/15 16:39:01 chorns Exp $
 *
 * reactos/ntoskrnl/fs/filelock.c
 *
 */
-#include <ddk/ntddk.h>
-#include <internal/ifs.h>
-#include <ddk/ntifs.h>
-#include <ntos.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/fs/mcb.c
+++ b/reactos/ntoskrnl/fs/mcb.c
@ -1,11 +1,10 @@
-/* $Id: mcb.c,v 1.12 2004/06/23 00:42:21 ion Exp $
+/* $Id: mcb.c,v 1.13 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/mcb.c
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>

+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /**********************************************************************
--- a/reactos/ntoskrnl/fs/mdl.c
+++ b/reactos/ntoskrnl/fs/mdl.c
@ -1,12 +1,10 @@
-/* $Id: mdl.c,v 1.7 2004/08/12 06:04:21 ion Exp $
+/* $Id: mdl.c,v 1.8 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/mdl.c
 *
 */
-#include <ntos.h>
-#include <internal/cc.h>
-#include <ddk/ntifs.h>

+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /*
--- a/reactos/ntoskrnl/fs/name.c
+++ b/reactos/ntoskrnl/fs/name.c
@ -1,9 +1,10 @@
-/* $Id: name.c,v 1.8 2003/12/17 20:26:28 ekohl Exp $
+/* $Id: name.c,v 1.9 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/name.c
 *
 */
-#include <ntos.h>
+
+#include <ntoskrnl.h>

 /* DATA */

--- a/reactos/ntoskrnl/fs/notify.c
+++ b/reactos/ntoskrnl/fs/notify.c
@ -1,11 +1,10 @@
-/* $Id: notify.c,v 1.11 2004/06/27 13:58:05 navaraf Exp $
+/* $Id: notify.c,v 1.12 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/notify.c
 *
 */
-#include <ntos.h>
-#include <ddk/ntifs.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/fs/oplock.c
+++ b/reactos/ntoskrnl/fs/oplock.c
@ -1,10 +1,10 @@
-/* $Id: oplock.c,v 1.7 2003/08/05 21:37:21 ea Exp $
+/* $Id: oplock.c,v 1.8 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/oplock.c
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+
+#include <ntoskrnl.h>


 /**********************************************************************
--- a/reactos/ntoskrnl/fs/pool.c
+++ b/reactos/ntoskrnl/fs/pool.c
@ -1,11 +1,10 @@
-/* $Id: pool.c,v 1.5 2003/07/10 06:27:13 royce Exp $
+/* $Id: pool.c,v 1.6 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/pool.c
 *
 */
-#include <ntos.h>
-#include <ddk/ntifs.h>
-#include <internal/ifs.h>
+
+#include <ntoskrnl.h>


 /**********************************************************************
--- a/reactos/ntoskrnl/fs/tunnel.c
+++ b/reactos/ntoskrnl/fs/tunnel.c
@ -1,10 +1,10 @@
-/* $Id: tunnel.c,v 1.6 2003/08/14 18:30:28 silverblade Exp $
+/* $Id: tunnel.c,v 1.7 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/tunnel.c
 *
 */
-#include <ntos.h>
-#include <ddk/ntifs.h>
+
+#include <ntoskrnl.h>


 /**********************************************************************
--- a/reactos/ntoskrnl/fs/unc.c
+++ b/reactos/ntoskrnl/fs/unc.c
@ -1,10 +1,10 @@
-/* $Id: unc.c,v 1.5 2003/07/10 06:27:13 royce Exp $
+/* $Id: unc.c,v 1.6 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/unc.c
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+
+#include <ntoskrnl.h>


 /**********************************************************************
--- a/reactos/ntoskrnl/fs/util.c
+++ b/reactos/ntoskrnl/fs/util.c
@ -1,11 +1,10 @@
-/* $Id: util.c,v 1.16 2004/06/23 00:42:21 ion Exp $
+/* $Id: util.c,v 1.17 2004/08/15 16:39:02 chorns Exp $
 *
 * reactos/ntoskrnl/fs/util.c
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>

+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/inbv/inbv.c
+++ b/reactos/ntoskrnl/inbv/inbv.c
@ -1,4 +1,4 @@
-/* $Id: inbv.c,v 1.7 2004/05/07 05:12:10 royce Exp $
+/* $Id: inbv.c,v 1.8 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,11 +11,9 @@

 /* INCLUDES ******************************************************************/

-#include <roskrnl.h>
+#include <ntoskrnl.h>
 #include <ntos/bootvid.h>
 #include <ddk/ntbootvid.h>
-#include <rosrtl/string.h>
-
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/include/.cvsignore
+++ b/reactos/ntoskrnl/include/.cvsignore
@ -0,0 +1,2 @@
+*.gch
+*.o
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@ -0,0 +1,60 @@
+#ifndef __INCLUDE_NTOSKRNL_H
+#define __INCLUDE_NTOSKRNL_H
+
+#include <roscfg.h>
+#include <reactos/version.h>
+#include <reactos/resource.h>
+#include <reactos/bugcodes.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <roskrnl.h>
+#include <ntos/minmax.h>
+#include <ntos/synch.h>
+#include <ntos/keyboard.h>
+#include <ntos/ntdef.h>
+#include <rosrtl/minmax.h>
+#include <rosrtl/string.h>
+#include <ddk/halfuncs.h>
+#include <ddk/kefuncs.h>
+#include <ddk/pnptypes.h>
+#include <ddk/pnpfuncs.h>
+#include <internal/ctype.h>
+#include <internal/ntoskrnl.h>
+#include <internal/id.h>
+#include <internal/ke.h>
+#include <internal/i386/segment.h>
+#include <internal/i386/mm.h>
+#include <internal/i386/fpu.h>
+#include <internal/module.h>
+#include <internal/handle.h>
+#include <internal/pool.h>
+#include <internal/ps.h>
+#include <internal/mm.h>
+#include <internal/cc.h>
+#include <internal/io.h>
+#include <internal/po.h>
+#include <internal/ob.h>
+#include <internal/se.h>
+#include <internal/ldr.h>
+#include <internal/kd.h>
+#include <internal/ex.h>
+#include <internal/ob.h>
+#include <internal/nt.h>
+#include "internal/xhal.h"
+#include <internal/v86m.h>
+#include <internal/ifs.h>
+#include <internal/port.h>
+#include <internal/nls.h>
+#include <internal/dbg.h>
+#include <internal/trap.h>
+#include <internal/safe.h>
+#include <ntdll/ldr.h>
+#include <napi/core.h>
+#include <napi/dbg.h>
+#include <napi/teb.h>
+#include <napi/win32.h>
+
+#endif /* INCLUDE_NTOSKRNL_H */
--- a/reactos/ntoskrnl/io/adapter.c
+++ b/reactos/ntoskrnl/io/adapter.c
@ -1,4 +1,4 @@
-/* $Id: adapter.c,v 1.10 2003/10/20 06:03:29 vizzini Exp $
+/* $Id: adapter.c,v 1.11 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/halfuncs.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* DATA **********************************************************************/
--- a/reactos/ntoskrnl/io/arcname.c
+++ b/reactos/ntoskrnl/io/arcname.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: arcname.c,v 1.18 2004/05/29 21:28:28 navaraf Exp $
+/* $Id: arcname.c,v 1.19 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -28,12 +28,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
-
-#include "internal/io.h"
-#include "internal/xhal.h"
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/buildirp.c
+++ b/reactos/ntoskrnl/io/buildirp.c
@ -1,4 +1,4 @@
-/* $Id: buildirp.c,v 1.43 2004/08/12 16:43:11 ion Exp $
+/* $Id: buildirp.c,v 1.44 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -12,10 +12,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/pool.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/cancel.c
+++ b/reactos/ntoskrnl/io/cancel.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: cancel.c,v 1.12 2003/10/12 17:05:44 hbirr Exp $
+/* $Id: cancel.c,v 1.13 2004/08/15 16:39:03 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/io/cancel.c
@ -28,8 +28,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/cleanup.c
+++ b/reactos/ntoskrnl/io/cleanup.c
@ -10,13 +10,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/ob.h>
-#include <internal/mm.h>
-#include <internal/ps.h>
-#include <rosrtl/minmax.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/cntrller.c
+++ b/reactos/ntoskrnl/io/cntrller.c
@ -1,4 +1,4 @@
-/* $Id: cntrller.c,v 1.10 2003/07/10 15:47:00 royce Exp $
+/* $Id: cntrller.c,v 1.11 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/pool.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/ntoskrnl/io/create.c
+++ b/reactos/ntoskrnl/io/create.c
@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.73 2004/07/22 02:32:43 navaraf Exp $
+/* $Id: create.c,v 1.74 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,13 +11,7 @@

 /* INCLUDES ***************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <internal/ob.h>
-#include <internal/io.h>
-#include <internal/id.h>
-#include <internal/pool.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.73 2004/08/14 22:47:08 ekohl Exp $
+/* $Id: device.c,v 1.74 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,16 +11,7 @@

 /* INCLUDES *******************************************************************/

-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/id.h>
-#include <internal/pool.h>
-
-#include <roscfg.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/deviface.c
+++ b/reactos/ntoskrnl/io/deviface.c
@ -11,7 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
+#include <ntoskrnl.h>
 #include <ole32/guiddef.h>
 #ifdef DEFINE_GUID
 DEFINE_GUID(GUID_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);
--- a/reactos/ntoskrnl/io/dir.c
+++ b/reactos/ntoskrnl/io/dir.c
@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.22 2004/08/12 06:15:49 ion Exp $
+/* $Id: dir.c,v 1.23 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@ -1,4 +1,4 @@
-/* $Id: driver.c,v 1.48 2004/06/23 21:42:50 ion Exp $
+/* $Id: driver.c,v 1.49 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -12,21 +12,7 @@

 /* INCLUDES *******************************************************************/

-#include <limits.h>
-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/id.h>
-#include <internal/pool.h>
-#include <internal/se.h>
-#include <internal/mm.h>
-#include <internal/ke.h>
-#include <internal/kd.h>
-#include <rosrtl/string.h>
-
-#include <roscfg.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/errlog.c
+++ b/reactos/ntoskrnl/io/errlog.c
@ -1,4 +1,4 @@
-/* $Id: errlog.c,v 1.17 2004/06/23 21:42:50 ion Exp $
+/* $Id: errlog.c,v 1.18 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-
-#include <internal/port.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/error.c
+++ b/reactos/ntoskrnl/io/error.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: error.c,v 1.10 2003/12/14 17:44:01 hbirr Exp $
+/* $Id: error.c,v 1.11 2004/08/15 16:39:03 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/io/error.c
@ -28,9 +28,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ps.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/event.c
+++ b/reactos/ntoskrnl/io/event.c
@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.7 2003/07/10 15:47:00 royce Exp $
+/* $Id: event.c,v 1.8 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntos.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.32 2004/08/12 06:15:50 ion Exp $
+/* $Id: file.c,v 1.33 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/mm.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/flush.c
+++ b/reactos/ntoskrnl/io/flush.c
@ -10,9 +10,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@ -10,11 +10,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/ps.h>
-#include <internal/pool.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/iocomp.c
+++ b/reactos/ntoskrnl/io/iocomp.c
@ -11,12 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <limits.h>
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-//#include <ntos/synch.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/ioctrl.c
+++ b/reactos/ntoskrnl/io/ioctrl.c
@ -1,4 +1,4 @@
-/* $Id: ioctrl.c,v 1.23 2003/12/13 14:36:42 ekohl Exp $
+/* $Id: ioctrl.c,v 1.24 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -15,8 +15,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr.c
@ -1,4 +1,4 @@
-/* $Id: iomgr.c,v 1.49 2004/07/22 18:36:35 ekohl Exp $
+/* $Id: iomgr.c,v 1.50 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:            See COPYING in the top level directory
 * PROJECT:              ReactOS kernel
@ -11,14 +11,7 @@

 /* INCLUDES ****************************************************************/

-#include <limits.h>
-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-#include <internal/io.h>
-#include <internal/pool.h>
-#include <internal/module.h>
-#include <rosrtl/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/iowork.c
+++ b/reactos/ntoskrnl/io/iowork.c
@ -1,4 +1,4 @@
-/* $Id: iowork.c,v 1.6 2003/12/30 18:52:04 fireball Exp $
+/* $Id: iowork.c,v 1.7 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:          See COPYING in the top level directory
 * PROJECT:            ReactOS kernel
@ -12,9 +12,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ps.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.64 2004/08/12 16:43:12 ion Exp $
+/* $Id: irp.c,v 1.65 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -30,11 +30,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/ps.h>
-#include <internal/pool.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/lock.c
+++ b/reactos/ntoskrnl/io/lock.c
@ -10,9 +10,7 @@

 /* INCLUDES *****************************************************************/

-
-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/mailslot.c
+++ b/reactos/ntoskrnl/io/mailslot.c
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/mdl.c
+++ b/reactos/ntoskrnl/io/mdl.c
@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.16 2004/08/01 07:24:57 hbirr Exp $
+/* $Id: mdl.c,v 1.17 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/pool.h>
-#include <internal/mm.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/npipe.c
+++ b/reactos/ntoskrnl/io/npipe.c
@ -10,9 +10,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/page.c
+++ b/reactos/ntoskrnl/io/page.c
@ -1,4 +1,4 @@
-/* $Id: page.c,v 1.21 2003/07/11 01:23:14 royce Exp $
+/* $Id: page.c,v 1.22 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,9 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/parttab.c
+++ b/reactos/ntoskrnl/io/parttab.c
@ -1,4 +1,4 @@
-/* $Id: parttab.c,v 1.7 2004/08/07 19:13:26 ion Exp $
+/* $Id: parttab.c,v 1.8 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -13,8 +13,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/pnpdma.c
+++ b/reactos/ntoskrnl/io/pnpdma.c
@ -1,4 +1,4 @@
-/* $Id: pnpdma.c,v 1.5 2003/12/20 21:43:21 navaraf Exp $
+/* $Id: pnpdma.c,v 1.6 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,16 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/pnptypes.h>
-#include <ddk/pnpfuncs.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/module.h>
-
-//#define NDEBUG
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 #ifdef __USE_W32API
--- a/reactos/ntoskrnl/io/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr.c
@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.31 2004/08/01 21:57:34 navaraf Exp $
+/* $Id: pnpmgr.c,v 1.32 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,15 +11,8 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/module.h>
-
+#include <ntoskrnl.h>
 #include <ole32/guiddef.h>
-//#include <ddk/pnpfuncs.h>
 #ifdef DEFINE_GUID
 DEFINE_GUID(GUID_CLASS_COMPORT,          0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x73);
 DEFINE_GUID(GUID_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);
--- a/reactos/ntoskrnl/io/pnpnotify.c
+++ b/reactos/ntoskrnl/io/pnpnotify.c
@ -10,14 +10,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/module.h>
-
-//#define NDEBUG
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/pnpreport.c
+++ b/reactos/ntoskrnl/io/pnpreport.c
@ -10,14 +10,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/module.h>
-
-//#define NDEBUG
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/pnproot.c
+++ b/reactos/ntoskrnl/io/pnproot.c
@ -1,4 +1,4 @@
-/* $Id: pnproot.c,v 1.22 2004/08/01 21:57:35 navaraf Exp $
+/* $Id: pnproot.c,v 1.23 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,11 +11,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <rosrtl/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/process.c
+++ b/reactos/ntoskrnl/io/process.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: process.c,v 1.17 2004/06/23 21:42:50 ion Exp $
+/* $Id: process.c,v 1.18 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -29,9 +29,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/ps.h>
-
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/queue.c
+++ b/reactos/ntoskrnl/io/queue.c
@ -1,4 +1,4 @@
-/* $Id: queue.c,v 1.14 2004/04/28 20:42:01 hbirr Exp $
+/* $Id: queue.c,v 1.15 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:                See COPYING in the top level directory
 * PROJECT:                  ReactOS kernel
@ -9,8 +9,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/rawfs.c
+++ b/reactos/ntoskrnl/io/rawfs.c
@ -1,4 +1,4 @@
-/* $Id: rawfs.c,v 1.11 2004/08/10 01:49:36 navaraf Exp $
+/* $Id: rawfs.c,v 1.12 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <reactos/bugcodes.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/reactos/ntoskrnl/io/remlock.c
+++ b/reactos/ntoskrnl/io/remlock.c
@ -10,14 +10,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <reactos/bugcodes.h>
-#include <internal/io.h>
-#include <internal/po.h>
-#include <internal/ldr.h>
-#include <internal/module.h>
-
-//#define NDEBUG
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* FUNCTIONS *****************************************************************/
--- a/reactos/ntoskrnl/io/resource.c
+++ b/reactos/ntoskrnl/io/resource.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: resource.c,v 1.18 2004/07/18 23:52:50 navaraf Exp $
+/* $Id: resource.c,v 1.19 2004/08/15 16:39:03 chorns Exp $
 *
 * PROJECT:         ReactOS kernel
 * FILE:            ntoskrnl/io/resource.c
@ -29,8 +29,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
+#include <ntoskrnl.h>
 #include <internal/debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/ntoskrnl/io/rw.c
+++ b/reactos/ntoskrnl/io/rw.c
@ -1,4 +1,4 @@
-/* $Id: rw.c,v 1.53 2003/12/14 17:44:02 hbirr Exp $
+/* $Id: rw.c,v 1.54 2004/08/15 16:39:03 chorns Exp $
 *
 * COPYRIGHT:      See COPYING in the top level directory
 * PROJECT:        ReactOS kernel
@ -11,10 +11,7 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <internal/io.h>
-#include <internal/ob.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>

--- a/Show more
+++ b/Show more