diff --git a/Makefile b/Makefile
index bf63169..9cb2725 100644
--- a/Makefile
+++ b/Makefile
@@ -14,19 +14,23 @@ OPTIM ?= 2
 CFLAGS = -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DPATCHLEVEL=$(PATCHLEVEL)
 LIBS = -lm
 
+### SDL UI
+CFLAGS += $(shell pkg-config --cflags SDL_gfx sdl12_compat)
+LIBS += $(shell pkg-config --libs SDL_gfx sdl12_compat)
+
+### X11 UI
+CFLAGS += $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1
+LIBS += $(shell pkg-config --libs x11 xext)
+
+### debugger
+CFLAGS += $(shell pkg-config --cflags readline)
+LIBS += $(shell pkg-config --libs readline)
+
 FULL_WARNINGS = no
 ifeq ($(FULL_WARNINGS), yes)
 	CFLAGS += -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-unused-function -Wconversion -Wdouble-promotion -Wno-sign-conversion -fsanitize=undefined -fsanitize-trap
 endif
 
-### SDL UI
-	CFLAGS += $(shell pkg-config --cflags SDL_gfx sdl12_compat)
-	LIBS += $(shell pkg-config --libs SDL_gfx sdl12_compat)
-
-### X11 UI
-	CFLAGS += $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1 -DGUI_IS_X11=1
-	LIBS += $(shell pkg-config --libs x11 xext)
-
 DOTOS = src/emu_serial.o \
 	src/emu_emulate.o \
 	src/emu_init.o \
@@ -34,6 +38,7 @@ DOTOS = src/emu_serial.o \
 	src/emu_memory.o \
 	src/emu_register.o \
 	src/emu_timer.o \
+	src/debugger.o \
 	src/runtime_options.o \
 	src/romio.o \
 	src/ui_sdl.o \
@@ -41,13 +46,6 @@ DOTOS = src/emu_serial.o \
 	src/ui.o \
 	src/main.o
 
-### debugger
-DOTOS += src/debugger.o
-
-CFLAGS += $(shell pkg-config --cflags readline)
-LIBS += $(shell pkg-config --libs readline)
-### /debugger
-
 .PHONY: all clean clean-all pretty-code install
 
 all: dist/mkcard dist/checkrom dist/dump2rom dist/x48ng