diff --git a/PS3USB.cpp b/PS3USB.cpp
index 7e6285a2..c3217538 100644
--- a/PS3USB.cpp
+++ b/PS3USB.cpp
@@ -152,13 +152,13 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
 
         /* Initialize data structures for endpoints of device */
         epInfo[ PS3_OUTPUT_PIPE ].epAddr = 0x02; // PS3 output endpoint
-        epInfo[ PS3_OUTPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ PS3_OUTPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ PS3_OUTPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ PS3_OUTPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ PS3_OUTPUT_PIPE ].bmSndToggle = 0;
         epInfo[ PS3_OUTPUT_PIPE ].bmRcvToggle = 0;
         epInfo[ PS3_INPUT_PIPE ].epAddr = 0x01; // PS3 report endpoint
-        epInfo[ PS3_INPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ PS3_INPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ PS3_INPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ PS3_INPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ PS3_INPUT_PIPE ].bmSndToggle = 0;
diff --git a/PS3USB.h b/PS3USB.h
index 5bbbdf2e..ca343a81 100644
--- a/PS3USB.h
+++ b/PS3USB.h
@@ -24,9 +24,6 @@
 /* PS3 data taken from descriptors */
 #define EP_MAXPKTSIZE           64 // max size for data via USB
 
-/* Endpoint types */
-#define EP_INTERRUPT            0x03
-
 /* Names we give to the 3 ps3 pipes - this is only used for setting the bluetooth address into the ps3 controllers */
 #define PS3_CONTROL_PIPE        0
 #define PS3_OUTPUT_PIPE         1
diff --git a/XBOXOLD.cpp b/XBOXOLD.cpp
index 298d5ab1..78e6e9a5 100644
--- a/XBOXOLD.cpp
+++ b/XBOXOLD.cpp
@@ -167,13 +167,13 @@ uint8_t XBOXOLD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
 
         /* Initialize data structures for endpoints of device */
         epInfo[ XBOX_INPUT_PIPE ].epAddr = 0x01; // XBOX report endpoint
-        epInfo[ XBOX_INPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE ].epAddr = 0x02; // XBOX output endpoint
-        epInfo[ XBOX_OUTPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE ].bmSndToggle = 0;
diff --git a/XBOXOLD.h b/XBOXOLD.h
index b3c0ccb2..f5f95dce 100644
--- a/XBOXOLD.h
+++ b/XBOXOLD.h
@@ -24,9 +24,6 @@
 /* Data Xbox taken from descriptors */
 #define EP_MAXPKTSIZE       32 // Max size for data via USB
 
-/* Endpoint types */
-#define EP_INTERRUPT        0x03
-
 /* Names we give to the 3 Xbox pipes */
 #define XBOX_CONTROL_PIPE    0
 #define XBOX_INPUT_PIPE      1
diff --git a/XBOXRECV.cpp b/XBOXRECV.cpp
index 144a4aa4..41f1ff58 100644
--- a/XBOXRECV.cpp
+++ b/XBOXRECV.cpp
@@ -188,52 +188,52 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
 
         /* Initialize data structures for endpoints of device */
         epInfo[ XBOX_INPUT_PIPE_1 ].epAddr = 0x01; // XBOX 360 report endpoint - poll interval 1ms
-        epInfo[ XBOX_INPUT_PIPE_1 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE_1 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE_1 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE_1 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE_1 ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE_1 ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_1 ].epAddr = 0x01; // XBOX 360 output endpoint - poll interval 8ms
-        epInfo[ XBOX_OUTPUT_PIPE_1 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE_1 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE_1 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE_1 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE_1 ].bmSndToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_1 ].bmRcvToggle = 0;
 
         epInfo[ XBOX_INPUT_PIPE_2 ].epAddr = 0x03; // XBOX 360 report endpoint - poll interval 1ms
