[ros-diffs] [navaraf] 16123: - Don't include ntddk.h from most of the DDK headers and move the includes out of the "extern C" blocks.

- Don't include ntddk.h from most of the DDK headers and move the
includes out of the "extern C" blocks.
- Fix order of STDCALL in few callback defintions.
- Get the sources to build again with these changes.
Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h
Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c
Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h
Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
Modified: trunk/reactos/drivers/video/videoprt/videoprt.h
Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
Modified: trunk/reactos/include/win32k/driver.h
Modified: trunk/reactos/lib/gdi32/include/precomp.h
Modified: trunk/reactos/lib/opengl32/teb.h
Modified: trunk/reactos/w32api/include/ddk/batclass.h
Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h
Modified: trunk/reactos/w32api/include/ddk/d4drvif.h
Modified: trunk/reactos/w32api/include/ddk/d4iface.h
Modified: trunk/reactos/w32api/include/ddk/ddkmapi.h
Modified: trunk/reactos/w32api/include/ddk/hidclass.h
Modified: trunk/reactos/w32api/include/ddk/hidpi.h
Modified: trunk/reactos/w32api/include/ddk/mcd.h
Modified: trunk/reactos/w32api/include/ddk/miniport.h
Modified: trunk/reactos/w32api/include/ddk/minitape.h
Modified: trunk/reactos/w32api/include/ddk/mountdev.h
Modified: trunk/reactos/w32api/include/ddk/mountmgr.h
Modified: trunk/reactos/w32api/include/ddk/ndis.h
Modified: trunk/reactos/w32api/include/ddk/ndistapi.h
Modified: trunk/reactos/w32api/include/ddk/ndiswan.h
Modified: trunk/reactos/w32api/include/ddk/ntagp.h
Modified: trunk/reactos/w32api/include/ddk/ntapi.h
Modified: trunk/reactos/w32api/include/ddk/ntdd8042.h
Modified: trunk/reactos/w32api/include/ddk/ntddbeep.h
Modified: trunk/reactos/w32api/include/ddk/ntddcdrm.h
Modified: trunk/reactos/w32api/include/ddk/ntddcdvd.h
Modified: trunk/reactos/w32api/include/ddk/ntddchgr.h
Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h
Modified: trunk/reactos/w32api/include/ddk/ntddk.h
Modified: trunk/reactos/w32api/include/ddk/ntddkbd.h
Modified: trunk/reactos/w32api/include/ddk/ntddmou.h
Modified: trunk/reactos/w32api/include/ddk/ntddndis.h
Modified: trunk/reactos/w32api/include/ddk/ntddpar.h
Modified: trunk/reactos/w32api/include/ddk/ntddpcm.h
Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h
Modified: trunk/reactos/w32api/include/ddk/ntddser.h
Modified: trunk/reactos/w32api/include/ddk/ntddstor.h
Modified: trunk/reactos/w32api/include/ddk/ntddtape.h
Modified: trunk/reactos/w32api/include/ddk/ntddtdi.h
Modified: trunk/reactos/w32api/include/ddk/ntddvdeo.h
Modified: trunk/reactos/w32api/include/ddk/ntddvol.h
Modified: trunk/reactos/w32api/include/ddk/ntifs.h
Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h
Modified: trunk/reactos/w32api/include/ddk/parallel.h
Modified: trunk/reactos/w32api/include/ddk/pfhook.h
Modified: trunk/reactos/w32api/include/ddk/poclass.h
Modified: trunk/reactos/w32api/include/ddk/scsi.h
Modified: trunk/reactos/w32api/include/ddk/scsiscan.h
Modified: trunk/reactos/w32api/include/ddk/scsiwmi.h
Modified: trunk/reactos/w32api/include/ddk/srb.h
Modified: trunk/reactos/w32api/include/ddk/storport.h
Modified: trunk/reactos/w32api/include/ddk/tdi.h
Modified: trunk/reactos/w32api/include/ddk/tdiinfo.h
Modified: trunk/reactos/w32api/include/ddk/tdikrnl.h
Modified: trunk/reactos/w32api/include/ddk/tvout.h
Modified: trunk/reactos/w32api/include/ddk/upssvc.h
Modified: trunk/reactos/w32api/include/ddk/usb.h
Modified: trunk/reactos/w32api/include/ddk/usb100.h
Modified: trunk/reactos/w32api/include/ddk/usbcamdi.h
Modified: trunk/reactos/w32api/include/ddk/usbdi.h
Modified: trunk/reactos/w32api/include/ddk/usbioctl.h
Modified: trunk/reactos/w32api/include/ddk/usbiodef.h
Modified: trunk/reactos/w32api/include/ddk/usbscan.h
Modified: trunk/reactos/w32api/include/ddk/usbuser.h
Modified: trunk/reactos/w32api/include/ddk/video.h
Modified: trunk/reactos/w32api/include/ddk/videoagp.h
Modified: trunk/reactos/w32api/include/ddk/win2k.h
Modified: trunk/reactos/w32api/include/ddk/winddi.h
Modified: trunk/reactos/w32api/include/ddk/ws2san.h
Modified: trunk/reactos/w32api/include/ddk/xfilter.h
  _____  

Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h
--- trunk/reactos/drivers/video/displays/framebuf/framebuf.h
2005-06-19 22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h
2005-06-19 22:13:41 UTC (rev 16123)
@@ -23,6 +23,7 @@

 
 #include <windef.h>
 #include <wingdi.h>
