diff --git a/BTD.cpp b/BTD.cpp
index 35570a24..b0f59a02 100755
--- a/BTD.cpp
+++ b/BTD.cpp
@@ -282,6 +282,7 @@ void BTD::EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto
     bNumEP++;
 }
 void BTD::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
+#ifdef EXTRADEBUG
 	Notify(PSTR("\r\nEndpoint descriptor:"));
 	Notify(PSTR("\r\nLength:\t\t"));
 	PrintHex<uint8_t>(ep_ptr->bLength);
@@ -295,6 +296,7 @@ void BTD::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
 	PrintHex<uint16_t>(ep_ptr->wMaxPacketSize);
 	Notify(PSTR("\r\nPoll Intrv:\t"));
 	PrintHex<uint8_t>(ep_ptr->bInterval);
+#endif
 }
 
 /* Performs a cleanup after failed Init() attempt */
diff --git a/PS3USB.cpp b/PS3USB.cpp
index 9e739ca4..4136b318 100644
--- a/PS3USB.cpp
+++ b/PS3USB.cpp
@@ -315,6 +315,7 @@ void PS3USB::readReport() {
 }
 
 void PS3USB::printReport() { //Uncomment "#define PRINTREPORT" to print the report send by the PS3 Controllers
+#ifdef PRINTREPORT
     if (readBuf == NULL)
         return;
     for(uint8_t i = 0; i < PS3_REPORT_BUFFER_SIZE;i++) {
@@ -322,6 +323,7 @@ void PS3USB::printReport() { //Uncomment "#define PRINTREPORT" to print the repo
         Serial.print(" ");
     }             
     Serial.println();
+#endif
 }
 
 bool PS3USB::getButtonPress(Button b) {
diff --git a/XBOXRECV.cpp b/XBOXRECV.cpp
index 34c99fea..03610882 100644
--- a/XBOXRECV.cpp
+++ b/XBOXRECV.cpp
@@ -363,7 +363,7 @@ void XBOXRECV::readReport(uint8_t controller) {
 }
 
 void XBOXRECV::printReport(uint8_t controller, uint8_t nBytes) { //Uncomment "#define PRINTREPORT" to print the report send by the Xbox 360 Controller
-#if defined(PRINTREPORT)
+#ifdef PRINTREPORT
     if (readBuf == NULL)
         return;
     Notify(PSTR("Controller "));
diff --git a/XBOXUSB.cpp b/XBOXUSB.cpp
index 255f3730..233da046 100644
--- a/XBOXUSB.cpp
+++ b/XBOXUSB.cpp
@@ -269,6 +269,7 @@ void XBOXUSB::readReport() {
 }  
 
 void XBOXUSB::printReport() { //Uncomment "#define PRINTREPORT" to print the report send by the Xbox 360 Controller
+#ifdef PRINTREPORT
     if (readBuf == NULL)
         return;
     for(uint8_t i = 0; i < XBOX_REPORT_BUFFER_SIZE;i++) {
@@ -276,6 +277,7 @@ void XBOXUSB::printReport() { //Uncomment "#define PRINTREPORT" to print the rep
         Serial.print(" ");
     }             
     Serial.println("");
+#endif    
 }
 
 uint8_t XBOXUSB::getButton(Button b) {