update for HEAD-2003091401

[reactos.git] / include / ntos.h

diff --git a/include/ntos.h b/include/ntos.h
index 145ab5d..89f7dfe 100644 (file)
--- a/include/ntos.h
+++ b/include/ntos.h
@@ -3,10 +3,12 @@
 /* $Id$ */
 
 #if defined(NTOS_MODE_USER)
-// include windows.h before ntddk.h to get user mode prototype for InterlockedXxx functions
+/* 
+ * Include windows.h before ntddk.h to get user mode prototype 
+ * for InterlockedXxx functions.
+ */
 #include <windows.h>
 #include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
 #include "ntos/types.h"
 #include "ntos/cdrom.h"
 #include "ntos/console.h"
@@ -14,6 +16,7 @@
 #include "ntos/except.h"
 #include "ntos/file.h"
 #include "ntos/gditypes.h"
+#include "ntos/fstypes.h"   /* AG */
 #include "ntos/heap.h"
 #include "ntos/kdbgsyms.h"
 #include "ntos/keyboard.h"
@@ -28,7 +31,6 @@
 #include "ntos/time.h"
 #include "napi/i386/segment.h"
 #include "napi/types.h"
-#include "napi/core.h"
 #include "napi/dbg.h"
 #include "napi/lpc.h"
 #include "napi/npipe.h"
@@ -38,16 +40,18 @@
 #include "ntos/rtl.h"
 #include "ntos/zwtypes.h"
 #include "ntos/zw.h"
+#include "ntos/dbgfuncs.h"
+#include "ntos/service.h"
 #include "ntdll/csr.h"
 #include "ntdll/dbg.h"
 #include "ntdll/ldr.h"
 #include "ntdll/registry.h"
 #include "ntdll/rtl.h"
 #include "ntdll/trace.h"
+#include "rosrtl/thread.h"
 #include "kernel32/error.h"
-#else // Assume kernel mode
+#else /* Assume kernel mode */
 #include <ddk/ntddk.h>
-//#include "ntos/types.h" // robd
 #include <ddk/ntifs.h>
 #include "ntos/types.h"
 #include "ntos/cdrom.h"
@@ -70,7 +74,6 @@
 #include "ntos/time.h"
 #include "napi/i386/segment.h"
 #include "napi/types.h"
-#include "napi/core.h"
 #include "napi/dbg.h"
 #include "napi/lpc.h"
 #include "napi/npipe.h"
@@ -80,6 +83,16 @@
 #include "ntos/rtl.h"
 #include "ntos/zwtypes.h"
 #include "ntos/zw.h"
+#include "ntos/dbgfuncs.h"
+#include "ntos/service.h"
+#include "ntos/haltypes.h"
+#include "ntos/halfuncs.h"
+#include "ntos/kdfuncs.h"
+#include "ntos/kefuncs.h"   /* AG */
+#include "ntos/fstypes.h"   /* AG */
+#include "ntos/obtypes.h"
+#include "ntos/tss.h"
+#include "rosrtl/thread.h"
 #endif
 
 #endif /* ndef _NTOS_H */