+#include <ddk/ntddk.h>
 #include <ddk/winddi.h>
 #include <ddk/ntddvdeo.h>
 
  _____  

Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
--- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
2005-06-19 22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
2005-06-19 22:13:41 UTC (rev 16123)
@@ -1,3 +1,4 @@

+#include <ddk/ntddk.h>
 #include <ddk/ntddvdeo.h>
 #include <ddk/winddi.h>
 #include <ntos/minmax.h>
  _____  

Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.h	2005-06-19
22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h	2005-06-19
22:13:41 UTC (rev 16123)
@@ -23,9 +23,7 @@

 
 /* INCLUDES
*******************************************************************/
 
-#include "stddef.h"
-#include "windef.h"
-#include "wingdi.h"
+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
  _____  

Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c
--- trunk/reactos/drivers/video/miniport/vga/initvga.c	2005-06-19
22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/miniport/vga/initvga.c	2005-06-19
22:13:41 UTC (rev 16123)
@@ -1,3 +1,4 @@

+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include "vgavideo.h"
  _____  

Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h
--- trunk/reactos/drivers/video/miniport/vga/vgamp.h	2005-06-19
22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/miniport/vga/vgamp.h	2005-06-19
22:13:41 UTC (rev 16123)
@@ -23,6 +23,7 @@

 
 /* INCLUDES
*******************************************************************/
 
+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
  _____  

Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
--- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
2005-06-19 22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
2005-06-19 22:13:41 UTC (rev 16123)
@@ -24,9 +24,7 @@

 
 /* INCLUDES
*******************************************************************/
 
-#include "stddef.h"
-#include "windef.h"
-#include "wingdi.h"
+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
  _____  

Modified: trunk/reactos/drivers/video/videoprt/videoprt.h
--- trunk/reactos/drivers/video/videoprt/videoprt.h	2005-06-19
22:11:09 UTC (rev 16122)
+++ trunk/reactos/drivers/video/videoprt/videoprt.h	2005-06-19
22:13:41 UTC (rev 16123)
@@ -24,6 +24,7 @@

 #ifndef VIDEOPRT_H
 #define VIDEOPRT_H
 
+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
  _____  

Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
--- trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -11,8 +11,8 @@

 
 /* INCLUDES
*****************************************************************/
 
+#include <hal.h>
 #include <ddk/ntdddisk.h>
-#include <hal.h>
 #include "halxbox.h"
 
 #define NDEBUG
  _____  

Modified: trunk/reactos/include/win32k/driver.h
--- trunk/reactos/include/win32k/driver.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/include/win32k/driver.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -2,6 +2,7 @@

 #ifndef __WIN32K_DRIVER_H
 #define __WIN32K_DRIVER_H
 
