diff --git a/hardware/cores/arduino/WProgram.h b/hardware/cores/arduino/WProgram.h
index 5f78de27a..20650df11 100755
--- a/hardware/cores/arduino/WProgram.h
+++ b/hardware/cores/arduino/WProgram.h
@@ -1,3 +1,6 @@
+#ifndef WProgram_h
+#define WProgram_h
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -17,3 +20,5 @@ long random(long, long);
 void randomSeed(unsigned int);
 long map(long, long, long, long, long);
 #endif
+
+#endif
\ No newline at end of file
diff --git a/hardware/libraries/Firmata/Firmata.h b/hardware/libraries/Firmata/Firmata.h
index c556c4a47..a0a6513fc 100644
--- a/hardware/libraries/Firmata/Firmata.h
+++ b/hardware/libraries/Firmata/Firmata.h
@@ -67,7 +67,7 @@ extern "C" {
 
 
 // TODO make it a subclass of HardwareSerial
-class FirmataClass : public Print
+class FirmataClass
 {
 public:
 	FirmataClass();