diff --git a/base_station/Makefile b/base_station/Makefile
index 4f17673..2f76c4b 100644
--- a/base_station/Makefile
+++ b/base_station/Makefile
@@ -30,7 +30,8 @@ CSTANDARD = -std=gnu99
 CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__
 
 # Place -I options here
-CINCS = -I $(INC_DIR) -I$(COMMON_INC_DIR)
+CINCS = -I /usr/avr/include -I /usr/lib/gcc/avr/7.2.0/include \
+		-I $(INC_DIR) -I $(COMMON_INC_DIR)
 
 CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 #CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
@@ -53,7 +54,7 @@ ifeq ($(BUILD),debug)
 			  -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
 			  -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
 			  -Wno-unused-but-set-variable -Wmaybe-uninitialized
-	CINCS += -I/usr/include/simavr
+	CINCS += -I /usr/include/simavr
 	#
 else
 	CFLAGS += -DNDEBUG -s -Os
diff --git a/common/Makefile b/common/Makefile
index 95057cc..b512cf3 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -44,7 +44,7 @@ ifeq ($(BUILD),debug)
 			  -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
 			  -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
 			  -Wno-unused-but-set-variable -Wmaybe-uninitialized
-	CINCS += -I/usr/include/simavr
+	CINCS += -I /usr/include/simavr
 	#
 else
 	CFLAGS += -DNDEBUG -s -Os
diff --git a/robot/Makefile b/robot/Makefile
index 4f17673..2f76c4b 100644
--- a/robot/Makefile
+++ b/robot/Makefile
@@ -30,7 +30,8 @@ CSTANDARD = -std=gnu99
 CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__
 
 # Place -I options here
-CINCS = -I $(INC_DIR) -I$(COMMON_INC_DIR)
+CINCS = -I /usr/avr/include -I /usr/lib/gcc/avr/7.2.0/include \
+		-I $(INC_DIR) -I $(COMMON_INC_DIR)
 
 CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 #CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
@@ -53,7 +54,7 @@ ifeq ($(BUILD),debug)
 			  -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
 			  -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
 			  -Wno-unused-but-set-variable -Wmaybe-uninitialized
-	CINCS += -I/usr/include/simavr
+	CINCS += -I /usr/include/simavr
 	#
 else
 	CFLAGS += -DNDEBUG -s -Os
diff --git a/robot/src/sonar.c b/robot/src/sonar.c
index f5bd653..aeaba41 100644
--- a/robot/src/sonar.c
+++ b/robot/src/sonar.c
@@ -1,7 +1,6 @@
 #include <avr/interrupt.h>
 #include <util/delay.h>
 #include "sonar.h"
-
 #include "led.h"
 
 volatile uint32_t trig_counter;