+#include <ddk/ntddk.h>
 #include <ddk/winddi.h>
 
 typedef BOOL (STDCALL *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA);
  _____  

Modified: trunk/reactos/lib/gdi32/include/precomp.h
--- trunk/reactos/lib/gdi32/include/precomp.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/lib/gdi32/include/precomp.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -1,8 +1,9 @@

 #include <wine/windef.h>
 #include <windows.h>
 #include <ddraw.h>
+#include <string.h>
+#include <ddk/ntddk.h>
 #include <ddentry.h>
-#include <string.h>
 #include <win32k/kapi.h>
 #include <ddk/prntfont.h>
 #include <rosrtl/logfont.h>
  _____  

Modified: trunk/reactos/lib/opengl32/teb.h
--- trunk/reactos/lib/opengl32/teb.h	2005-06-19 22:11:09 UTC (rev
16122)
+++ trunk/reactos/lib/opengl32/teb.h	2005-06-19 22:13:41 UTC (rev
16123)
@@ -27,7 +27,7 @@

 
 #else/*_MSC_VER*/
 
-#include <ntos/types.h>
-#include <napi/teb.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #endif/*_MSC_VER*/
  _____  

Modified: trunk/reactos/w32api/include/ddk/batclass.h
--- trunk/reactos/w32api/include/ddk/batclass.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/batclass.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #if defined(_BATTERYCLASS_)
   #define BCLASSAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h
--- trunk/reactos/w32api/include/ddk/cfgmgr32.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/cfgmgr32.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,20 +27,18 @@

 #pragma GCC system_header
 #endif
 
+#include "cfg.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #if defined(_CFGMGR32_)
 #define CMAPI DECLSPEC_EXPORT
 #else
 #define CMAPI DECLSPEC_IMPORT
 #endif
 
-#include "cfg.h"
-
 #include <pshpack1.h>
 
 #define CR_SUCCESS                  			0x00000000
  _____  

Modified: trunk/reactos/w32api/include/ddk/d4drvif.h
--- trunk/reactos/w32api/include/ddk/d4drvif.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/d4drvif.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "d4iface.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "d4iface.h"
-
 #define FILE_DEVICE_DOT4                  0x3a
 #define IOCTL_DOT4_USER_BASE              2049
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/d4iface.h
--- trunk/reactos/w32api/include/ddk/d4iface.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/d4iface.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DOT4_MAX_CHANNELS                 128
 #define NO_TIMEOUT                        0
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ddkmapi.h
--- trunk/reactos/w32api/include/ddk/ddkmapi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ddkmapi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #if defined(_DXAPI_)
   #define DXAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/hidclass.h
--- trunk/reactos/w32api/include/ddk/hidclass.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/hidclass.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "hidpi.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "hidpi.h"
-
 #define HID_REVISION                      0x00000001
 
 DEFINE_GUID (GUID_DEVINTERFACE_HID, \
  _____  

Modified: trunk/reactos/w32api/include/ddk/hidpi.h
--- trunk/reactos/w32api/include/ddk/hidpi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/hidpi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "hidusage.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "hidusage.h"
-
 #if defined(_HIDPI_)
   #define HIDAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/mcd.h
--- trunk/reactos/w32api/include/ddk/mcd.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/mcd.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,15 +27,14 @@

 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
 #include "srb.h"
 #include "scsi.h"
 #include "ntddchgr.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(_MCD_)
   #define CHANGERAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/miniport.h
--- trunk/reactos/w32api/include/ddk/miniport.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/miniport.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define EMULATOR_READ_ACCESS              0x01
 #define EMULATOR_WRITE_ACCESS             0x02
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/minitape.h
--- trunk/reactos/w32api/include/ddk/minitape.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/minitape.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -32,8 +32,6 @@

 
 #pragma pack(push,4)
 
-#include "ntddk.h"
-
 #define MEDIA_ERASEABLE                   0x00000001
 #define MEDIA_WRITE_ONCE                  0x00000002
 #define MEDIA_READ_ONLY                   0x00000004
  _____  

Modified: trunk/reactos/w32api/include/ddk/mountdev.h
--- trunk/reactos/w32api/include/ddk/mountdev.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/mountdev.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "mountmgr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "mountmgr.h"
-
 #define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \
   CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/mountmgr.h
--- trunk/reactos/w32api/include/ddk/mountmgr.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/mountmgr.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID,
 	0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e,
0xfb, 0x8b);
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ndis.h
--- trunk/reactos/w32api/include/ddk/ndis.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ndis.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -36,16 +36,16 @@

 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "ntddk.h"
 #include "ntddndis.h"
 #include "netpnp.h"
 #include "netevent.h"
 #include <winsock2.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(NDIS_WRAPPER)
   #define NDISAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/ndistapi.h
