- 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. svn path=/trunk/; revision=16123
2024-08-21 02:43:48 +00:00 · 2005-06-19 22:13:41 +00:00 · 2005-06-19 22:13:41 +00:00 · 8098dc0a97
parent 9bd5178ad2
commit 8098dc0a97
76 changed files with 203 additions and 308 deletions
--- a/reactos/drivers/video/displays/framebuf/framebuf.h
+++ b/reactos/drivers/video/displays/framebuf/framebuf.h
@ -23,6 +23,7 @@

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

--- a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
+++ b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
@ -1,3 +1,4 @@
+#include <ddk/ntddk.h>
 #include <ddk/ntddvdeo.h>
 #include <ddk/winddi.h>
 #include <ntos/minmax.h>
--- a/reactos/drivers/video/miniport/vbe/vbemp.h
+++ b/reactos/drivers/video/miniport/vbe/vbemp.h
@ -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>
--- a/reactos/drivers/video/miniport/vga/initvga.c
+++ b/reactos/drivers/video/miniport/vga/initvga.c
@ -1,3 +1,4 @@
+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include "vgavideo.h"
--- a/reactos/drivers/video/miniport/vga/vgamp.h
+++ b/reactos/drivers/video/miniport/vga/vgamp.h
@ -23,6 +23,7 @@

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

+#include <ddk/ntddk.h>
 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
--- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
+++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
@ -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>
--- a/reactos/drivers/video/videoprt/videoprt.h
+++ b/reactos/drivers/video/videoprt/videoprt.h
@ -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>
--- a/reactos/hal/halx86/xbox/part_xbox.c
+++ b/reactos/hal/halx86/xbox/part_xbox.c
@ -11,8 +11,8 @@

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

-#include <ddk/ntdddisk.h>
 #include <hal.h>
+#include <ddk/ntdddisk.h>
 #include "halxbox.h"

 #define NDEBUG
--- a/reactos/include/win32k/driver.h
+++ b/reactos/include/win32k/driver.h
@ -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);
--- a/reactos/lib/gdi32/include/precomp.h
+++ b/reactos/lib/gdi32/include/precomp.h
@ -1,8 +1,9 @@
 #include <wine/windef.h>
 #include <windows.h>
 #include <ddraw.h>
-#include <ddentry.h>
 #include <string.h>
+#include <ddk/ntddk.h>
+#include <ddentry.h>
 #include <win32k/kapi.h>
 #include <ddk/prntfont.h>
 #include <rosrtl/logfont.h>
--- a/reactos/lib/opengl32/teb.h
+++ b/reactos/lib/opengl32/teb.h
@ -27,7 +27,7 @@ static inline PTEB __declspec(naked) NtCurrentTeb(void)

 #else/*_MSC_VER*/

-#include <ntos/types.h>
-#include <napi/teb.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>

 #endif/*_MSC_VER*/
--- a/reactos/w32api/include/ddk/batclass.h
+++ b/reactos/w32api/include/ddk/batclass.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #if defined(_BATTERYCLASS_)
  #define BCLASSAPI DECLSPEC_EXPORT
 #else
--- a/reactos/w32api/include/ddk/cfgmgr32.h
+++ b/reactos/w32api/include/ddk/cfgmgr32.h
@ -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
--- a/reactos/w32api/include/ddk/d4drvif.h
+++ b/reactos/w32api/include/ddk/d4drvif.h
@ -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

--- a/reactos/w32api/include/ddk/d4iface.h
+++ b/reactos/w32api/include/ddk/d4iface.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define DOT4_MAX_CHANNELS                 128
 #define NO_TIMEOUT                        0

--- a/reactos/w32api/include/ddk/ddkmapi.h
+++ b/reactos/w32api/include/ddk/ddkmapi.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #if defined(_DXAPI_)
  #define DXAPI DECLSPEC_EXPORT
 #else
--- a/reactos/w32api/include/ddk/hidclass.h
+++ b/reactos/w32api/include/ddk/hidclass.h
@ -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, \
--- a/reactos/w32api/include/ddk/hidpi.h
+++ b/reactos/w32api/include/ddk/hidpi.h
@ -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
--- a/reactos/w32api/include/ddk/mcd.h
+++ b/reactos/w32api/include/ddk/mcd.h
@ -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
--- a/reactos/w32api/include/ddk/miniport.h
+++ b/reactos/w32api/include/ddk/miniport.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define EMULATOR_READ_ACCESS              0x01
 #define EMULATOR_WRITE_ACCESS             0x02

