diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 21ed3e119c..3db6026901 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -97,8 +97,10 @@
 #include "debug-target.h"
 #endif
 
+#if defined(SANSA_E200)
 #include "i2c-pp.h"
 #include "as3514.h"
+#endif
 
 /*---------------------------------------------------*/
 /*    SPECIAL DEBUG STUFF                            */
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index c49ee23841..c6c03da04d 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -161,6 +161,8 @@
 #define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7421
+#define USE_ROCKBOX_USB
+#define USE_HIGH_SPEED
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index c69b433503..d77d16b065 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -156,6 +156,8 @@
 #define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0B70
 #define USB_PRODUCT_ID 0x00BA
+#define USE_ROCKBOX_USB
+#define USE_HIGH_SPEED
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index f1029c3c93..b68b26f129 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id:  $
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Bj�rn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
@@ -20,7 +20,7 @@
 #include "system.h"
 #include "usb_core.h"
 #include "usb_drv.h"
-//#define LOGF_ENABLE
+#define LOGF_ENABLE
 #include "logf.h"
 #include "ata.h"
 #include "hotswap.h"