stop the abuse of having the ddk directory in the path when including a ddk header

svn path=/trunk/; revision=19810
2025-04-05 05:01:03 +00:00 · 2005-12-01 21:37:19 +00:00 · 2005-12-01 21:37:19 +00:00 · de98d55a46
commit de98d55a46
parent 5114c3f992
152 changed files with 247 additions and 247 deletions
--- a/reactos/apps/utils/nts2w32err/nts2w32err.c
+++ b/reactos/apps/utils/nts2w32err/nts2w32err.c
@ -13,7 +13,7 @@
 *
 */
 #include <windows.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>

 #include <stdio.h>

--- a/reactos/apps/utils/objdir/objdir.c
+++ b/reactos/apps/utils/objdir/objdir.c
@ -17,7 +17,7 @@
 * 		Added -r option.
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
--- a/reactos/apps/utils/partinfo/partinfo.c
+++ b/reactos/apps/utils/partinfo/partinfo.c
@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>

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

 //#define DUMP_DATA
 #define DUMP_SIZE_INFO
--- a/reactos/apps/utils/pice/loader/stdinc.h
+++ b/reactos/apps/utils/pice/loader/stdinc.h
@ -3,9 +3,9 @@
 #include <malloc.h>
 #include <io.h>

-//#include <ddk/winnt.h>
+//#include <winnt.h>
 #include <windows.h>
-#include <ddk/kefuncs.h>
+#include <kefuncs.h>

 //#include <winnt.h>
 #include <sys/types.h>
--- a/reactos/apps/utils/pice/module/patch.c
+++ b/reactos/apps/utils/pice/module/patch.c
@ -39,8 +39,8 @@ Copyright notice:

 //#include <asm/system.h>

-#include <ddk/ntddkbd.h>
-#include <ddk/ntdd8042.h>
+#include <ntddkbd.h>
+#include <ntdd8042.h>
 #include <rosrtl/string.h>

 ////////////////////////////////////////////////////
--- a/reactos/apps/utils/pice/module/precomp.h
+++ b/reactos/apps/utils/pice/module/precomp.h
@ -31,10 +31,10 @@ Copyright notice:
 #define FRAMEBUFFER_SIZE (0x8000)
 #define LINES_IN_BUFFER (2048)

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <ntos/types.h>
-#include <ddk/types.h>
-//#include <ddk/i386/tss.h>
+#include <types.h>
+//#include <i386/tss.h>
 #include <internal/ob.h>
 #include <internal/i386/segment.h>
 #include <defines.h>
--- a/reactos/apps/utils/pice/module/privateice.c
+++ b/reactos/apps/utils/pice/module/privateice.c
@ -45,7 +45,7 @@ Copyright notice:
 #include <linux/string.h>
 */

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

--- a/reactos/apps/utils/pice/shared/shared.h
+++ b/reactos/apps/utils/pice/shared/shared.h
@ -35,7 +35,7 @@ Copyright notice:

 --*/

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

 //temporary
--- a/reactos/apps/utils/pnpdump/pnpdump.c
+++ b/reactos/apps/utils/pnpdump/pnpdump.c
@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <conio.h>

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

 #include <pshpack1.h>

--- a/reactos/boot/freeldr/freeldr/arch/i386/portio.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/portio.c
@ -9,7 +9,7 @@
 *                  Created 18/10/99
 */

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


--- a/reactos/boot/freeldr/freeldr/include/freeldr.h
+++ b/reactos/boot/freeldr/freeldr/include/freeldr.h
@ -24,7 +24,7 @@

 #include <stdlib.h>
 #include <stdio.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <ndk/ntndk.h>
 #include <arch.h>
 #include <rtl.h>
--- a/reactos/drivers/bus/acpi/include/platform/types.h
+++ b/reactos/drivers/bus/acpi/include/platform/types.h
@ -13,7 +13,7 @@
 #ifndef __INCLUDE_ACPI_TYPES_H
 #define __INCLUDE_ACPI_TYPES_H

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

 typedef UCHAR                              UINT8;