--- trunk/reactos/w32api/include/ddk/ndistapi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ndistapi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,12 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ndis.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ndis.h"
-
 #ifndef NDIS_TAPI_CURRENT_VERSION
 #define NDIS_TAPI_CURRENT_VERSION         0x00010003
 #endif
  _____  

Modified: trunk/reactos/w32api/include/ddk/ndiswan.h
--- trunk/reactos/w32api/include/ddk/ndiswan.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ndiswan.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,12 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ndis.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ndis.h"
-
 #define NDIS_USE_WAN_WRAPPER         			0x00000001
 
 #define NDIS_STATUS_TAPI_INDICATION
((NDIS_STATUS)0x40010080L)
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntagp.h
--- trunk/reactos/w32api/include/ddk/ntagp.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntagp.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,14 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "video.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "video.h"
-
-
 #define AGP_BUS_INTERFACE_V1              1L
 #define AGP_BUS_INTERFACE_V2              2L
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntapi.h
--- trunk/reactos/w32api/include/ddk/ntapi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntapi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -30,15 +30,15 @@

 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdarg.h>
 #include <winbase.h>
 #include "ntddk.h"
 #include "ntpoapi.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _PEB *PPEB;
 
 /* FIXME: Unknown definitions */
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntdd8042.h
--- trunk/reactos/w32api/include/ddk/ntdd8042.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntdd8042.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,14 +27,13 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddkbd.h"
+#include "ntddmou.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddkbd.h"
-#include "ntddmou.h"
-
 #define IOCTL_INTERNAL_I8042_CONTROLLER_WRITE_BUFFER \
   CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF2, METHOD_NEITHER,
FILE_ANY_ACCESS)
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddbeep.h
--- trunk/reactos/w32api/include/ddk/ntddbeep.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddbeep.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_BEEP_DEVICE_NAME               "\\Device\\Beep"
 #define DD_BEEP_DEVICE_NAME_U             L"\\Device\\Beep"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddcdrm.h
--- trunk/reactos/w32api/include/ddk/ntddcdrm.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddcdrm.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddstor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddstor.h"
-
 #define IOCTL_CDROM_BASE                  FILE_DEVICE_CD_ROM
 
 #define IOCTL_CDROM_CHECK_VERIFY \
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddcdvd.h
--- trunk/reactos/w32api/include/ddk/ntddcdvd.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddcdvd.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddstor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddstor.h"
-
 #define IOCTL_DVD_BASE                    FILE_DEVICE_DVD
 
 #define IOCTL_DVD_END_SESSION \
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddchgr.h
--- trunk/reactos/w32api/include/ddk/ntddchgr.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddchgr.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddstor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddstor.h"
-
 #define DD_CHANGER_DEVICE_NAME            "\\Device\\Changer"
 #define DD_CHANGER_DEVICE_NAME_U          L"\\Device\\Changer"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h
--- trunk/reactos/w32api/include/ddk/ntdddisk.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntdddisk.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddstor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddstor.h"
-
 #define DD_DISK_DEVICE_NAME               "\\Device\\UNKNOWN"
 #define DD_DISK_DEVICE_NAME_U             L"\\Device\\UNKNOWN"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddk.h
