diff --git a/Makefile b/Makefile
index 7c2e4ee..ea34a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,15 +15,17 @@ clean:
 	rm -rf build
 
 # Include common source
-SRC=$(wildcard src/*.c)
-INCLUDE=$(wildcard src/include/common/*.h)
-CFLAGS=-Isrc/include
+COMMON_DIR=src/common
+SRC=$(wildcard $(COMMON_DIR)/*.c)
+INCLUDE=$(wildcard $(COMMON_DIR)/include/common/*.h)
+CFLAGS=-I$(COMMON_DIR)/include
+include $(COMMON_DIR)/common.mk
 
 # Include the board's source
 BOARD_DIR=src/board/$(BOARD)
 SRC+=$(wildcard $(BOARD_DIR)/*.c)
 INCLUDE+=$(wildcard $(BOARD_DIR)/include/board/*.h)
-CFLAGS+=-I$(BOARD_DIR)/include
+CFLAGS+=-I$(BOARD_DIR)/include -D__BOARD__=$(BOARD)
 include $(BOARD_DIR)/board.mk
 
 # The board will define the embedded controller
@@ -31,7 +33,7 @@ include $(BOARD_DIR)/board.mk
 EC_DIR=src/ec/$(EC)
 SRC+=$(wildcard $(EC_DIR)/*.c)
 INCLUDE+=$(wildcard $(EC_DIR)/include/ec/*.h)
-CFLAGS+=-I$(EC_DIR)/include
+CFLAGS+=-I$(EC_DIR)/include -D__EC__=$(EC)
 include $(EC_DIR)/ec.mk
 
 # The EC will define the architecture
@@ -39,7 +41,7 @@ include $(EC_DIR)/ec.mk
 ARCH_DIR=src/arch/$(ARCH)
 SRC+=$(wildcard $(ARCH_DIR)/*.c)
 INCLUDE+=$(wildcard $(ARCH_DIR)/include/arch/*.h)
-CFLAGS+=-I$(ARCH_DIR)/include
+CFLAGS+=-I$(ARCH_DIR)/include -D__ARCH__=$(ARCH)
 include $(ARCH_DIR)/arch.mk
 
 # The architecture defines build targets, no more is required