diff --git a/Makefile.Pi b/Makefile.Pi
index 509dbb7..4a757ad 100644
--- a/Makefile.Pi
+++ b/Makefile.Pi
@@ -1,7 +1,7 @@
 # This makefile is for use with the Raspberry Pi. The wiringpi library is needed.
 
-CC      = gcc
-CXX     = g++
+CC      = cc
+CXX     = c++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DRASPBERRY_PI -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
index f9a9dfc..19ddbae 100644
--- a/Makefile.Pi.Adafruit
+++ b/Makefile.Pi.Adafruit
@@ -1,8 +1,8 @@
 # This makefile is for use with the Raspberry Pi when using an HD44780 compatible display. The wiringpi library is needed.
 # Support for the Adafruit i2c 16 x 2 RGB LCD Pi Plate
 
-CC      = gcc
-CXX     = g++
+CC      = cc
+CXX     = c++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
index 37f84ce..f05b28d 100644
--- a/Makefile.Pi.HD44780
+++ b/Makefile.Pi.HD44780
@@ -1,7 +1,7 @@
 # This makefile is for use with the Raspberry Pi when using an HD44780 compatible display. The wiringpi library is needed.
 
-CC      = gcc
-CXX     = g++
+CC      = cc
+CXX     = c++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
index 30e3930..a4a2e66 100644
--- a/Makefile.Pi.OLED
+++ b/Makefile.Pi.OLED
@@ -1,7 +1,7 @@
 # This makefile is for use with the Raspberry Pi when using an OLED display. The wiringpi library is needed.
 
-CC      = gcc
-CXX     = g++
+CC      = cc
+CXX     = c++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DOLED -I/usr/local/include
 LIBS    = -lArduiPi_OLED -lwiringPi -lpthread
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
index 7b0b00c..7d8afa5 100644
--- a/Makefile.Pi.PCF8574
+++ b/Makefile.Pi.PCF8574
@@ -1,8 +1,8 @@
 # This makefile is for use with the Raspberry Pi when using an HD44780 compatible display. The wiringpi library is needed.
 # Support for the HD44780 connected via a PCF8574 8-bit GPIO expander IC
 
-CC      = gcc
-CXX     = g++
+CC      = cc
+CXX     = c++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 LDFLAGS = -g -L/usr/local/lib