diff --git a/Makefile b/Makefile
index 8c56874..83585f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 BASE_UXN   := src/uxn
 SRC_DIR    ?= src
 BUILD_DIR  ?= build
-SRC_MAIN   ?= $(SRC_DIR)/main.c
+SRC_MAIN   ?= $(SRC_DIR)/main.c \
+			  $(BASE_UXN)/src/uxn.c \
+			  $(BASE_UXN)/src/devices/system.c
 EXE_NAME   ?= uxnfb
 BIN        := $(BUILD_DIR)/$(EXE_NAME)
 UXN_HEAD   := $(BASE_UXN)/src/uxn.h
diff --git a/src/main.c b/src/main.c
index 222fef3..025b2e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,8 +10,8 @@
 
 #include "shorthand.h"
 #include "ppu.c"
-#include "uxn/src/devices/system.c"
-#include "uxn/src/uxn.c"
+#include "uxn/src/uxn.h"
+#include "uxn/src/devices/system.h"
 
 #define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X))