Index: /trunk/src/VBox/Main/USBControllerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/USBControllerImpl.cpp	(revision 30855)
+++ /trunk/src/VBox/Main/USBControllerImpl.cpp	(revision 30856)
@@ -393,7 +393,5 @@
 class ATL_NO_VTABLE USBDeviceFilter :
     public VirtualBoxBase,
-    public VirtualBoxSupportErrorInfoImpl<USBDeviceFilter, IUSBDeviceFilter>,
-    public VirtualBoxSupportTranslation<USBDeviceFilter>,
-    public IUSBDeviceFilter
+    VBOX_SCRIPTABLE_IMPL(IUSBDeviceFilter)
 {
 public:
Index: /trunk/src/VBox/Main/xpcom/server.cpp
===================================================================
--- /trunk/src/VBox/Main/xpcom/server.cpp	(revision 30855)
+++ /trunk/src/VBox/Main/xpcom/server.cpp	(revision 30856)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -78,8 +78,8 @@
 #include <ParallelPortImpl.h>
 #include <USBControllerImpl.h>
-#include "USBDeviceFilterImpl.h"
 #include "DHCPServerRunner.h"
 #include "DHCPServerImpl.h"
 #ifdef VBOX_WITH_USB
+# include "USBDeviceFilterImpl.h"
 # include <HostUSBDeviceImpl.h>
 # include <USBDeviceImpl.h>