[VGAMP]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61980

diff --git a/reactos/win32ss/drivers/miniport/vga/initvga.c b/reactos/win32ss/drivers/miniport/vga/initvga.c
index 3b523f5..8834513 100644 (file)
--- a/reactos/win32ss/drivers/miniport/vga/initvga.c
+++ b/reactos/win32ss/drivers/miniport/vga/initvga.c
@@ -1,5 +1,7 @@
 #include "vgamp.h"
 
+#include "vgavideo.h"
+
 static VGA_REGISTERS Mode12Regs =
 {
    /* CRT Controller Registers */

diff --git a/reactos/win32ss/drivers/miniport/vga/vgamp.c b/reactos/win32ss/drivers/miniport/vga/vgamp.c
index d112d21..8c0c27e 100644 (file)
--- a/reactos/win32ss/drivers/miniport/vga/vgamp.c
+++ b/reactos/win32ss/drivers/miniport/vga/vgamp.c
@@ -7,6 +7,9 @@
 
 #include "vgamp.h"
 
+#include <dderror.h>
+#include <devioctl.h>
+
 //  -------------------------------------------------------  Public Interface
 
 //    DriverEntry

diff --git a/reactos/win32ss/drivers/miniport/vga/vgamp.h b/reactos/win32ss/drivers/miniport/vga/vgamp.h
index acece1c..9674eff 100644 (file)
--- a/reactos/win32ss/drivers/miniport/vga/vgamp.h
+++ b/reactos/win32ss/drivers/miniport/vga/vgamp.h
@@ -23,13 +23,9 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "ntdef.h"
-#include "dderror.h"
-#include "devioctl.h"
-#include "miniport.h"
-#include "ntddvdeo.h"
-#include "video.h"
-#include "vgavideo.h"
+#include <ntdef.h>
+#include <miniport.h>
+#include <video.h>
 
 #define UNIMPLEMENTED \
    VideoPortDebugPrint(Error, "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__);

diff --git a/reactos/win32ss/drivers/miniport/vga/vgavideo.h b/reactos/win32ss/drivers/miniport/vga/vgavideo.h
index ba3fdbb..f0f461a 100644 (file)
--- a/reactos/win32ss/drivers/miniport/vga/vgavideo.h
+++ b/reactos/win32ss/drivers/miniport/vga/vgavideo.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #define VGA_NORMAL 0
 #define VGA_AND    8