[akhaldi] 61520: [VGADDI] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Sat Jan  4 10:31:27 2014
New Revision: 61520

URL: http://svn.reactos.org/svn/reactos?rev=61520&view=rev
Log:
[VGADDI]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
    trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c
    trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h

Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v…
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c	[iso-8859-1] Sat Jan  4
10:31:27 2014
@@ -7,6 +7,8 @@
  */
 
 #include <vgaddi.h>
+
+#include "bitblt.h"
 
 typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
 typedef BOOL  (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,

Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v…
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c	[iso-8859-1] Sat Jan  4
10:31:27 2014
@@ -7,6 +7,8 @@
  */
 
 #include <vgaddi.h>
+
+#include "brush.h"
 
 BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
 {

Modified: trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v…
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h	[iso-8859-1] Sat Jan  4 10:31:27
2014
@@ -2,7 +2,6 @@
 #define _WINDOWS_H
 #include <stdarg.h>
 #include <windef.h>
-#include <guiddef.h>
 #include <wingdi.h>
 #include <winddi.h>
 #include <winioctl.h>
@@ -10,8 +9,6 @@
 #include <ioaccess.h>
 
 #include "vgavideo/vgavideo.h"
-#include "objects/brush.h"
-#include "objects/bitblt.h"
 
 #ifndef NDEBUG
 #define DPRINT DbgPrint