diff --git a/Makefile b/Makefile
index 9094153..17c6f4f 100644
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,33 @@ SYSDEPS ?= false
 ifeq ($(SYSDEPS),true)
 
 ifneq ($(shell pkg-config --exists jansson && echo true),true)
-$(error jansson dpendency not installed/available)
+$(error jansson dependency not installed/available)
 endif
 ifneq ($(shell pkg-config --exists libarchive && echo true),true)
-$(error libarchive dpendency not installed/available)
+$(error libarchive dependency not installed/available)
 endif
 ifneq ($(shell pkg-config --exists samplerate && echo true),true)
-$(error samplerate dpendency not installed/available)
+$(error samplerate dependency not installed/available)
 endif
 ifneq ($(shell pkg-config --exists speexdsp && echo true),true)
-$(error speexdsp dpendency not installed/available)
+$(error speexdsp dependency not installed/available)
+endif
+
+endif
+
+ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+
+ifneq ($(HAVE_OPENGL),true)
+$(error X11 dependency not installed/available)
+endif
+ifneq ($(HAVE_X11),true)
+$(error X11 dependency not installed/available)
+endif
+ifneq ($(HAVE_XEXT),true)
+$(warning Xext dependency not installed/available)
+endif
+ifneq ($(HAVE_XRANDR),true)
+$(warning Xrandr dependency not installed/available)
 endif
 
 endif
@@ -46,8 +63,7 @@ ifneq ($(SYSDEPS),true)
 endif
 
 dgl:
-	$(MAKE) USE_NANOVG_FBO=true -C dpf/dgl opengl
-	# $(MAKE) opengl -C dpf/dgl USE_NANOVG_FBO=true
+	$(MAKE) -C dpf/dgl opengl USE_NANOVG_FBO=true
 
 plugins: deps
 	$(MAKE) all -C plugins
diff --git a/src/Makefile b/src/Makefile
index 47901e1..2f1ba6b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,6 +28,10 @@ FILES_DSP = \
 	override/library.cpp \
 	override/network.cpp
 
+# override/osdialog.cpp
+# override/RemoteNanoVG.cpp
+# override/RemoteWindow.cpp
+
 FILES_UI = \
 	CardinalUI.cpp \
 	override/MenuBar.cpp \
@@ -44,11 +48,10 @@ include ../dpf/Makefile.base.mk
 
 FILES_DSP += Rack/dep/pffft/pffft.c
 FILES_DSP += Rack/dep/pffft/fftpack.c
-
-FILES_UI += Rack/dep/oui-blendish/blendish.c
+FILES_DSP += Rack/dep/osdialog/osdialog.c
+FILES_DSP += Rack/dep/oui-blendish/blendish.c
 
 # FIXME dont use this
-FILES_UI += Rack/dep/osdialog/osdialog.c
 ifeq ($(MACOS),true)
 FILES_UI += Rack/dep/osdialog/osdialog_mac.m
 else ifeq ($(WINDOWS),true)
@@ -68,11 +71,13 @@ IGNORED_FILES += Rack/src/library.cpp
 IGNORED_FILES += Rack/src/network.cpp
 IGNORED_FILES += Rack/src/rtaudio.cpp
 IGNORED_FILES += Rack/src/rtmidi.cpp
+IGNORED_FILES += Rack/src/app/MenuBar.cpp
+IGNORED_FILES += Rack/src/window/Window.cpp
 
 FILES_DSP += $(wildcard Rack/src/*.c)
 FILES_DSP += $(wildcard Rack/src/*/*.c)
 FILES_DSP += $(filter-out $(IGNORED_FILES),$(wildcard Rack/src/*.cpp))
-FILES_DSP += $(filter-out Rack/src/app/MenuBar.cpp Rack/src/window/Window.cpp, $(wildcard Rack/src/*/*.cpp))
+FILES_DSP += $(filter-out $(IGNORED_FILES), $(wildcard Rack/src/*/*.cpp))
 
 # --------------------------------------------------------------
 # Extra libraries to link against