diff --git a/reactos/drivers/video/displays/vga/main/enable.c b/reactos/drivers/video/displays/vga/main/enable.c
index 7ed4e350185..66d2175b61f 100644
--- a/reactos/drivers/video/displays/vga/main/enable.c
+++ b/reactos/drivers/video/displays/vga/main/enable.c
@@ -1,10 +1,5 @@
 /*
  * entry.c
- *
- * $Revision: 1.5 $
- * $Author$
- * $Date$
- *
  */
 
 #include "../vgaddi.h"
@@ -180,7 +175,7 @@ DEVINFO devinfoVGA =
 };
 
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvEnableDriver(IN ULONG EngineVersion,
 		IN ULONG SizeOfDED,
 		OUT PDRVENABLEDATA DriveEnableData)
@@ -206,7 +201,7 @@ DrvEnableDriver(IN ULONG EngineVersion,
 //  RETURNS:
 //    NONE
 
-VOID STDCALL
+VOID APIENTRY
 DrvDisableDriver(VOID)
 {
   return;
@@ -235,7 +230,7 @@ DrvDisableDriver(VOID)
 //  RETURNS:
 //    DHPDEV  a handle to a DPev object
 
-DHPDEV STDCALL
+DHPDEV APIENTRY
 DrvEnablePDEV(IN DEVMODEW *DM,
 	      IN LPWSTR LogAddress,
 	      IN ULONG PatternCount,
@@ -286,7 +281,7 @@ DrvEnablePDEV(IN DEVMODEW *DM,
 //    Called after initialization of PDEV is complete.  Supplies
 //    a reference to the GDI handle for the PDEV.
 
-VOID STDCALL
+VOID APIENTRY
 DrvCompletePDEV(IN DHPDEV PDev,
 		IN HDEV Dev)
 {
@@ -294,7 +289,7 @@ DrvCompletePDEV(IN DHPDEV PDev,
 }
 
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvAssertMode(IN DHPDEV DPev,
 	      IN BOOL Enable)
 {
@@ -334,7 +329,7 @@ DrvAssertMode(IN DHPDEV DPev,
 }
 
 
-VOID STDCALL
+VOID APIENTRY
 DrvDisablePDEV(IN DHPDEV PDev)
 {
   PPDEV ppdev = (PPDEV)PDev;
@@ -354,7 +349,7 @@ DrvDisablePDEV(IN DHPDEV PDev)
 }
 
 
-VOID STDCALL
+VOID APIENTRY
 DrvDisableSurface(IN DHPDEV PDev)
 {
   PPDEV ppdev = (PPDEV)PDev;
@@ -442,7 +437,7 @@ InitSavedBits(PPDEV ppdev)
 }
 
 
-HSURF STDCALL
+HSURF APIENTRY
 DrvEnableSurface(IN DHPDEV PDev)
 {
   PPDEV ppdev = (PPDEV)PDev;
@@ -531,7 +526,7 @@ error_done:
 }
 
 
-ULONG STDCALL
+ULONG APIENTRY
 DrvGetModes(IN HANDLE Driver,
 	    IN ULONG DataSize,
 	    OUT PDEVMODEW DM)
diff --git a/reactos/drivers/video/displays/vga/objects/bitblt.c b/reactos/drivers/video/displays/vga/objects/bitblt.c
index bf9cb58d547..9fef2c47967 100644
--- a/reactos/drivers/video/displays/vga/objects/bitblt.c
+++ b/reactos/drivers/video/displays/vga/objects/bitblt.c
@@ -7,16 +7,16 @@
 #include <debug.h>
 
 typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
-typedef BOOL  (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj,
-                                     SURFOBJ* InputObj,
-                                     SURFOBJ* Mask,
-                                     XLATEOBJ* ColorTranslation,
-                                     RECTL* OutputRect,
-                                     POINTL* InputPoint,
-                                     POINTL* MaskOrigin,
-                                     BRUSHOBJ* Brush,
-                                     POINTL* BrushOrigin,
-                                     ROP4 Rop4);
+typedef BOOL  (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,
+                                       SURFOBJ* InputObj,
+                                       SURFOBJ* Mask,
+                                       XLATEOBJ* ColorTranslation,
+                                       RECTL* OutputRect,
+                                       POINTL* InputPoint,
+                                       POINTL* MaskOrigin,
+                                       BRUSHOBJ* Brush,
+                                       POINTL* BrushOrigin,
+                                       ROP4 Rop4);
 
 static BOOL FASTCALL VGADDI_IntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
 {
@@ -167,7 +167,7 @@ VGAtoVGA(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation,
   return TRUE;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 VGADDI_BltBrush(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* MaskSurf,
                 XLATEOBJ* ColorTranslation, RECTL* DestRect,
                 POINTL* SourcePoint, POINTL* MaskPoint,
@@ -298,7 +298,7 @@ VGADDI_BltBrush(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* MaskSurf,
   return TRUE;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 VGADDI_BltSrc(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask,
               XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint,
               POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrigin, ROP4 Rop4)
@@ -338,7 +338,7 @@ VGADDI_BltSrc(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask,
   return(TRUE);
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 VGADDI_BltMask(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask,
                XLATEOBJ* ColorTranslation, RECTL* DestRect,
                POINTL* SourcePoint, POINTL* MaskPoint, BRUSHOBJ* Brush,
@@ -375,7 +375,7 @@ VGADDI_BltMask(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask,
   return TRUE;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvBitBlt(SURFOBJ *Dest,
 	  SURFOBJ *Source,
 	  SURFOBJ *Mask,
diff --git a/reactos/drivers/video/displays/vga/objects/copybits.c b/reactos/drivers/video/displays/vga/objects/copybits.c
index 2b32604ca53..ccd74b8096e 100644
--- a/reactos/drivers/video/displays/vga/objects/copybits.c
+++ b/reactos/drivers/video/displays/vga/objects/copybits.c
@@ -2,7 +2,7 @@
 #include "../vgavideo/vgavideo.h"
 #include <debug.h>
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvCopyBits(OUT SURFOBJ*  DestObj,
             IN  SURFOBJ*  SourceObj,
             IN  CLIPOBJ*  ClipObj,
diff --git a/reactos/drivers/video/displays/vga/objects/lineto.c b/reactos/drivers/video/displays/vga/objects/lineto.c
index a0840b3dfe2..fcc9c803673 100644
--- a/reactos/drivers/video/displays/vga/objects/lineto.c
+++ b/reactos/drivers/video/displays/vga/objects/lineto.c
@@ -16,7 +16,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
  */
 
 #include "../vgaddi.h"
@@ -290,7 +289,7 @@ vgaSEtoNW(CLIPOBJ* Clip, BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG delt
  * FIXME: Use Mix to perform ROPs
  * FIXME: Non-solid Brush
  */
-BOOL STDCALL
+BOOL APIENTRY
 DrvLineTo(SURFOBJ *DestObj,
 	  CLIPOBJ *Clip,
 	  BRUSHOBJ *Brush,
diff --git a/reactos/drivers/video/displays/vga/objects/offscreen.c b/reactos/drivers/video/displays/vga/objects/offscreen.c
index b01ad60ea7c..4075c39fb79 100644
--- a/reactos/drivers/video/displays/vga/objects/offscreen.c
+++ b/reactos/drivers/video/displays/vga/objects/offscreen.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS VGA16 display driver
  * FILE:            drivers/dd/vga/display/objects/offscreen.c
  * PURPOSE:         Manages off-screen video memory.
diff --git a/reactos/drivers/video/displays/vga/objects/paint.c b/reactos/drivers/video/displays/vga/objects/paint.c
index 843766d2dd6..c343ccc8b62 100644
--- a/reactos/drivers/video/displays/vga/objects/paint.c
+++ b/reactos/drivers/video/displays/vga/objects/paint.c
@@ -170,7 +170,7 @@ BOOL VGADDIPaintRgn(SURFOBJ *Surface, CLIPOBJ *ClipRegion, ULONG iColor, MIX Mix
 
 
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvPaint(IN SURFOBJ *Surface,
 	 IN CLIPOBJ *ClipRegion,
 	 IN BRUSHOBJ *Brush,
diff --git a/reactos/drivers/video/displays/vga/objects/pointer.c b/reactos/drivers/video/displays/vga/objects/pointer.c
index d75551916c0..b7c9875951e 100644
--- a/reactos/drivers/video/displays/vga/objects/pointer.c
+++ b/reactos/drivers/video/displays/vga/objects/pointer.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS VGA16 display driver
  * FILE:            drivers/dd/vga/display/objects/pointer.c
  * PURPOSE:         Draws the mouse pointer.
@@ -190,7 +189,7 @@ BOOL InitPointer(PPDEV ppdev)
   return(TRUE);
 }
 
-VOID STDCALL
+VOID APIENTRY
 DrvMovePointer(IN SURFOBJ* pso,
 	       IN LONG x,
 	       IN LONG y,
@@ -210,7 +209,7 @@ DrvMovePointer(IN SURFOBJ* pso,
 }
 
 
-ULONG STDCALL
+ULONG APIENTRY
 DrvSetPointerShape(SURFOBJ* pso,
 		   SURFOBJ* psoMask,
 		   SURFOBJ* psoColor,
diff --git a/reactos/drivers/video/displays/vga/objects/transblt.c b/reactos/drivers/video/displays/vga/objects/transblt.c
index 41292cf209e..c4cb87e1db3 100644
--- a/reactos/drivers/video/displays/vga/objects/transblt.c
+++ b/reactos/drivers/video/displays/vga/objects/transblt.c
@@ -6,7 +6,7 @@
 #define NDEBUG
 #include <debug.h>
 
-BOOL STDCALL
+BOOL APIENTRY
 DrvTransparentBlt(SURFOBJ* Dest,
 		  SURFOBJ* Source,
 		  CLIPOBJ* Clip,
diff --git a/reactos/drivers/video/displays/vga/vgaddi.def b/reactos/drivers/video/displays/vga/vgaddi.def
index b520d7c9333..baca733148a 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.def
+++ b/reactos/drivers/video/displays/vga/vgaddi.def
@@ -1,4 +1,4 @@
-; $Id$
+; $Id: vgaddi.def 26978 2007-06-03 16:45:34Z greatlrd $
 ;
 ; vgaddi.def
 ;
diff --git a/reactos/drivers/video/displays/vga/vgaddi.h b/reactos/drivers/video/displays/vga/vgaddi.h
index a11555acdd8..2c97972f9d9 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.h
+++ b/reactos/drivers/video/displays/vga/vgaddi.h
@@ -1,3 +1,6 @@
+#ifndef _VGADDI_H_
+#define _VGADDI_H_
+
 #define _WINBASE_
 #define _WINDOWS_H
 #include <stdarg.h>
@@ -275,8 +278,10 @@ DWORD getAvailableModes(HANDLE Driver,
                         PVIDEO_MODE_INFORMATION *modeInformation,
                         DWORD *ModeSize);
 
-void FASTCALL
-vgaReadScan ( int x, int y, int w, void *b );
+VOID FASTCALL
+vgaReadScan(int x, int y, int w, void *b);
 
-void FASTCALL
-vgaWriteScan ( int x, int y, int w, void *b );
+VOID FASTCALL
+vgaWriteScan(int x, int y, int w, void *b);
+
+#endif /* _VGADDI_H_ */
diff --git a/reactos/drivers/video/displays/vga/vgaddi.rc b/reactos/drivers/video/displays/vga/vgaddi.rc
index b428fbb4b68..a0d53bc549e 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.rc
+++ b/reactos/drivers/video/displays/vga/vgaddi.rc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"VGA Display Driver\0"
 #define REACTOS_STR_INTERNAL_NAME	"vgaddi\0"