-        epInfo[ XBOX_INPUT_PIPE_2 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE_2 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE_2 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE_2 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE_2 ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE_2 ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_2 ].epAddr = 0x03; // XBOX 360 output endpoint - poll interval 8ms
-        epInfo[ XBOX_OUTPUT_PIPE_2 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE_2 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE_2 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE_2 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE_2 ].bmSndToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_2 ].bmRcvToggle = 0;
 
         epInfo[ XBOX_INPUT_PIPE_3 ].epAddr = 0x05; // XBOX 360 report endpoint - poll interval 1ms
-        epInfo[ XBOX_INPUT_PIPE_3 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE_3 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE_3 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE_3 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE_3 ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE_3 ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_3 ].epAddr = 0x05; // XBOX 360 output endpoint - poll interval 8ms
-        epInfo[ XBOX_OUTPUT_PIPE_3 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE_3 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE_3 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE_3 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE_3 ].bmSndToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_3 ].bmRcvToggle = 0;
 
         epInfo[ XBOX_INPUT_PIPE_4 ].epAddr = 0x07; // XBOX 360 report endpoint - poll interval 1ms
-        epInfo[ XBOX_INPUT_PIPE_4 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE_4 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE_4 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE_4 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE_4 ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE_4 ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE_4 ].epAddr = 0x07; // XBOX 360 output endpoint - poll interval 8ms
-        epInfo[ XBOX_OUTPUT_PIPE_4 ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE_4 ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE_4 ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE_4 ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE_4 ].bmSndToggle = 0;
diff --git a/XBOXRECV.h b/XBOXRECV.h
index c3964991..0c259217 100644
--- a/XBOXRECV.h
+++ b/XBOXRECV.h
@@ -26,9 +26,6 @@
 /* Data Xbox 360 taken from descriptors */
 #define EP_MAXPKTSIZE       32 // max size for data via USB
 
-/* Endpoint types */
-#define EP_INTERRUPT        0x03
-
 /* Names we give to the 9 Xbox360 pipes */
 #define XBOX_CONTROL_PIPE   0
 #define XBOX_INPUT_PIPE_1   1
diff --git a/XBOXUSB.cpp b/XBOXUSB.cpp
index 4128d231..3cd9cde9 100644
--- a/XBOXUSB.cpp
+++ b/XBOXUSB.cpp
@@ -155,13 +155,13 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
 
         /* Initialize data structures for endpoints of device */
         epInfo[ XBOX_INPUT_PIPE ].epAddr = 0x01; // XBOX 360 report endpoint
-        epInfo[ XBOX_INPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_INPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_INPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_INPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_INPUT_PIPE ].bmSndToggle = 0;
         epInfo[ XBOX_INPUT_PIPE ].bmRcvToggle = 0;
         epInfo[ XBOX_OUTPUT_PIPE ].epAddr = 0x02; // XBOX 360 output endpoint
-        epInfo[ XBOX_OUTPUT_PIPE ].epAttribs = EP_INTERRUPT;
+        epInfo[ XBOX_OUTPUT_PIPE ].epAttribs = USB_TRANSFER_TYPE_INTERRUPT;
         epInfo[ XBOX_OUTPUT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints
         epInfo[ XBOX_OUTPUT_PIPE ].maxPktSize = EP_MAXPKTSIZE;
         epInfo[ XBOX_OUTPUT_PIPE ].bmSndToggle = 0;
diff --git a/XBOXUSB.h b/XBOXUSB.h
index aed330a2..8d5ecb2a 100644
--- a/XBOXUSB.h
+++ b/XBOXUSB.h
@@ -24,9 +24,6 @@
 /* Data Xbox 360 taken from descriptors */
 #define EP_MAXPKTSIZE       32 // max size for data via USB
 
-/* Endpoint types */
-#define EP_INTERRUPT        0x03
-
 /* Names we give to the 3 Xbox360 pipes */
 #define XBOX_CONTROL_PIPE    0
 #define XBOX_INPUT_PIPE      1