--- a/reactos/w32api/include/ddk/minitape.h
+++ b/reactos/w32api/include/ddk/minitape.h
@ -32,8 +32,6 @@ extern "C" {

 #pragma pack(push,4)

-#include "ntddk.h"
-
 #define MEDIA_ERASEABLE                   0x00000001
 #define MEDIA_WRITE_ONCE                  0x00000002
 #define MEDIA_READ_ONLY                   0x00000004
--- a/reactos/w32api/include/ddk/mountdev.h
+++ b/reactos/w32api/include/ddk/mountdev.h
@ -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)

--- a/reactos/w32api/include/ddk/mountmgr.h
+++ b/reactos/w32api/include/ddk/mountmgr.h
@ -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);

--- a/reactos/w32api/include/ddk/ndis.h
+++ b/reactos/w32api/include/ddk/ndis.h
@ -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
--- a/reactos/w32api/include/ddk/ndistapi.h
+++ b/reactos/w32api/include/ddk/ndistapi.h
@ -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
--- a/reactos/w32api/include/ddk/ndiswan.h
+++ b/reactos/w32api/include/ddk/ndiswan.h
@ -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)
--- a/reactos/w32api/include/ddk/ntagp.h
+++ b/reactos/w32api/include/ddk/ntagp.h
@ -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

--- a/reactos/w32api/include/ddk/ntapi.h
+++ b/reactos/w32api/include/ddk/ntapi.h
@ -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 */
--- a/reactos/w32api/include/ddk/ntdd8042.h
+++ b/reactos/w32api/include/ddk/ntdd8042.h
@ -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)

--- a/reactos/w32api/include/ddk/ntddbeep.h
+++ b/reactos/w32api/include/ddk/ntddbeep.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddcdrm.h
+++ b/reactos/w32api/include/ddk/ntddcdrm.h
@ -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 \
--- a/reactos/w32api/include/ddk/ntddcdvd.h
+++ b/reactos/w32api/include/ddk/ntddcdvd.h
@ -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 \
--- a/reactos/w32api/include/ddk/ntddchgr.h
+++ b/reactos/w32api/include/ddk/ntddchgr.h
@ -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"

--- a/reactos/w32api/include/ddk/ntdddisk.h
+++ b/reactos/w32api/include/ddk/ntdddisk.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddk.h
+++ b/reactos/w32api/include/ddk/ntddk.h
@ -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 @@ typedef CONST char *PCSZ;
 /* Definitions only in Windows NT 4 */
 #include "winnt4.h"

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __NTDDK_H */
--- a/reactos/w32api/include/ddk/ntddkbd.h
+++ b/reactos/w32api/include/ddk/ntddkbd.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddmou.h
+++ b/reactos/w32api/include/ddk/ntddmou.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddndis.h
+++ b/reactos/w32api/include/ddk/ntddndis.h
@ -29,8 +29,6 @@

 #pragma pack(push,4)