--- a/reactos/drivers/bus/acpi/ospm/include/acpisys.h
+++ b/reactos/drivers/bus/acpi/ospm/include/acpisys.h
@ -5,7 +5,7 @@
 */
 #define ACPI_DEBUG
 #include <acpi.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <bm.h>

 typedef ACPI_STATUS (*ACPI_DRIVER_FUNCTION)(VOID);
--- a/reactos/drivers/bus/isapnp/isapnp.c
+++ b/reactos/drivers/bus/isapnp/isapnp.c
@ -8,7 +8,7 @@
 * UPDATE HISTORY:
 *      01-05-2001  CSH  Created
 */
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <isapnp.h>

 #define NDEBUG
--- a/reactos/drivers/bus/pci/pci.h
+++ b/reactos/drivers/bus/pci/pci.h
@ -1,8 +1,8 @@
 #ifndef __PCI_H
 #define __PCI_H

-#include <ddk/ntifs.h>
-#include <ddk/wdmguid.h>
+#include <ntifs.h>
+#include <wdmguid.h>
 #include <stdio.h>

 typedef struct _PCI_DEVICE
--- a/reactos/drivers/dd/beep/beep.c
+++ b/reactos/drivers/dd/beep/beep.c
@ -12,8 +12,8 @@

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

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@ -11,7 +11,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <wincon.h>
 #include <blue/ntddblue.h>
 #include <ndk/halfuncs.h>
--- a/reactos/drivers/dd/bootvid/bootvid.c
+++ b/reactos/drivers/dd/bootvid/bootvid.c
@ -23,7 +23,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <ndk/ldrfuncs.h>
 #include "bootvid.h"
 #include "ntbootvid.h"
--- a/reactos/drivers/dd/debugout/debugout.c
+++ b/reactos/drivers/dd/debugout/debugout.c
@ -22,7 +22,7 @@
 */

 /* INCLUDES */
-#include <ddk/ntddk.h>
+#include <ntddk.h>

 NTSTATUS STDCALL
 DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath);
--- a/reactos/drivers/dd/mpu401/mpu401.c
+++ b/reactos/drivers/dd/mpu401/mpu401.c
@ -12,8 +12,8 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/dd/mpu401/portio.c
+++ b/reactos/drivers/dd/mpu401/portio.c
@ -9,7 +9,7 @@
 *                       Sept 26, 2003: Created
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "mpu401.h"


--- a/reactos/drivers/dd/mpu401/settings.c
+++ b/reactos/drivers/dd/mpu401/settings.c
@ -9,7 +9,7 @@
 *                       Sept 27, 2003: Created
 */

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

 #include "mpu401.h"

--- a/reactos/drivers/dd/mpu401/test.c
+++ b/reactos/drivers/dd/mpu401/test.c
@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <windows.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "mpu401.h"

 int main()
--- a/reactos/drivers/dd/parallel/parallel.c
+++ b/reactos/drivers/dd/parallel/parallel.c
@ -12,7 +12,7 @@

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

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

 #include "parallel.h"

--- a/reactos/drivers/dd/sndblst/card.c
+++ b/reactos/drivers/dd/sndblst/card.c
@ -4,7 +4,7 @@
    http://www.cae.wisc.edu/~brodskye/sb16doc/sb16doc.html
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "sndblst.h"

 VOID SetOutputSampleRate(UINT BasePort, UINT SampleRate)
--- a/reactos/drivers/dd/sndblst/dma.c
+++ b/reactos/drivers/dd/sndblst/dma.c
@ -2,7 +2,7 @@
    Routines to simplify the use of DMA for Sound Blaster driver
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "sndblst.h"

 #if 0
--- a/reactos/drivers/dd/sndblst/irq.c
+++ b/reactos/drivers/dd/sndblst/irq.c
@ -1,4 +1,4 @@
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "sndblst.h"

 #if 0
--- a/reactos/drivers/dd/sndblst/portio.c
+++ b/reactos/drivers/dd/sndblst/portio.c
@ -9,7 +9,7 @@
 *                       Sept 28, 2003: Created
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "sndblst.h"

 BOOLEAN WaitToSend(UINT BasePort)
--- a/reactos/drivers/dd/sndblst/sndblst.c
+++ b/reactos/drivers/dd/sndblst/sndblst.c
@ -11,7 +11,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "sndblst.h"

 NTSTATUS STDCALL