--- trunk/reactos/w32api/include/ddk/ntddk.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddk.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,10 +31,6 @@

 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdarg.h>
 #include <windef.h>
 #include <ntdef.h>
@@ -79,8 +75,4 @@
 /* Definitions only in Windows NT 4 */
 #include "winnt4.h"
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __NTDDK_H */
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddkbd.h
--- trunk/reactos/w32api/include/ddk/ntddkbd.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddkbd.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_KEYBOARD_DEVICE_NAME           "\\Device\\KeyboardClass"
 #define DD_KEYBOARD_DEVICE_NAME_U         L"\\Device\\KeyboardClass"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddmou.h
--- trunk/reactos/w32api/include/ddk/ntddmou.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddmou.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_MOUSE_DEVICE_NAME              "\\Device\\PointerClass"
 #define DD_MOUSE_DEVICE_NAME_U            L"\\Device\\PointerClass"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddndis.h
--- trunk/reactos/w32api/include/ddk/ntddndis.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddndis.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -29,8 +29,6 @@

 
 #pragma pack(push,4)
 
-#include "ntddk.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddpar.h
--- trunk/reactos/w32api/include/ddk/ntddpar.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddpar.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 /* Parallel port device GUIDs */
 
 DEFINE_GUID (GUID_DEVINTERFACE_PARALLEL,
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddpcm.h
--- trunk/reactos/w32api/include/ddk/ntddpcm.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddpcm.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define IOCTL_PCMCIA_BASE                 FILE_DEVICE_CONTROLLER
 
 #define DD_PCMCIA_DEVICE_NAME             "\\\\.\\Pcmcia"
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h
--- trunk/reactos/w32api/include/ddk/ntddscsi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddscsi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_SCSI_DEVICE_NAME               "\\Device\\ScsiPort"
 #define DD_SCSI_DEVICE_NAME_U             L"\\Device\\ScsiPort"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddser.h
--- trunk/reactos/w32api/include/ddk/ntddser.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddser.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 /* GUIDs */
 
 DEFINE_GUID(GUID_DEVINTERFACE_COMPORT,
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddstor.h
--- trunk/reactos/w32api/include/ddk/ntddstor.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddstor.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define IOCTL_STORAGE_BASE                FILE_DEVICE_MASS_STORAGE
 
 #define IOCTL_STORAGE_CHECK_VERIFY \
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddtape.h
--- trunk/reactos/w32api/include/ddk/ntddtape.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddtape.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddstor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddstor.h"
-
 #define DD_TAPE_DEVICE_NAME               "\\Device\\Tape"
 #define DD_TAPE_DEVICE_NAME_U             L"\\Device\\Tape"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddtdi.h
--- trunk/reactos/w32api/include/ddk/ntddtdi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddtdi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_TDI_DEVICE_NAME                "\\Device\\UNKNOWN"
 #define DD_TDI_DEVICE_NAME_U              L"\\Device\\UNKNOWN"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddvdeo.h
--- trunk/reactos/w32api/include/ddk/ntddvdeo.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddvdeo.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,9 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
-
 #define VIDEO_DEVICE_NAME                 "DISPLAY%d"
 #define WVIDEO_DEVICE_NAME                L"DISPLAY%d"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntddvol.h
--- trunk/reactos/w32api/include/ddk/ntddvol.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntddvol.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define IOCTL_VOLUME_BASE                 ((ULONG) 'V')
 
 #define IOCTL_VOLUME_LOGICAL_TO_PHYSICAL \
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntifs.h
--- trunk/reactos/w32api/include/ddk/ntifs.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntifs.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -28,13 +28,13 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddk.h"
+#include "ntapi.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntapi.h"
-
 #pragma pack(push,4)
 
 #define VER_PRODUCTBUILD 10000
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h
--- trunk/reactos/w32api/include/ddk/ntpoapi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/ntpoapi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "batclass.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "batclass.h"
-
 #define POWER_PERF_SCALE                  100
 #define PERF_LEVEL_TO_PERCENT(x)          (((x) * 1000) /
(POWER_PERF_SCALE * 10))
 #define PERCENT_TO_PERF_LEVEL(x)          (((x) * POWER_PERF_SCALE *
10) / 1000)
  _____  

