diff --git a/repos/dde_linux/lib/mk/spec/foc/rpi_usb.mk b/repos/dde_linux/lib/mk/spec/foc/rpi_usb.mk
new file mode 100644
index 0000000000..f04b0a2e5f
--- /dev/null
+++ b/repos/dde_linux/lib/mk/spec/foc/rpi_usb.mk
@@ -0,0 +1,3 @@
+SRC_CC  += spec/foc_rpi/dwc_irq.cc
+
+vpath % $(REP_DIR)/src/lib/usb
diff --git a/repos/dde_linux/lib/mk/spec/foc_rpi/usb.mk b/repos/dde_linux/lib/mk/spec/foc_rpi/usb.mk
deleted file mode 100644
index 97612034ae..0000000000
--- a/repos/dde_linux/lib/mk/spec/foc_rpi/usb.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/spec/rpi/usb.inc
-
-INC_DIR += $(LIB_INC_DIR)/spec/foc_rpi
diff --git a/repos/dde_linux/lib/mk/spec/hw/rpi_usb.mk b/repos/dde_linux/lib/mk/spec/hw/rpi_usb.mk
new file mode 100644
index 0000000000..df8bb01865
--- /dev/null
+++ b/repos/dde_linux/lib/mk/spec/hw/rpi_usb.mk
@@ -0,0 +1,3 @@
+SRC_CC  += spec/hw_rpi/dwc_irq.cc
+
+vpath % $(REP_DIR)/src/lib/usb
diff --git a/repos/dde_linux/lib/mk/spec/hw_rpi/usb.mk b/repos/dde_linux/lib/mk/spec/hw_rpi/usb.mk
deleted file mode 100644
index 487cd3aff8..0000000000
--- a/repos/dde_linux/lib/mk/spec/hw_rpi/usb.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/spec/rpi/usb.inc
-
-INC_DIR += $(LIB_INC_DIR)/spec/hw_rpi
diff --git a/repos/dde_linux/lib/mk/spec/rpi/usb.inc b/repos/dde_linux/lib/mk/spec/rpi/usb.mk
similarity index 98%
rename from repos/dde_linux/lib/mk/spec/rpi/usb.inc
rename to repos/dde_linux/lib/mk/spec/rpi/usb.mk
index 45217ba192..6c8e4cd508 100644
--- a/repos/dde_linux/lib/mk/spec/rpi/usb.inc
+++ b/repos/dde_linux/lib/mk/spec/rpi/usb.mk
@@ -45,3 +45,5 @@ vpath %.c         $(LX_CONTRIB_DIR)/drivers/net/usb
 
 # enable C++11 support
 CC_CXX_OPT += -std=gnu++11
+
+LIBS += rpi_usb
diff --git a/repos/dde_linux/src/lib/usb/spec/foc_rpi/dwc_irq.cc b/repos/dde_linux/src/lib/usb/spec/foc_rpi/dwc_irq.cc
new file mode 100644
index 0000000000..5bf1d827bd
--- /dev/null
+++ b/repos/dde_linux/src/lib/usb/spec/foc_rpi/dwc_irq.cc
@@ -0,0 +1,7 @@
+/*
+ * \brief  USB: DWC-OTG RaspberryPI Interrupt (base-foc)
+ * \author Reinier Millo Sánchez <rmillo@uclv.cu>
+ * \date   2015-06-21
+ */
+
+unsigned dwc_irq() { return 9; }
diff --git a/repos/dde_linux/src/lib/usb/include/spec/hw_rpi/usb_irq.h b/repos/dde_linux/src/lib/usb/spec/hw_rpi/dwc_irq.cc
similarity index 54%
rename from repos/dde_linux/src/lib/usb/include/spec/hw_rpi/usb_irq.h
rename to repos/dde_linux/src/lib/usb/spec/hw_rpi/dwc_irq.cc
index 5eb1e409f7..b29b243320 100644
--- a/repos/dde_linux/src/lib/usb/include/spec/hw_rpi/usb_irq.h
+++ b/repos/dde_linux/src/lib/usb/spec/hw_rpi/dwc_irq.cc
@@ -4,11 +4,4 @@
  * \date   2015-06-21
  */
 
-#ifndef _INCLUDE_USB_IRQ_H_
-#define _INCLUDE_USB_IRQ_H_
-
-enum{
-	DWC_IRQ  = 17,
-};
-
-#endif /* _INCLUDE_USB_IRQ_H_ */
+unsigned dwc_irq() { return 17; }
diff --git a/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc b/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
index 4fe07669d1..ef5fa7b16f 100644
--- a/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
+++ b/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
@@ -29,13 +29,11 @@
 #include <dwc_otg_dbg.h>
 #undef new
 
-#include <usb_irq.h>
-
-
 using namespace Genode;
 
 namespace Genode { template <unsigned long> class Sp804_base; }
 
+unsigned dwc_irq();
 
 
 /**
@@ -164,7 +162,7 @@ enum {
 static resource _dwc_otg_resource[] =
 {
 	{ DWC_BASE, DWC_BASE + DWC_SIZE - 1, "dwc_otg", IORESOURCE_MEM },
-	{ DWC_IRQ, DWC_IRQ, "dwc_otg-irq" /* name unused */, IORESOURCE_IRQ }
+	{ dwc_irq(), dwc_irq(), "dwc_otg-irq" /* name unused */, IORESOURCE_IRQ }
 };