--- a/reactos/drivers/dd/sndblst/sndblst.h
+++ b/reactos/drivers/dd/sndblst/sndblst.h
@ -12,7 +12,7 @@
 #ifndef __INCLUDES_SNDBLST_H__
 #define __INCLUDES_SNDBLST_H__

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/dd/sndblst/test.c
+++ b/reactos/drivers/dd/sndblst/test.c
@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <windows.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "mpu401.h"

 int main()
--- a/reactos/drivers/dd/sndblst/test/sb.c
+++ b/reactos/drivers/dd/sndblst/test/sb.c
@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <windows.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>

 int main()
 {
--- a/reactos/drivers/dd/sound/sb16.c
+++ b/reactos/drivers/dd/sound/sb16.c
@ -12,7 +12,7 @@

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

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

 NTSTATUS STDCALL
 DriverEntry(PDRIVER_OBJECT DriverObject,
--- a/reactos/drivers/dd/sound/sound.c
+++ b/reactos/drivers/dd/sound/sound.c
@ -12,7 +12,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <string.h>
 #include <devices.h>
 #include "sb16.h"
--- a/reactos/drivers/dd/sound/wave.c
+++ b/reactos/drivers/dd/sound/wave.c
@ -12,7 +12,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <string.h>
 #include <devices.h>

--- a/reactos/drivers/dd/test/test.c
+++ b/reactos/drivers/dd/test/test.c
@ -11,7 +11,7 @@

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

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

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

--- a/reactos/drivers/fs/cdfs/cdfs.h
+++ b/reactos/drivers/fs/cdfs/cdfs.h
@ -1,8 +1,8 @@
 #ifndef CDFS_H
 #define CDFS_H

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+#include <ntddk.h>
+#include <ntifs.h>
 #include <ntddcdrm.h>
 #include <ccros.h>

--- a/reactos/drivers/fs/ext2/attr.c
+++ b/reactos/drivers/fs/ext2/attr.c
@ -9,7 +9,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <wchar.h>
 #include <string.h>

--- a/reactos/drivers/fs/ext2/blockdev.c
+++ b/reactos/drivers/fs/ext2/blockdev.c
@ -9,7 +9,7 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ext2/dir.c
+++ b/reactos/drivers/fs/ext2/dir.c
@ -9,7 +9,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <wchar.h>
 #include <string.h>

--- a/reactos/drivers/fs/ext2/ext2fs.h
+++ b/reactos/drivers/fs/ext2/ext2fs.h
@ -1,5 +1,5 @@
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+#include <ntddk.h>
+#include <ntifs.h>

 BOOLEAN Ext2ReadSectors(IN PDEVICE_OBJECT pDeviceObject,
 			IN ULONG	DiskSector,
--- a/reactos/drivers/fs/ext2/file.c
+++ b/reactos/drivers/fs/ext2/file.c
@ -9,7 +9,7 @@

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

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ext2/inode.c
+++ b/reactos/drivers/fs/ext2/inode.c
@ -10,7 +10,7 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ext2/quota.c
+++ b/reactos/drivers/fs/ext2/quota.c
@ -9,7 +9,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <wchar.h>
 #include <string.h>

--- a/reactos/drivers/fs/ext2/rw.c
+++ b/reactos/drivers/fs/ext2/rw.c
@ -9,7 +9,7 @@

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

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

 #define NDEBUG
--- a/reactos/drivers/fs/ext2/security.c
+++ b/reactos/drivers/fs/ext2/security.c
@ -9,7 +9,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <wchar.h>
 #include <string.h>

--- a/reactos/drivers/fs/ext2/super.c
+++ b/reactos/drivers/fs/ext2/super.c
@ -9,7 +9,7 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/minix/block.c
+++ b/reactos/drivers/fs/minix/block.c
@ -9,7 +9,7 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/minix/blockdev.c
+++ b/reactos/drivers/fs/minix/blockdev.c
@ -9,7 +9,7 @@

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

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

 #define NDEBUG
--- a/reactos/drivers/fs/minix/cache.c
+++ b/reactos/drivers/fs/minix/cache.c
@ -9,8 +9,8 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/minix/dir.c
+++ b/reactos/drivers/fs/minix/dir.c
@ -9,7 +9,7 @@

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

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

 //#define NDEBUG
--- a/reactos/drivers/fs/minix/inode.c
+++ b/reactos/drivers/fs/minix/inode.c
@ -9,10 +9,10 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <string.h>
 #include "bitops.h"
-#include <ddk/ntifs.h>
+#include <ntifs.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/minix/minix.h
+++ b/reactos/drivers/fs/minix/minix.h
@ -1,5 +1,5 @@
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+#include <ntddk.h>
+#include <ntifs.h>

 #define MINIX_ROOT_INO 1

--- a/reactos/drivers/fs/minix/mount.c
+++ b/reactos/drivers/fs/minix/mount.c
@ -26,8 +26,8 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/minix/rw.c
+++ b/reactos/drivers/fs/minix/rw.c
@ -9,7 +9,7 @@

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

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <string.h>
 #include <ntos/minmax.h>

--- a/reactos/drivers/fs/mup/mup.c
+++ b/reactos/drivers/fs/mup/mup.c
@ -27,7 +27,7 @@

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

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

 //#define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ntfs/ntfs.h
+++ b/reactos/drivers/fs/ntfs/ntfs.h
@ -1,9 +1,9 @@
 #ifndef NTFS_H
 #define NTFS_H

-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <ddk/ntdddisk.h>
+#include <ntddk.h>
+#include <ntifs.h>
+#include <ntdddisk.h>
 #include <ccros.h>

 #define USE_ROS_CC_AND_FS
--- a/reactos/drivers/fs/ntfs/rw.c
+++ b/reactos/drivers/fs/ntfs/rw.c
@ -28,7 +28,7 @@

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

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ntfs/volinfo.c
+++ b/reactos/drivers/fs/ntfs/volinfo.c
@ -27,7 +27,7 @@

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

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/template/template.c
+++ b/reactos/drivers/fs/template/template.c
@ -28,7 +28,7 @@

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

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

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/lib/csq/csq.c
+++ b/reactos/drivers/lib/csq/csq.c
@ -26,8 +26,8 @@
 /* $Id$ */

 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+#include <ntddk.h>
+#include <ntifs.h>


 static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject,
--- a/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
+++ b/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
@ -1,7 +1,7 @@
 #ifndef _OSKITFREEBSD_H
 #define _OSKITFREEBSD_H

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

 #ifdef linux
 #include <netinet/in.h>
--- a/reactos/drivers/lib/undis/include/ndissys.h
+++ b/reactos/drivers/lib/undis/include/ndissys.h
@ -13,7 +13,7 @@
 #define NDIS50 1    /* Use NDIS 5.0 structures by default */

 //#include <basetsd.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 //#include <windef.h>
 #include <ndisfake.h>

--- a/reactos/drivers/multimedia/ks.h
+++ b/reactos/drivers/multimedia/ks.h
@ -16,7 +16,7 @@
 #ifndef __INCLUDES_REACTOS_KS_H__
 #define __INCLUDES_REACTOS_KS_H__

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

 /* What's this meant to be?! */
 #define KSDDKAPI
--- a/reactos/drivers/multimedia/portcls/portcls.h
+++ b/reactos/drivers/multimedia/portcls/portcls.h
@ -13,7 +13,7 @@
 extern "C" {
 #endif

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

 #define PORTCLASSAPI extern

--- a/reactos/drivers/net/dd/ne2000/include/ne2000.h
+++ b/reactos/drivers/net/dd/ne2000/include/ne2000.h
@ -7,7 +7,7 @@
 #ifndef __NE2000_H
 #define __NE2000_H

-#include <ddk/ndis.h>
+#include <ndis.h>
 #include <8390.h>
 #include <debug.h>

--- a/reactos/drivers/net/lan/include/precomp.h
+++ b/reactos/drivers/net/lan/include/precomp.h
@ -2,8 +2,8 @@
 #define _LAN_PRECOMP_H

 #include <limits.h>
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 #include <roscfg.h>
 #include <debug.h>
 #include <pseh.h>
--- a/reactos/drivers/net/npf/dump.c
+++ b/reactos/drivers/net/npf/dump.c
@ -25,8 +25,8 @@
 #include "ntiologc.h"
 #include "ndis.h"
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 //#define PsGetCurrentProcess() IoGetCurrentProcess()
 #ifndef PsGetCurrentThread
 #define PsGetCurrentThread() ((PETHREAD) (KeGetCurrentThread()))
--- a/reactos/drivers/net/npf/jitter.c
+++ b/reactos/drivers/net/npf/jitter.c
@ -25,8 +25,8 @@
 #include "ntiologc.h"
 #include "ndis.h"
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 #endif

 #include "packet.h"
--- a/reactos/drivers/net/npf/openclos.c
+++ b/reactos/drivers/net/npf/openclos.c
@ -24,8 +24,8 @@
 #include "ntiologc.h"
 #include "ndis.h"
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 #endif
 #include "debug.h"
 #include "packet.h"
--- a/reactos/drivers/net/npf/packet.c
+++ b/reactos/drivers/net/npf/packet.c
@ -25,8 +25,8 @@
 #include "ntiologc.h"
 #include "ndis.h"
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 #endif

 #include "ntddpack.h"
--- a/reactos/drivers/net/npf/read.c
+++ b/reactos/drivers/net/npf/read.c
@ -25,8 +25,8 @@
 #include <ntiologc.h>
 #include <ndis.h>
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>

 #define NdisReinitializePacket(Packet)										\
 {																			\
--- a/reactos/drivers/net/npf/write.c
+++ b/reactos/drivers/net/npf/write.c
@ -25,8 +25,8 @@
 #include "ntiologc.h"
 #include "ndis.h"
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
+#include <ntddk.h>
+#include <ndis.h>
 #define NdisReinitializePacket(Packet)										\
 {																			\
 	(Packet)->Private.Head = (PNDIS_BUFFER)NULL;							\
--- a/reactos/drivers/net/tcpip/include/linux.h
+++ b/reactos/drivers/net/tcpip/include/linux.h
@ -1,7 +1,7 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H

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

 #ifndef NULL
 #define NULL (void*)0
--- a/reactos/drivers/net/tcpip/include/precomp.h
+++ b/reactos/drivers/net/tcpip/include/precomp.h
@ -1,6 +1,6 @@
 #include <roscfg.h>
 #include <limits.h>
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <../recmutex/recmutex.h>
 #include <roscfg.h>
 #include <tcpip.h>
--- a/reactos/drivers/net/tcpip/include/tcpip.h
+++ b/reactos/drivers/net/tcpip/include/tcpip.h
@ -22,10 +22,10 @@
 #include <tdikrnl.h>
 #include <tdiinfo.h>
 #else
-#include <ddk/ntddk.h>
-#include <ddk/ndis.h>
-#include <ddk/tdikrnl.h>
-#include <ddk/tdiinfo.h>
+#include <ntddk.h>
+#include <ndis.h>
+#include <tdikrnl.h>
+#include <tdiinfo.h>
 #endif

 #include <debug.h>
--- a/reactos/drivers/net/tcpip/recmutex/recmutex.c
+++ b/reactos/drivers/net/tcpip/recmutex/recmutex.c
@ -1,4 +1,4 @@
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include "recmutex.h"

 VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) {
--- a/reactos/drivers/net/tdi/cte/string.c
+++ b/reactos/drivers/net/tdi/cte/string.c
@ -1,7 +1,7 @@
 /* $Id$
 *
 */
-#include <ddk/ntddk.h>
+#include <ntddk.h>

 /*
 * @unimplemented
--- a/reactos/drivers/net/tdi/cte/stubs.c
+++ b/reactos/drivers/net/tdi/cte/stubs.c
@ -1,7 +1,7 @@
 /* $Id$
 *
 */
-#include <ddk/ntddk.h>
+#include <ntddk.h>


 /*
--- a/reactos/drivers/net/tdi/misc/main.c
+++ b/reactos/drivers/net/tdi/misc/main.c
@ -2,7 +2,7 @@
 *
 * DESCRIPTION: Entry point for TDI.SYS
 */
-#include <ddk/ntddk.h>
+#include <ntddk.h>

 NTSTATUS
 STDCALL
--- a/reactos/drivers/net/tdi/tdi/dereg.c
+++ b/reactos/drivers/net/tdi/tdi/dereg.c
@ -1,8 +1,8 @@
 /* $Id$
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/tdi.h>
+#include <ntddk.h>
+#include <tdi.h>

 /* De-/Register Action IDs for TdiDeRegister */

--- a/reactos/drivers/net/tdi/tdi/handler.c
+++ b/reactos/drivers/net/tdi/tdi/handler.c
@ -2,8 +2,8 @@
 *
 * DESCRIPTION: Default TDI event handlers.
 */
-#include <ddk/ntddk.h>
-#include <ddk/tdi.h>
+#include <ntddk.h>
+#include <tdi.h>


 /*
--- a/reactos/drivers/net/tdi/tdi/obsolete.c
+++ b/reactos/drivers/net/tdi/tdi/obsolete.c
@ -2,7 +2,7 @@
 *
 */

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

 /*
 * @unimplemented
--- a/reactos/drivers/net/tdi/tdi/stubs.c
+++ b/reactos/drivers/net/tdi/tdi/stubs.c
@ -2,8 +2,8 @@
 /* $Id$
 *
 */
-#include <ddk/ntddk.h>
-#include <ddk/tdi.h>
+#include <ntddk.h>
+#include <tdi.h>

 /*
 * @unimplemented
--- a/reactos/drivers/net/tditest/include/tditest.h
+++ b/reactos/drivers/net/tditest/include/tditest.h
@ -12,7 +12,7 @@
 #include <tdikrnl.h>
 #include <tdiinfo.h>
 #else
-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <net/tdikrnl.h>
 #include <net/tdiinfo.h>
 #endif
--- a/reactos/drivers/storage/atapi/atapi.c
+++ b/reactos/drivers/storage/atapi/atapi.c
@ -48,12 +48,12 @@

 //  -------------------------------------------------------------------------

-#include <ddk/ntddk.h>
-#include <ddk/srb.h>
-#include <ddk/scsi.h>
-#include <ddk/ntddscsi.h>
-#include <ddk/ntdddisk.h>
-#include <ddk/ntddstor.h>
+#include <ntddk.h>
+#include <srb.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntdddisk.h>
+#include <ntddstor.h>

 #include "atapi.h"

--- a/reactos/drivers/storage/buslogic/BusLogic958.h
+++ b/reactos/drivers/storage/buslogic/BusLogic958.h
@ -37,11 +37,11 @@
 #ifndef _BT958_H_
 #define _BT958_H_

-#include <ddk/ntddk.h>
-#include <ddk/srb.h>
-#include <ddk/scsi.h>
-#include <ddk/ntddscsi.h>
-#include <ddk/scsiwmi.h>
+#include <ntddk.h>
+#include <srb.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <scsiwmi.h>
 //#include <ntos/kefuncs.h>


--- a/reactos/drivers/storage/cdrom/cdrom.c
+++ b/reactos/drivers/storage/cdrom/cdrom.c
@ -33,11 +33,11 @@

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

-#include <ddk/ntddk.h>
-#include <ddk/scsi.h>
-#include <ddk/ntddscsi.h>
-#include <ddk/ntdddisk.h>
-#include <ddk/ntddcdrm.h>
+#include <ntddk.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
 #include <include/class2.h>
 #include <stdio.h>

--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.c
@ -32,9 +32,9 @@

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

-#include <ddk/ntddk.h>
-#include <ddk/ntdddisk.h>
-#include <ddk/scsi.h>
+#include <ntddk.h>
+#include <ntdddisk.h>
+#include <scsi.h>
 #include <include/class2.h>
 #include <stdio.h>

--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@ -27,10 +27,10 @@

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

-#include <ddk/ntddk.h>
-#include <ddk/ntdddisk.h>
-#include <ddk/scsi.h>
-#include <ddk/ntddscsi.h>
+#include <ntddk.h>
+#include <ntdddisk.h>
+#include <scsi.h>
+#include <ntddscsi.h>
 #include <include/class2.h>
 #include <stdio.h>

--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@ -27,10 +27,10 @@

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

-#include <ddk/ntddk.h>
-#include <ddk/scsi.h>
-#include <ddk/ntdddisk.h>
-#include <ddk/ntddscsi.h>
+#include <ntddk.h>
+#include <scsi.h>
+#include <ntdddisk.h>
+#include <ntddscsi.h>
 #include <include/class2.h>
 #include <diskdump/diskdump.h>

--- a/reactos/drivers/storage/floppy/csqrtns.h
+++ b/reactos/drivers/storage/floppy/csqrtns.h
@ -27,7 +27,7 @@
 #ifdef _MSC_VER
 #include <csq.h>
 #else
-#include <ddk/csq.h>
+#include <csq.h>
 #endif

 /*
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@ -28,12 +28,12 @@

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

-#include <ddk/ntddk.h>
-#include <ddk/srb.h>
-#include <ddk/scsi.h>
-#include <ddk/ntddscsi.h>
-#include <ddk/ntddstor.h>
-#include <ddk/ntdddisk.h>
+#include <ntddk.h>
+#include <srb.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntddstor.h>
+#include <ntdddisk.h>
 #include <stdio.h>

 #define NDEBUG
--- a/reactos/drivers/test/csqtest/csqtest.c
+++ b/reactos/drivers/test/csqtest/csqtest.c
@ -7,7 +7,7 @@
 * Please refer to reactos/include/ddk/csq.h and reactos/drivers/lib/csq.
 */
 #include <ntddk.h>
-#include <ddk/csq.h>
+#include <csq.h>

 /* XXX shortcomings in our headers... */
 #define assert(x)
--- a/reactos/drivers/usb/miniport/usb_wrapper.h
+++ b/reactos/drivers/usb/miniport/usb_wrapper.h
@ -1,14 +1,14 @@
 //#include <stdlib.h>
 //#include <ntos/types.h>
-//#include <ddk/extypes.h>
+//#include <extypes.h>

 /*
  TODO: Do a major cleanup of this file!
        Lots of definitions should go to corresponding files
 */

-#include <ddk/ntifs.h>
-#include <ddk/kbdmou.h>
+#include <ntifs.h>
+#include <kbdmou.h>
 #include <debug.h>

 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
--- a/reactos/drivers/usb/usbd/test.c
+++ b/reactos/drivers/usb/usbd/test.c
@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <windows.h>
-#include <ddk/usbdi.h>
+#include <usbdi.h>

 typedef ULONG STDCALL
 (*USBD_GetInterfaceLengthTYPE)(
--- a/reactos/drivers/usb/usbd/usbd.c
+++ b/reactos/drivers/usb/usbd/usbd.c
@ -21,8 +21,8 @@
 *    USBD_GetPdoRegistryParameters (implemented)
 */

-#include <ddk/ntddk.h>
-#include <ddk/usbdi.h>
+#include <ntddk.h>
+#include <usbdi.h>
 #ifndef PLUGPLAY_REGKEY_DRIVER
 #define PLUGPLAY_REGKEY_DRIVER              2
 #endif
--- a/reactos/drivers/usb/usbhub/usbhub.h
+++ b/reactos/drivers/usb/usbhub/usbhub.h
@ -1,7 +1,7 @@
 #include <debug.h>

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

 #include "../miniport/usb_wrapper.h"
 #include "../usbport/hub.h"
--- a/reactos/drivers/usb/usbport/usbcore.c
+++ b/reactos/drivers/usb/usbport/usbcore.c
@ -3,7 +3,7 @@
   by Aleksey Bragin (aleksey@reactos.com)
 */

-#include <ddk/ntddk.h>
+#include <ntddk.h>
 #include <debug.h>
 #include "../miniport/usb_wrapper.h"

--- a/reactos/drivers/usb/usbstor/usbstor.h
+++ b/reactos/drivers/usb/usbstor/usbstor.h
@ -1,6 +1,6 @@
-#include <ddk/ntddk.h>
-#include <ddk/usbdi.h>
-#include <ddk/usbiodef.h>
+#include <ntddk.h>
+#include <usbdi.h>
+#include <usbiodef.h>
 #include <initguid.h>
 #include <debug.h>

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