Index: /trunk/src/VBox/Main/ConsoleVRDPServer.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleVRDPServer.cpp	(revision 29384)
+++ /trunk/src/VBox/Main/ConsoleVRDPServer.cpp	(revision 29385)
@@ -2230,5 +2230,5 @@
                                                                           \
         /* todo: Not sure if a AutoReadLock would be sufficient. */       \
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                                        \
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                  \
                                                                           \
         uint32_t value;                                                   \
@@ -2241,5 +2241,6 @@
                                                                           \
         return S_OK;                                                      \
-    }
+    }                                                                     \
+    extern void IMPL_GETTER_BOOL_DUMMY(void)
 
 #define IMPL_GETTER_SCALAR(_aType, _aName, _aIndex)                       \
@@ -2253,5 +2254,5 @@
                                                                           \
         /* todo: Not sure if a AutoReadLock would be sufficient. */       \
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                                        \
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                  \
                                                                           \
         _aType value;                                                     \
@@ -2264,5 +2265,6 @@
                                                                           \
         return S_OK;                                                      \
-    }
+    }                                                                     \
+    extern void IMPL_GETTER_SCALAR_DUMMY(void)
 
 #define IMPL_GETTER_BSTR(_aType, _aName, _aIndex)                         \
@@ -2276,5 +2278,5 @@
                                                                           \
         /* todo: Not sure if a AutoReadLock would be sufficient. */       \
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                                        \
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);                  \
                                                                           \
         uint32_t cbOut = 0;                                               \
@@ -2310,5 +2312,6 @@
                                                                           \
         return S_OK;                                                      \
-    }
+    }                                                                     \
+    extern void IMPL_GETTER_BSTR_DUMMY(void)
 
 IMPL_GETTER_BOOL   (BOOL,    Active,             VRDP_QI_ACTIVE);
@@ -2330,3 +2333,4 @@
 #undef IMPL_GETTER_BSTR
 #undef IMPL_GETTER_SCALAR
+#undef IMPL_GETTER_BOOL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/HostImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/HostImpl.cpp	(revision 29384)
+++ /trunk/src/VBox/Main/HostImpl.cpp	(revision 29385)
@@ -2317,4 +2317,5 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
+
 void Host::registerMetrics(PerformanceCollector *aCollector)
 {
@@ -2435,5 +2436,5 @@
     aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMBallooned,
                                               new pm::AggregateMax()));
-};
+}
 
 void Host::unregisterMetrics (PerformanceCollector *aCollector)
@@ -2441,5 +2442,6 @@
     aCollector->unregisterMetricsFor(this);
     aCollector->unregisterBaseMetricsFor(this);
-};
+}
+
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
Index: /trunk/src/VBox/Main/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/MachineImpl.cpp	(revision 29384)
+++ /trunk/src/VBox/Main/MachineImpl.cpp	(revision 29385)
@@ -9137,4 +9137,5 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
+
 void Machine::registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
 {
@@ -9245,5 +9246,5 @@
     aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMin()));
     aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMax()));
-};
+}
 
 void Machine::unregisterMetrics(PerformanceCollector *aCollector, Machine *aMachine)
@@ -9254,5 +9255,6 @@
     if (mGuestHAL)
         delete mGuestHAL;
-};
+}
+
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
Index: /trunk/src/VBox/Main/include/ConsoleImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 29384)
+++ /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 29385)
@@ -634,5 +634,5 @@
         iLedSas     = iLedScsi + cLedScsi,
         cLedSas     = 8,
-        cLedStorage = cLedFloppy + cLedIde + cLedSata + cLedScsi + cLedSas,
+        cLedStorage = cLedFloppy + cLedIde + cLedSata + cLedScsi + cLedSas
     };
     DeviceType_T maStorageDevType[cLedStorage];
Index: /trunk/src/VBox/Main/include/MachineImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MachineImpl.h	(revision 29384)
+++ /trunk/src/VBox/Main/include/MachineImpl.h	(revision 29385)
@@ -1,6 +1,4 @@
 /* $Id$ */
-
 /** @file
- *
  * VirtualBox COM class implementation
  */
@@ -744,5 +742,5 @@
         SaveSTS_CurStateModified = 0x20,
         SaveSTS_StateFilePath = 0x40,
-        SaveSTS_StateTimeStamp = 0x80,
+        SaveSTS_StateTimeStamp = 0x80
     };
 
Index: /trunk/src/VBox/Main/include/VirtualBoxBase.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxBase.h	(revision 29384)
+++ /trunk/src/VBox/Main/include/VirtualBoxBase.h	(revision 29385)
@@ -427,5 +427,6 @@
  */
 #define DEFINE_EMPTY_CTOR_DTOR(cls) \
-    cls::cls () {}; cls::~cls () {};
+    cls::cls()  { /*empty*/ } \
+    cls::~cls() { /*empty*/ }
 
 ////////////////////////////////////////////////////////////////////////////////
Index: /trunk/src/VBox/Main/xml/SchemaDefs.xsl
===================================================================
--- /trunk/src/VBox/Main/xml/SchemaDefs.xsl	(revision 29384)
+++ /trunk/src/VBox/Main/xml/SchemaDefs.xsl	(revision 29385)
@@ -102,5 +102,6 @@
   <xsl:apply-templates select="xsd:schema" mode="declare.enum"/>
 
-<xsl:text>    };
+<xsl:text>        DummyTerminator
+    };
 </xsl:text>
 
@@ -109,5 +110,5 @@
 <xsl:text>}
 
-#endif // ____H_SCHEMADEFS
+#endif // !____H_SCHEMADEFS
 </xsl:text>
 </xsl:template>
Index: /trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/Settings.cpp	(revision 29384)
+++ /trunk/src/VBox/Main/xml/Settings.cpp	(revision 29385)
@@ -1633,5 +1633,5 @@
     ulIoCacheSize    = 5;
     ulIoBandwidthMax = 0;
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////////
Index: /trunk/src/VBox/Main/xpcom/server.cpp
===================================================================
--- /trunk/src/VBox/Main/xpcom/server.cpp	(revision 29384)
+++ /trunk/src/VBox/Main/xpcom/server.cpp	(revision 29385)
@@ -200,5 +200,5 @@
     /* Delay before shutting down the VirtualBox server after the last
      * VirtualBox instance is released, in ms */
-    VBoxSVC_ShutdownDelay = 5000,
+    VBoxSVC_ShutdownDelay = 5000
 };