diff --git a/firmware/target/arm/as3525/system-target.h b/firmware/target/arm/as3525/system-target.h
index cdcc2e6687..db5bb892ef 100644
--- a/firmware/target/arm/as3525/system-target.h
+++ b/firmware/target/arm/as3525/system-target.h
@@ -64,4 +64,8 @@ static inline void mdelay(unsigned msecs)
 {
     udelay(1000 * msecs);
 }
+
+void usb_insert_int(void);
+void usb_remove_int(void);
+
 #endif /* SYSTEM_TARGET_H */
diff --git a/firmware/target/arm/as3525/usb-target.h b/firmware/target/arm/as3525/usb-target.h
index 673fb176c6..e69de29bb2 100644
--- a/firmware/target/arm/as3525/usb-target.h
+++ b/firmware/target/arm/as3525/usb-target.h
@@ -1,27 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 by Barry Wardelll
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef USB_TARGET_H
-#define USB_TARGET_H
-
-void usb_insert_int(void);
-void usb_remove_int(void);
-
-#endif /* USB_TARGET_H */
diff --git a/firmware/target/arm/imx233/system-target.h b/firmware/target/arm/imx233/system-target.h
index 90a2966f2f..a01c05febd 100644
--- a/firmware/target/arm/imx233/system-target.h
+++ b/firmware/target/arm/imx233/system-target.h
@@ -114,4 +114,7 @@ static inline void mdelay(unsigned msecs)
     udelay(1000 * msecs);
 }
 
+void usb_insert_int(void);
+void usb_remove_int(void);
+
 #endif /* SYSTEM_TARGET_H */
diff --git a/firmware/target/arm/imx233/usb-target.h b/firmware/target/arm/imx233/usb-target.h
index 600fc990ed..89ccaee85d 100644
--- a/firmware/target/arm/imx233/usb-target.h
+++ b/firmware/target/arm/imx233/usb-target.h
@@ -27,7 +27,4 @@
 #define USB_DRIVER_CLOSE
 #endif
 
-void usb_insert_int(void);
-void usb_remove_int(void);
-
 #endif /* USB_TARGET_H */
diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h
index 022baa1466..e7f9ce0245 100644
--- a/firmware/target/arm/system-target.h
+++ b/firmware/target/arm/system-target.h
@@ -52,6 +52,8 @@
 
 void usb_pin_init(void);
 bool usb_plugged(void);
+void firewire_insert_int(void);
+void usb_insert_int(void);
 
 static inline void udelay(unsigned usecs)
 {
diff --git a/firmware/target/arm/usb-target.h b/firmware/target/arm/usb-target.h
index 34e7a54262..e0145ec242 100644
--- a/firmware/target/arm/usb-target.h
+++ b/firmware/target/arm/usb-target.h
@@ -21,9 +21,6 @@
 #ifndef USB_TARGET_H
 #define USB_TARGET_H
 
-void usb_insert_int(void);
-void firewire_insert_int(void);
-
 #ifdef HAVE_BOOTLOADER_USB_MODE
 #define USB_DRIVER_CLOSE
 #endif