diff --git a/Makefile b/Makefile
index 83585f8..8c56874 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 BASE_UXN   := src/uxn
 SRC_DIR    ?= src
 BUILD_DIR  ?= build
-SRC_MAIN   ?= $(SRC_DIR)/main.c \
-			  $(BASE_UXN)/src/uxn.c \
-			  $(BASE_UXN)/src/devices/system.c
+SRC_MAIN   ?= $(SRC_DIR)/main.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 025b2e6..222fef3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,8 +10,8 @@
 
 #include "shorthand.h"
 #include "ppu.c"
-#include "uxn/src/uxn.h"
-#include "uxn/src/devices/system.h"
+#include "uxn/src/devices/system.c"
+#include "uxn/src/uxn.c"
 
 #define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X))
 
diff --git a/src/uxn b/src/uxn
index 56432c1..11c9ec8 160000
--- a/src/uxn
+++ b/src/uxn
@@ -1 +1 @@
-Subproject commit 56432c1fcdbca312aa58db6b83177771e0299fcf
+Subproject commit 11c9ec8b49ae650005a3b7bd74269ff58ab09635