Index: /trunk/src/VBox/Main/src-server/USBControllerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBControllerImpl.cpp	(revision 61377)
+++ /trunk/src/VBox/Main/src-server/USBControllerImpl.cpp	(revision 61378)
@@ -39,14 +39,4 @@
 /////////////////////////////////////////////////////////////////////////////
 
-struct BackupableUSBData
-{
-    BackupableUSBData()
-        : enmType(USBControllerType_Null)
-    { }
-
-    Utf8Str             strName;
-    USBControllerType_T enmType;
-};
-
 struct USBController::Data
 {
@@ -58,10 +48,10 @@
     {};
 
-    Machine * const                 pParent;
+    Machine * const                       pParent;
 
     // peer machine's USB controller
-    const ComObjPtr<USBController>  pPeer;
-
-    Backupable<BackupableUSBData>   bd;
+    const ComObjPtr<USBController>        pPeer;
+
+    Backupable<settings::USBController>   bd;
 };
 
@@ -165,5 +155,5 @@
 
         unconst(aPeer->m->pPeer) = this;
-        m->bd.attach (aPeer->m->bd);
+        m->bd.attach(aPeer->m->bd);
     }
     else
@@ -172,5 +162,5 @@
 
         AutoReadLock peerLock(aPeer COMMA_LOCKVAL_SRC_POS);
-        m->bd.share (aPeer->m->bd);
+        m->bd.share(aPeer->m->bd);
     }
 
@@ -418,9 +408,9 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller peerCaller (m->pPeer);
-    AssertComRCReturnVoid (peerCaller.rc());
+    AutoCaller peerCaller(m->pPeer);
+    AssertComRCReturnVoid(peerCaller.rc());
 
     /* peer is not modified, lock it for reading (m->pPeer is "master" so locked