diff --git a/reactos/drivers/video/displays/vga/makefile b/reactos/drivers/video/displays/vga/makefile
index 71bb62480a3..6b8aeb7b0ec 100644
--- a/reactos/drivers/video/displays/vga/makefile
+++ b/reactos/drivers/video/displays/vga/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2004/01/10 14:39:20 navaraf Exp $
+# $Id: makefile,v 1.2 2004/03/22 16:00:37 navaraf Exp $
 
 PATH_TO_TOP = ../../../..
 
@@ -8,7 +8,7 @@ TARGET_TYPE = gdi_driver
 
 TARGET_NAME = vgaddi
 
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
 
 MAIN_OBJECTS = \
   main/enable.o
diff --git a/reactos/drivers/video/displays/vga/vgaddi.h b/reactos/drivers/video/displays/vga/vgaddi.h
index 47ae7ab4c55..71088babe21 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.h
+++ b/reactos/drivers/video/displays/vga/vgaddi.h
@@ -1,6 +1,6 @@
 #include <ddk/ntddk.h>
 #include <ddk/winddi.h>
-#include <ddk/ntddvid.h>
+#include <ddk/ntddvdeo.h>
 
 #define DS_SOLIDBRUSH  0x00000001
 #define DS_GREYBRUSH   0x00000002
diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
index eb11205c2a7..f740b797d39 100644
--- a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
+++ b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
@@ -1,5 +1,4 @@
-#include <ddk/ntddk.h>
-#include <ddk/ntddvid.h>
+#include <ddk/ntddvdeo.h>
 #include <ddk/winddi.h>
 #include <ntos/minmax.h>
 #include <stdlib.h>
diff --git a/reactos/drivers/video/miniport/vga/initvga.c b/reactos/drivers/video/miniport/vga/initvga.c
index b01aa64b246..8b3bf18792f 100644
--- a/reactos/drivers/video/miniport/vga/initvga.c
+++ b/reactos/drivers/video/miniport/vga/initvga.c
@@ -1,4 +1,5 @@
-#include <ntddk.h>
+#include <ddk/miniport.h>
+#include <ddk/video.h>
 #include "vgavideo.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/video/miniport/vga/makefile b/reactos/drivers/video/miniport/vga/makefile
index ca8becdd80d..69cb4a11318 100644
--- a/reactos/drivers/video/miniport/vga/makefile
+++ b/reactos/drivers/video/miniport/vga/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2004/03/04 18:49:58 navaraf Exp $
+# $Id: makefile,v 1.3 2004/03/22 16:00:38 navaraf Exp $
 
 PATH_TO_TOP = ../../../..
 
@@ -8,7 +8,7 @@ TARGET_NAME = vgamp
 
 TARGET_DDKLIBS = videoprt.a
 
-TARGET_CFLAGS = -Werror -Wall
+TARGET_CFLAGS = -Werror -Wall -D__USE_W32API
 
 TARGET_OBJECTS = \
   initvga.o \
diff --git a/reactos/drivers/video/miniport/vga/vgamp.c b/reactos/drivers/video/miniport/vga/vgamp.c
index e2178f006e3..4117b824f37 100644
--- a/reactos/drivers/video/miniport/vga/vgamp.c
+++ b/reactos/drivers/video/miniport/vga/vgamp.c
@@ -3,8 +3,9 @@
  * 
  */
 
-#include <ddk/ntddk.h>
-#include <ddk/ntddvid.h>
+#include <ddk/miniport.h>
+#include <ddk/video.h>
+#include <ddk/ntddvdeo.h>
 
 #define UNIMPLEMENTED do {DbgPrint("%s:%d: Function not implemented", __FILE__, __LINE__); for(;;);} while (0)
 
diff --git a/reactos/drivers/video/miniport/vga/vgavideo.h b/reactos/drivers/video/miniport/vga/vgavideo.h
index 27fce45dedb..d4cdfea085c 100644
--- a/reactos/drivers/video/miniport/vga/vgavideo.h
+++ b/reactos/drivers/video/miniport/vga/vgavideo.h
@@ -1,5 +1,5 @@
 #include <ddk/ntddk.h>
-#include <ddk/ntddvid.h>
+#include <ddk/ntddvdeo.h>
 
 #define VGA_NORMAL 0
 #define VGA_AND    8