Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp	(revision 53749)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp	(revision 53750)
@@ -604,5 +604,4 @@
     uint32_t                idTestContext;
 #endif
-#ifdef VBOX_VMSVGA3D_USE_OPENGL_CORE
     /** Legacy OpenGL profile GL_EXTENSIONS result (RTStrDup).
      * This is used to detect shader model version since some implementations
@@ -610,5 +609,4 @@
      * bunch of others when using a OpenGL core profile instead of a legacy one */
     R3PTRTYPE(char *)       pszLegacyExtensions;
-#endif
 } VMSVGA3DSTATE;
 /** Pointer to the VMSVGA3d state. */
@@ -981,5 +979,5 @@
     VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext);
 #else
-    pState->pszLegacyExtensions = "";
+    pState->pszLegacyExtensions = (char *)"";
 #endif
 
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h	(revision 53749)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h	(revision 53750)
@@ -1,7 +1,8 @@
 /** @file
- * DevVMWare - VMWare SVGA device - 3D part
+ * DevVMWare - VMWare SVGA device - 3D part.
  */
+
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -14,6 +15,6 @@
  */
 
-#ifndef __DEVVMWARE3D_H__
-#define __DEVVMWARE3D_H__
+#ifndef ___DEVVMWARE3D_H___
+#define ___DEVVMWARE3D_H___
 
 #include "vmsvga/svga_reg.h"
@@ -23,11 +24,11 @@
 
 #if defined(RT_OS_WINDOWS) && defined(IN_RING3)
-#include <windows.h>
+# include <Windows.h>
 
-#define WM_VMSVGA3D_WAKEUP                      (WM_APP+1)
-#define WM_VMSVGA3D_CREATEWINDOW                (WM_APP+2)
-#define WM_VMSVGA3D_DESTROYWINDOW               (WM_APP+3)
-#define WM_VMSVGA3D_RESIZEWINDOW                (WM_APP+4)
-#define WM_VMSVGA3D_EXIT                        (WM_APP+5)
+# define WM_VMSVGA3D_WAKEUP                     (WM_APP+1)
+# define WM_VMSVGA3D_CREATEWINDOW               (WM_APP+2)
+# define WM_VMSVGA3D_DESTROYWINDOW              (WM_APP+3)
+# define WM_VMSVGA3D_RESIZEWINDOW               (WM_APP+4)
+# define WM_VMSVGA3D_EXIT                       (WM_APP+5)
 
 DECLCALLBACK(int) vmsvga3dWindowThread(RTTHREAD ThreadSelf, void *pvUser);
@@ -36,9 +37,9 @@
 #endif
 
-/* Arbitrary limit */
+/** Arbitrary limit */
 #define SVGA3D_MAX_SHADER_IDS                   0x100
-/* D3D allows up to 8 texture stages. */
+/** D3D allows up to 8 texture stages. */
 #define SVGA3D_MAX_TEXTURE_STAGE                8
-/* Arbitrary upper limit; seen 8 so far. */
+/** Arbitrary upper limit; seen 8 so far. */
 #define SVGA3D_MAX_LIGHTS                       32
 
@@ -107,3 +108,4 @@
 #endif
 
-#endif  /* __DEVVMWARE3D_H__ */
+#endif  /* !___DEVVMWARE3D_H___ */
+