Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp	(revision 86838)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp	(revision 86839)
@@ -149,5 +149,5 @@
 static int vmsvga3dLoadVMSVGA3DSURFACEPreMipLevels(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, VMSVGA3DSURFACE *pSurface)
 {
-    typedef struct VMSVGA3DSURFACEPreMipLevels
+    struct VMSVGA3DSURFACEPreMipLevels
     {
         uint32_t            id;
@@ -169,33 +169,33 @@
         SVGA3dTextureFilter autogenFilter;
         uint32_t            cbBlock;
-    } VMSVGA3DSURFACEPreMipLevels;
+    };
 
     static SSMFIELD const s_aVMSVGA3DSURFACEFieldsPreMipLevels[] =
     {
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, id),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, id),
 #ifdef VMSVGA3D_OPENGL
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, idWeakContextAssociation),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, idWeakContextAssociation),
 #else
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, idAssociatedContext),
-#endif
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, surfaceFlags),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, format),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, idAssociatedContext),
+#endif
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, surfaceFlags),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, format),
 #ifdef VMSVGA3D_OPENGL
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, internalFormatGL),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, formatGL),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, typeGL),
-#endif
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, faces),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, cFaces),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, multiSampleCount),
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, autogenFilter),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, internalFormatGL),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, formatGL),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, typeGL),
+#endif
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, faces),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, cFaces),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, multiSampleCount),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, autogenFilter),
 #ifdef VMSVGA3D_DIRECT3D
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, format), /* Yes, the 'format' field is duplicated. */
-#endif
-        SSMFIELD_ENTRY(VMSVGA3DSURFACEPreMipLevels, cbBlock),
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, format), /* Yes, the 'format' field is duplicated. */
+#endif
+        SSMFIELD_ENTRY(struct VMSVGA3DSURFACEPreMipLevels, cbBlock),
         SSMFIELD_ENTRY_TERM()
     };
 
-    VMSVGA3DSURFACEPreMipLevels surfacePreMipLevels;
+    struct VMSVGA3DSURFACEPreMipLevels surfacePreMipLevels;
     int rc = pDevIns->pHlpR3->pfnSSMGetStructEx(pSSM, &surfacePreMipLevels, sizeof(surfacePreMipLevels), 0, s_aVMSVGA3DSURFACEFieldsPreMipLevels, NULL);
     if (RT_SUCCESS(rc))