-#include "ntddk.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/reactos/w32api/include/ddk/ntddpar.h
+++ b/reactos/w32api/include/ddk/ntddpar.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 /* Parallel port device GUIDs */

 DEFINE_GUID (GUID_DEVINTERFACE_PARALLEL,
--- a/reactos/w32api/include/ddk/ntddpcm.h
+++ b/reactos/w32api/include/ddk/ntddpcm.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define IOCTL_PCMCIA_BASE                 FILE_DEVICE_CONTROLLER

 #define DD_PCMCIA_DEVICE_NAME             "\\\\.\\Pcmcia"
--- a/reactos/w32api/include/ddk/ntddscsi.h
+++ b/reactos/w32api/include/ddk/ntddscsi.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddser.h
+++ b/reactos/w32api/include/ddk/ntddser.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 /* GUIDs */

 DEFINE_GUID(GUID_DEVINTERFACE_COMPORT,
--- a/reactos/w32api/include/ddk/ntddstor.h
+++ b/reactos/w32api/include/ddk/ntddstor.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define IOCTL_STORAGE_BASE                FILE_DEVICE_MASS_STORAGE

 #define IOCTL_STORAGE_CHECK_VERIFY \
--- a/reactos/w32api/include/ddk/ntddtape.h
+++ b/reactos/w32api/include/ddk/ntddtape.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddtdi.h
+++ b/reactos/w32api/include/ddk/ntddtdi.h
@ -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"

--- a/reactos/w32api/include/ddk/ntddvdeo.h
+++ b/reactos/w32api/include/ddk/ntddvdeo.h
@ -31,9 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
-
 #define VIDEO_DEVICE_NAME                 "DISPLAY%d"
 #define WVIDEO_DEVICE_NAME                L"DISPLAY%d"

--- a/reactos/w32api/include/ddk/ntddvol.h
+++ b/reactos/w32api/include/ddk/ntddvol.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define IOCTL_VOLUME_BASE                 ((ULONG) 'V')

 #define IOCTL_VOLUME_LOGICAL_TO_PHYSICAL \
--- a/reactos/w32api/include/ddk/ntifs.h
+++ b/reactos/w32api/include/ddk/ntifs.h
@ -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
--- a/reactos/w32api/include/ddk/ntpoapi.h
+++ b/reactos/w32api/include/ddk/ntpoapi.h
@ -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)
--- a/reactos/w32api/include/ddk/parallel.h
+++ b/reactos/w32api/include/ddk/parallel.h
@ -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"

--- a/reactos/w32api/include/ddk/pfhook.h
+++ b/reactos/w32api/include/ddk/pfhook.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define DD_IPFLTRDRVR_DEVICE_NAME         L"\\Device\\IPFILTERDRIVER"

 #define INVALID_PF_IF_INDEX               0xffffffff
--- a/reactos/w32api/include/ddk/poclass.h
+++ b/reactos/w32api/include/ddk/poclass.h
@ -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);

