diff --git a/reactos/win32ss/drivers/displays/vga/objects/bitblt.c b/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
index ed24a2af3bc..65356eebe9e 100644
--- a/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
+++ b/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
@@ -8,6 +8,8 @@
 
 #include <vgaddi.h>
 
+#include "bitblt.h"
+
 typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
 typedef BOOL  (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,
                                        SURFOBJ* InputObj,
diff --git a/reactos/win32ss/drivers/displays/vga/objects/paint.c b/reactos/win32ss/drivers/displays/vga/objects/paint.c
index 815a7e88d21..778eeb8f62d 100644
--- a/reactos/win32ss/drivers/displays/vga/objects/paint.c
+++ b/reactos/win32ss/drivers/displays/vga/objects/paint.c
@@ -8,6 +8,8 @@
 
 #include <vgaddi.h>
 
+#include "brush.h"
+
 BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
 {
     int x, y, x2, y2, w, h, j;
diff --git a/reactos/win32ss/drivers/displays/vga/vgaddi.h b/reactos/win32ss/drivers/displays/vga/vgaddi.h
index 8988746c1ad..e43474b24bf 100644
--- a/reactos/win32ss/drivers/displays/vga/vgaddi.h
+++ b/reactos/win32ss/drivers/displays/vga/vgaddi.h
@@ -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