diff --git a/dpf b/dpf
index f79095a..c4e1210 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit f79095abdeb7442121f9f26adc53b87352f04e26
+Subproject commit c4e1210897e804a19b3fa35d542765b3feb0236e
diff --git a/plugins/CVCRack/Makefile b/plugins/CVCRack/Makefile
index df133ab..d5f3cd6 100644
--- a/plugins/CVCRack/Makefile
+++ b/plugins/CVCRack/Makefile
@@ -18,54 +18,54 @@ FILES_DSP = \
 FILES_UI = \
 	CVCRackUI.cpp
 
+# --------------------------------------------------------------
+# Import base definitions
+
+include ../../dpf/Makefile.base.mk
+
 # --------------------------------------------------------------
 # Files to build (VCV stuff)
 
 FILES_DSP += Rack/dep/pffft/pffft.c
 FILES_DSP += Rack/dep/pffft/fftpack.c
 
-# FILES_DSP += Rack/build/src/common.cpp
-
 FILES_UI += Rack/dep/oui-blendish/blendish.c
 FILES_UI += Rack/dep/nanovg/src/nanovg.c
-FILES_UI += Rack/dep/glfw/deps/glad.c
+# FILES_UI += Rack/dep/glfw/deps/glad.c
 
-# FIXME
+# 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)
+FILES_UI += Rack/dep/osdialog/osdialog_win.c
+else
 FILES_UI += Rack/dep/osdialog/osdialog_zenity.c
+endif
 
 FILES_DSP += $(wildcard Rack/src/*.c)
 FILES_DSP += $(wildcard Rack/src/*/*.c)
-# TODO filter out src/rtaudio.cpp src/rtmidi.cpp
-FILES_DSP += $(wildcard Rack/src/*.cpp)
+FILES_DSP += $(filter-out Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp))
 FILES_DSP += $(wildcard Rack/src/*/*.cpp)
 
 EXTRA_LIBS  = Rack/dep/lib/libglfw3.a
 EXTRA_LIBS += Rack/dep/lib/libjansson.a
 EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
 
-# ifeq ($(LINUX),true)
+ifeq ($(WINDOWS),true)
+EXTRA_LIBS += Rack/dep/lib/libglew32.a
+else
 EXTRA_LIBS += Rack/dep/lib/libGLEW.a
-# endif
-
-# ifeq ($(MACOS),true)
-# EXTRA_LIBS += Rack/dep/lib/libGLEW.a
-# endif
-# 
-# ifeq ($(WINDOWS),true)
-# EXTRA_LIBS += Rack/dep/lib/libglew32.a
-# endif
-
-# --------------------------------------------------------------
-
-Rack/dep/lib/%.a:
-	$(MAKE) -C Rack/dep lib/$*.a
+endif
 
 # --------------------------------------------------------------
 # Do some magic
 
 include ../../dpf/Makefile.plugins.mk
 
+Rack/dep/lib/%.a:
+	$(MAKE) -C Rack/dep lib/$*.a
+
 # --------------------------------------------------------------
 # Extra flags for VCV stuff
 
@@ -89,11 +89,17 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
-# FIXME
+# FIXME lots of warnings from VCV side
 BASE_FLAGS += -Wno-unused-parameter
 BASE_FLAGS += -Wno-unused-variable
 
-LINK_FLAGS += -lpthread -ldl
+# extra linker flags
+ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+LINK_FLAGS += -ldl
+endif
+
+# TODO needed on windows? need to check
+LINK_FLAGS += -lpthread
 
 # --------------------------------------------------------------
 # Enable all possible plugin types