--- a/reactos/w32api/include/ddk/scsi.h
+++ b/reactos/w32api/include/ddk/scsi.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 typedef union _CDB {
  struct _CDB6GENERIC {
    UCHAR  OperationCode;
--- a/reactos/w32api/include/ddk/scsiscan.h
+++ b/reactos/w32api/include/ddk/scsiscan.h
@ -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)

--- a/reactos/w32api/include/ddk/scsiwmi.h
+++ b/reactos/w32api/include/ddk/scsiwmi.h
@ -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;
--- a/reactos/w32api/include/ddk/srb.h
+++ b/reactos/w32api/include/ddk/srb.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #if defined(_SCSIPORT_)
  #define SCSIPORTAPI DECLSPEC_EXPORT
 #else
--- a/reactos/w32api/include/ddk/storport.h
+++ b/reactos/w32api/include/ddk/storport.h
@ -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
--- a/reactos/w32api/include/ddk/tdi.h
+++ b/reactos/w32api/include/ddk/tdi.h
@ -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;
--- a/reactos/w32api/include/ddk/tdiinfo.h
+++ b/reactos/w32api/include/ddk/tdiinfo.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 typedef struct TDIEntityID {
  ULONG  tei_entity;
  ULONG  tei_instance;
--- a/reactos/w32api/include/ddk/tdikrnl.h
+++ b/reactos/w32api/include/ddk/tdikrnl.h
@ -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
--- a/reactos/w32api/include/ddk/tvout.h
+++ b/reactos/w32api/include/ddk/tvout.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 /* VIDEOPARAMETERS.dwCommand constants */
 #define VP_COMMAND_GET                    0x00000001
 #define VP_COMMAND_SET                    0x00000002
--- a/reactos/w32api/include/ddk/upssvc.h
+++ b/reactos/w32api/include/ddk/upssvc.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #if defined(_APCUPS_)
  #define UPSAPI DECLSPEC_EXPORT
 #else
--- a/reactos/w32api/include/ddk/usb.h
+++ b/reactos/w32api/include/ddk/usb.h
@ -31,13 +31,12 @@
 #error usbdi.h cannot be included with usb.h
 #else

+#include "usb100.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include "usb100.h"
-
 typedef LONG USBD_STATUS;
 typedef PVOID USBD_PIPE_HANDLE;
 typedef PVOID USBD_CONFIGURATION_HANDLE;
--- a/reactos/w32api/include/ddk/usb100.h
+++ b/reactos/w32api/include/ddk/usb100.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define MAXIMUM_USB_STRING_LENGTH         255

 #define USB_DEVICE_CLASS_RESERVED           0x00
--- a/reactos/w32api/include/ddk/usbcamdi.h
+++ b/reactos/w32api/include/ddk/usbcamdi.h
@ -37,8 +37,6 @@ extern "C" {

 #pragma pack(push,4)

-#include "ntddk.h"
-
 #if defined(_BATTERYCLASS_)
  #define USBCAMAPI DECLSPEC_EXPORT
 #else
--- a/reactos/w32api/include/ddk/usbdi.h
+++ b/reactos/w32api/include/ddk/usbdi.h
@ -31,13 +31,12 @@
 #error usb.h cannot be included with usbdi.h
 #else

+#include "usbioctl.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include "usbioctl.h"
-
 #define USBDI_VERSION                     0x300

 #define USB_DEFAULT_DEVICE_ADDRESS        0
--- a/reactos/w32api/include/ddk/usbioctl.h
+++ b/reactos/w32api/include/ddk/usbioctl.h
@ -27,14 +27,13 @@
 #pragma GCC system_header
 #endif

+#include "usb100.h"
+#include "usbiodef.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include "usb100.h"
-#include "usbiodef.h"
-
 #define USBD_PORT_ENABLED                 1
 #define USBD_PORT_CONNECTED               2

--- a/reactos/w32api/include/ddk/usbiodef.h
+++ b/reactos/w32api/include/ddk/usbiodef.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, \
  0xf18a0e88, 0xc30c, 0x11d0, 0x88, 0x15, 0x00, 0xa0, 0xc9, 0x06, 0xbe, 0xd8);

--- a/reactos/w32api/include/ddk/usbscan.h
+++ b/reactos/w32api/include/ddk/usbscan.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #define FILE_DEVICE_USB_SCAN              0x8000
 #define IOCTL_INDEX                       0x0800

--- a/reactos/w32api/include/ddk/usbuser.h
+++ b/reactos/w32api/include/ddk/usbuser.h
@ -27,14 +27,13 @@
 #pragma GCC system_header
 #endif

+#include "usb.h"
+#include "usbiodef.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include "usb.h"
-#include "usbiodef.h"
-
 #include <pshpack1.h>

 #define USBUSER_VERSION                   0x0004
--- a/reactos/w32api/include/ddk/video.h
+++ b/reactos/w32api/include/ddk/video.h
@ -23,7 +23,6 @@
 #ifndef __VIDEO_H
 #define __VIDEO_H

-
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
@ -32,12 +31,6 @@
 #error winddi.h cannot be included with video.h
 #else

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
-
 #if defined(_VIDEOPORT_)
  #define VPAPI DECLSPEC_EXPORT
 #else
@ -47,6 +40,9 @@ extern "C" {
 #include "videoagp.h"
 #include "ntddvdeo.h"

+#ifdef __cplusplus
+extern "C" {
+#endif

 typedef LONG VP_STATUS;
 typedef VP_STATUS *PVP_STATUS;
@ -227,8 +223,8 @@ typedef enum _VIDEO_CHILD_TYPE {
  Other
 } VIDEO_CHILD_TYPE, *PVIDEO_CHILD_TYPE;

-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_GET_CHILD_DESCRIPTOR)(
+typedef VP_STATUS
+(DDKAPI *PVIDEO_HW_GET_CHILD_DESCRIPTOR)(
  IN PVOID  HwDeviceExtension,
  IN PVIDEO_CHILD_ENUM_INFO  ChildEnumInfo,
  OUT  PVIDEO_CHILD_TYPE  VideoChildType,
@ -236,12 +232,12 @@ typedef VP_STATUS DDKAPI
  OUT  PULONG  UId,
  OUT  PULONG  pUnused);

-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_INITIALIZE)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_HW_INITIALIZE)(
  IN PVOID  HwDeviceExtension);

-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_INTERRUPT)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_HW_INTERRUPT)(
  IN PVOID  HwDeviceExtension);

 /* VIDEO_ACCESS_RANGE.RangePassive */
@ -287,27 +283,27 @@ typedef struct _QUERY_INTERFACE {
  PVOID  InterfaceSpecificData;
 } QUERY_INTERFACE, *PQUERY_INTERFACE;