Modified: trunk/reactos/w32api/include/ddk/parallel.h
--- trunk/reactos/w32api/include/ddk/parallel.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/parallel.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "ntddpar.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "ntddpar.h"
-
 #define DD_PARALLEL_PORT_BASE_NAME        "ParallelPort"
 #define DD_PARALLEL_PORT_BASE_NAME_U      L"ParallelPort"
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/pfhook.h
--- trunk/reactos/w32api/include/ddk/pfhook.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/pfhook.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define DD_IPFLTRDRVR_DEVICE_NAME         L"\\Device\\IPFILTERDRIVER"
 
 #define INVALID_PF_IF_INDEX               0xffffffff
  _____  

Modified: trunk/reactos/w32api/include/ddk/poclass.h
--- trunk/reactos/w32api/include/ddk/poclass.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/poclass.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "batclass.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "batclass.h"
-
 DEFINE_GUID(GUID_CLASS_INPUT,
   0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00,
0x00, 0x30);
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/scsi.h
--- trunk/reactos/w32api/include/ddk/scsi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/scsi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 typedef union _CDB {
   struct _CDB6GENERIC {
     UCHAR  OperationCode;
  _____  

Modified: trunk/reactos/w32api/include/ddk/scsiscan.h
--- trunk/reactos/w32api/include/ddk/scsiscan.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/scsiscan.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #define IOCTL_SCSISCAN_CMD \
   CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_CMD_CODE, METHOD_OUT_DIRECT,
FILE_ANY_ACCESS)
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/scsiwmi.h
--- trunk/reactos/w32api/include/ddk/scsiwmi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/scsiwmi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,16 +27,14 @@

 #pragma GCC system_header
 #endif
 
+#include "srb.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #pragma pack(push,4)
 
-#include "ntddk.h"
-#include "srb.h"
-
-
 typedef struct _SCSIWMI_REQUEST_CONTEXT {
   PVOID  UserContext;
   ULONG  BufferSize;
  _____  

Modified: trunk/reactos/w32api/include/ddk/srb.h
--- trunk/reactos/w32api/include/ddk/srb.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/srb.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 #if defined(_SCSIPORT_)
   #define SCSIPORTAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/storport.h
--- trunk/reactos/w32api/include/ddk/storport.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/storport.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "srb.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "srb.h"
-
 #if defined(_STORPORT_)
   #define STORPORTAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/tdi.h
--- trunk/reactos/w32api/include/ddk/tdi.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/tdi.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,15 +27,14 @@

 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
 #include "ntddtdi.h"
 #include "tdistat.h"
 #include "netpnp.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Basic types */
 
 typedef LONG TDI_STATUS;
  _____  

Modified: trunk/reactos/w32api/include/ddk/tdiinfo.h
--- trunk/reactos/w32api/include/ddk/tdiinfo.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/tdiinfo.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
-#include "ntddk.h"
-
 typedef struct TDIEntityID {
   ULONG  tei_entity;
   ULONG  tei_instance;
  _____  

Modified: trunk/reactos/w32api/include/ddk/tdikrnl.h
--- trunk/reactos/w32api/include/ddk/tdikrnl.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/tdikrnl.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -27,13 +27,12 @@

 #pragma GCC system_header
 #endif
 
+#include "tdi.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ntddk.h"
-#include "tdi.h"
-
 #if defined(_TDI_)
   #define TDIKRNLAPI DECLSPEC_EXPORT
 #else
  _____  

Modified: trunk/reactos/w32api/include/ddk/tvout.h
--- trunk/reactos/w32api/include/ddk/tvout.h	2005-06-19 22:11:09 UTC
(rev 16122)
+++ trunk/reactos/w32api/include/ddk/tvout.h	2005-06-19 22:13:41 UTC
(rev 16123)
@@ -31,8 +31,6 @@

 extern "C" {
 #endif
 
[truncated at 1000 lines; 663 more skipped]