-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_QUERY_INTERFACE)(
+typedef VP_STATUS
+(DDKAPI *PVIDEO_HW_QUERY_INTERFACE)(
  IN PVOID  HwDeviceExtension,
  IN OUT  PQUERY_INTERFACE  QueryInterface);

-typedef VP_STATUS DDKAPI
-(*PMINIPORT_GET_REGISTRY_ROUTINE)(
+typedef VP_STATUS
+(DDKAPI *PMINIPORT_GET_REGISTRY_ROUTINE)(
  IN PVOID  HwDeviceExtension,
  IN PVOID  Context,
  IN OUT  PWSTR  ValueName,
  IN OUT  PVOID  ValueData,
  IN ULONG  ValueLength);

-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_RESET_HW)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_HW_RESET_HW)(
  IN PVOID  HwDeviceExtension,
  IN ULONG  Columns,
  IN ULONG  Rows);

-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_POWER_SET)(
+typedef VP_STATUS
+(DDKAPI *PVIDEO_HW_POWER_SET)(
  IN PVOID  HwDeviceExtension,
  IN ULONG  HwId,
  IN PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
@ -329,63 +325,63 @@ typedef struct _VIDEO_REQUEST_PACKET {
  ULONG  OutputBufferLength;
 } VIDEO_REQUEST_PACKET, *PVIDEO_REQUEST_PACKET;

-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_START_IO)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_HW_START_IO)(
  IN PVOID  HwDeviceExtension,
  IN PVIDEO_REQUEST_PACKET  RequestPacket);

-typedef BOOLEAN DDKAPI
-(*PMINIPORT_SYNCHRONIZE_ROUTINE)(
+typedef BOOLEAN
+(DDKAPI *PMINIPORT_SYNCHRONIZE_ROUTINE)(
  IN PVOID  Context);

-typedef VOID DDKAPI
-(*PVIDEO_HW_TIMER)(
+typedef VOID
+(DDKAPI *PVIDEO_HW_TIMER)(
  IN PVOID  HwDeviceExtension);

-typedef VOID DDKAPI
-(*PMINIPORT_DPC_ROUTINE)(
+typedef VOID
+(DDKAPI *PMINIPORT_DPC_ROUTINE)(
  IN PVOID  HwDeviceExtension,
  IN PVOID  Context);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_UCHAR)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_UCHAR)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
  IN PUCHAR  Data);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_UCHAR_STRING)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_UCHAR_STRING)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
  IN PUCHAR  Data,
  IN ULONG  DataLength);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_ULONG)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_ULONG)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
  IN PULONG  Data);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_ULONG_STRING)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_ULONG_STRING)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
  IN PULONG  Data,
  IN ULONG  DataLength);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_USHORT)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_USHORT)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
  IN PUSHORT  Data);

-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_USHORT_STRING)(
+typedef VP_STATUS
+(DDKAPI *PDRIVER_IO_PORT_USHORT_STRING)(
  IN ULONG_PTR  Context,
  IN ULONG  Port,
  IN UCHAR  AccessMode,
@ -483,22 +479,22 @@ typedef struct _VIDEO_PORT_AGP_INTERFACE_2 {

 #define VIDEO_PORT_I2C_INTERFACE_VERSION_1  1

-typedef VOID DDKAPI
-(*PVIDEO_WRITE_CLOCK_LINE)(
+typedef VOID
+(DDKAPI *PVIDEO_WRITE_CLOCK_LINE)(
  PVOID HwDeviceExtension,
  UCHAR Data);

-typedef VOID DDKAPI
-(*PVIDEO_WRITE_DATA_LINE)(
+typedef VOID
+(DDKAPI *PVIDEO_WRITE_DATA_LINE)(
  PVOID HwDeviceExtension,
  UCHAR Data);

-typedef BOOLEAN DDKAPI
-(*PVIDEO_READ_CLOCK_LINE)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_READ_CLOCK_LINE)(
  PVOID HwDeviceExtension);

-typedef BOOLEAN DDKAPI
-(*PVIDEO_READ_DATA_LINE)(
+typedef BOOLEAN
+(DDKAPI *PVIDEO_READ_DATA_LINE)(
  PVOID HwDeviceExtension);

 typedef struct _I2C_CALLBACKS
@ -509,25 +505,25 @@ typedef struct _I2C_CALLBACKS
  IN PVIDEO_READ_DATA_LINE  ReadDataLine;
 } I2C_CALLBACKS, *PI2C_CALLBACKS;

-typedef BOOLEAN DDKAPI
-(*PI2C_START)(
+typedef BOOLEAN
+(DDKAPI *PI2C_START)(
  IN PVOID  HwDeviceExtension,
  IN PI2C_CALLBACKS  I2CCallbacks);

-typedef BOOLEAN DDKAPI
-(*PI2C_STOP)(
+typedef BOOLEAN
+(DDKAPI *PI2C_STOP)(
  IN PVOID  HwDeviceExtension,
  IN PI2C_CALLBACKS  I2CCallbacks);

-typedef BOOLEAN DDKAPI
-(*PI2C_WRITE)(
+typedef BOOLEAN
+(DDKAPI *PI2C_WRITE)(
  IN PVOID  HwDeviceExtension,
  IN PI2C_CALLBACKS  I2CCallbacks,
  IN PUCHAR  Buffer,
  IN ULONG  Length);

-typedef BOOLEAN DDKAPI
-(*PI2C_READ)(
+typedef BOOLEAN
+(DDKAPI *PI2C_READ)(
  IN PVOID  HwDeviceExtension,
  IN PI2C_CALLBACKS  I2CCallbacks,
  OUT PUCHAR  Buffer,
@ -548,34 +544,34 @@ typedef struct _VIDEO_PORT_I2C_INTERFACE {
 /* VIDEO_PORT_INT10_INTERFACE.Version constants */
 #define VIDEO_PORT_INT10_INTERFACE_VERSION_1 1

-typedef VP_STATUS DDKAPI
-(*PINT10_ALLOCATE_BUFFER)(
+typedef VP_STATUS
+(DDKAPI *PINT10_ALLOCATE_BUFFER)(
  IN PVOID  Context,
  OUT PUSHORT  Seg,
  OUT PUSHORT  Off,
  IN OUT PULONG  Length);

-typedef VP_STATUS DDKAPI
-(*PINT10_CALL_BIOS)(
+typedef VP_STATUS
+(DDKAPI *PINT10_CALL_BIOS)(
  IN PVOID  Context,
  IN OUT PINT10_BIOS_ARGUMENTS  BiosArguments);

-typedef VP_STATUS DDKAPI
-(*PINT10_FREE_BUFFER)(
+typedef VP_STATUS
+(DDKAPI *PINT10_FREE_BUFFER)(
  IN PVOID  Context,
  IN USHORT  Seg,
  IN USHORT  Off);

-typedef VP_STATUS DDKAPI
-(*PINT10_READ_MEMORY)(
+typedef VP_STATUS
+(DDKAPI *PINT10_READ_MEMORY)(
  IN PVOID  Context,
  IN USHORT  Seg,
  IN USHORT  Off,
  OUT PVOID  Buffer,
  IN ULONG  Length);

-typedef VP_STATUS DDKAPI
-(*PINT10_WRITE_MEMORY)(
+typedef VP_STATUS
+(DDKAPI *PINT10_WRITE_MEMORY)(
  IN PVOID  Context,
  IN USHORT  Seg,
  IN USHORT  Off,
--- a/reactos/w32api/include/ddk/videoagp.h
+++ b/reactos/w32api/include/ddk/videoagp.h
@ -27,81 +27,79 @@
 #pragma GCC system_header
 #endif

+#include "video.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include "video.h"
-
-
 #define VIDEO_AGP_RATE_1X                 0x00000001
 #define VIDEO_AGP_RATE_2X                 0x00000002
 #define VIDEO_AGP_RATE_4X                 0x00000004
 #define VIDEO_AGP_RATE_8X                 0x00000008

 typedef enum _VIDEO_PORT_CACHE_TYPE {
-	VpNonCached = 0,
-	VpWriteCombined,
-	VpCached
+  VpNonCached = 0,
+  VpWriteCombined,
+  VpCached
 } VIDEO_PORT_CACHE_TYPE;

-typedef BOOLEAN DDKAPI
-(*PAGP_COMMIT_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
+typedef BOOLEAN
+(DDKAPI *PAGP_COMMIT_PHYSICAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  PhysicalReserveContext,
+  IN ULONG  Pages,
+  IN ULONG  Offset);

-typedef PVOID DDKAPI
-(*PAGP_COMMIT_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
+typedef PVOID
+(DDKAPI *PAGP_COMMIT_VIRTUAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  VirtualReserveContext,
+  IN ULONG  Pages,
+  IN ULONG  Offset);

-typedef VOID DDKAPI
-(*PAGP_FREE_PHYSICAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  PhysicalReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
+typedef VOID
+(DDKAPI *PAGP_FREE_PHYSICAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  PhysicalReserveContext,
+  IN ULONG  Pages,
+  IN ULONG  Offset);

-typedef VOID DDKAPI
-(*PAGP_FREE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  VirtualReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
+typedef VOID
+(DDKAPI *PAGP_FREE_VIRTUAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  VirtualReserveContext,
+  IN ULONG  Pages,
+  IN ULONG  Offset);

-typedef VOID DDKAPI
-(*PAGP_RELEASE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext);
+typedef VOID
+(DDKAPI *PAGP_RELEASE_PHYSICAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  PhysicalReserveContext);

-typedef VOID DDKAPI
-(*PAGP_RELEASE_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext);
+typedef VOID
+(DDKAPI *PAGP_RELEASE_VIRTUAL)(
+  IN PVOID  HwDeviceExtension,
+  IN PVOID  VirtualReserveContext);

-typedef PHYSICAL_ADDRESS DDKAPI
-(*PAGP_RESERVE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  ULONG  Pages,
-  IN  VIDEO_PORT_CACHE_TYPE  Caching,
+typedef PHYSICAL_ADDRESS
+(DDKAPI *PAGP_RESERVE_PHYSICAL)(
+  IN PVOID  HwDeviceExtension,
+  IN ULONG  Pages,
+  IN VIDEO_PORT_CACHE_TYPE  Caching,
  OUT PVOID  *PhysicalReserveContext);

-typedef PVOID DDKAPI
-(*PAGP_RESERVE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  HANDLE  ProcessHandle,
-  IN  PVOID  PhysicalReserveContext,
+typedef PVOID
+(DDKAPI *PAGP_RESERVE_VIRTUAL)(
+  IN PVOID  HwDeviceExtension,
+  IN HANDLE  ProcessHandle,
+  IN PVOID  PhysicalReserveContext,
  OUT PVOID  *VirtualReserveContext);

-typedef BOOLEAN DDKAPI
-(*PAGP_SET_RATE)(
-	IN  PVOID  HwDeviceExtension,
-	IN  ULONG  AgpRate);
+typedef BOOLEAN
+(DDKAPI *PAGP_SET_RATE)(
+  IN PVOID  HwDeviceExtension,
+  IN ULONG  AgpRate);

 typedef struct _VIDEO_PORT_AGP_SERVICES {
  PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
@ -119,8 +117,8 @@ VPAPI
 BOOLEAN
 DDKAPI
 VideoPortGetAgpServices(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVIDEO_PORT_AGP_SERVICES  AgpServices);
+  IN PVOID  HwDeviceExtension,
+  IN PVIDEO_PORT_AGP_SERVICES  AgpServices);

 #ifdef __cplusplus
 }
--- a/reactos/w32api/include/ddk/win2k.h
+++ b/reactos/w32api/include/ddk/win2k.h
@ -31,8 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
 #pragma pack(push,4)

 typedef enum _BUS_DATA_TYPE {
--- a/reactos/w32api/include/ddk/winddi.h
+++ b/reactos/w32api/include/ddk/winddi.h
@ -31,13 +31,12 @@
 #error video.h cannot be included with winddi.h
 #else

+#include <wingdi.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "ntddk.h"
-#include <wingdi.h>
-
 #ifndef __DD_INCLUDED__
 /* FIXME: Some DirectDraw structures not added yet */
 typedef ULONG_PTR FLATPTR;
--- a/reactos/w32api/include/ddk/ws2san.h
+++ b/reactos/w32api/include/ddk/ws2san.h
@ -27,14 +27,12 @@
 #pragma GCC system_header
 #endif

+#include <winsock2.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include <winsock2.h>
-#include "ntddk.h"
-
-
 #define WSPAPI STDCALL

 /* FIXME: Unknown definitions */
--- a/reactos/w32api/include/ddk/xfilter.h
+++ b/reactos/w32api/include/ddk/xfilter.h
@ -31,9 +31,6 @@
 extern "C" {
 #endif

-#include "ntddk.h"
-
-
 #define ETH_LENGTH_OF_ADDRESS             6

 #define ETH_IS_BROADCAST(Address) \