diff --git a/Makefile b/Makefile
index 8cac025..286e1e7 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ endif
 
 dgl:
 ifneq ($(HEADLESS),true)
-	$(MAKE) -C dpf/dgl opengl $(DGL_EXTRA_ARGS)
+	$(MAKE) opengl -C dpf/dgl $(DGL_EXTRA_ARGS)
 endif
 
 plugins: deps
diff --git a/deps/Makefile b/deps/Makefile
index f458eeb..286eb9f 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -31,8 +31,12 @@ endif
 # --------------------------------------------------------------
 # custom build flags
 
-BASE_FLAGS += -I../include
-BASE_FLAGS += -I../include/simd-compat
+BASE_FLAGS += -I$(abspath ../include)
+BASE_FLAGS += -I$(abspath ../include/simd-compat)
+
+ifeq ($(HAIKU)$(WASM),true)
+BASE_FLAGS += -I$(abspath ../include/linux-compat)
+endif
 
 ifeq ($(HEADLESS),true)
 ifeq ($(WITH_LTO),true)
@@ -53,8 +57,9 @@ endif
 ifeq ($(WINDOWS),true)
 BASE_FLAGS += -D_USE_MATH_DEFINES
 BASE_FLAGS += -DWIN32_LEAN_AND_MEAN
-BASE_FLAGS += -I../include/mingw-compat
-BASE_FLAGS += -I../include/mingw-std-threads
+BASE_FLAGS += -D_WIN32_WINNT=0x0600
+BASE_FLAGS += -I$(abspath ../include/mingw-compat)
+BASE_FLAGS += -I$(abspath ../include/mingw-std-threads)
 endif
 
 BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
@@ -148,6 +153,27 @@ ifeq ($(shell uname -s),Darwin)
 CMAKE += -DCMAKE_CROSSCOMPILING=ON
 CMAKE += -DCMAKE_SYSTEM_NAME=Generic
 endif
+CMAKE += -DCMAKE_SKIP_COMPATIBILITY_TESTS=1
+CMAKE += -DCMAKE_SIZEOF_CHAR=1
+CMAKE += -DCMAKE_SIZEOF_UNSIGNED_SHORT=2
+CMAKE += -DCMAKE_SIZEOF_SHORT=2
+CMAKE += -DCMAKE_SIZEOF_INT=4
+CMAKE += -DCMAKE_SIZEOF_UNSIGNED_LONG=4
+CMAKE += -DCMAKE_SIZEOF_UNSIGNED_INT=4
+CMAKE += -DCMAKE_SIZEOF_LONG=4
+CMAKE += -DCMAKE_SIZEOF_VOID_P=4
+CMAKE += -DCMAKE_SIZEOF_FLOAT=4
+CMAKE += -DCMAKE_SIZEOF_DOUBLE=8
+CMAKE += -DCMAKE_C_SIZEOF_DATA_PTR=4
+CMAKE += -DCMAKE_CXX_SIZEOF_DATA_PTR=4
+CMAKE += -DCMAKE_HAVE_LIMITS_H=1
+CMAKE += -DCMAKE_HAVE_UNISTD_H=1
+CMAKE += -DCMAKE_HAVE_PTHREAD_H=1
+CMAKE += -DCMAKE_HAVE_SYS_PRCTL_H=1
+CMAKE += -DCMAKE_WORDS_BIGENDIAN=0
+CMAKE += -DCMAKE_DL_LIBS=''
+CMAKE += -DCMAKE_C_BYTE_ORDER=LITTLE_ENDIAN
+CMAKE += -DCMAKE_CXX_BYTE_ORDER=LITTLE_ENDIAN
 endif
 
 # fix cross-compilation for windows
diff --git a/plugins/Makefile b/plugins/Makefile
index 7370c47..b7971ad 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1056,6 +1056,7 @@ BASE_FLAGS += -I../dpf/distrho
 BASE_FLAGS += -I../include
 BASE_FLAGS += -I../include/osdialog-stub
 BASE_FLAGS += -I../include/simd-compat
+BASE_FLAGS += -I../include/simde
 
 ifeq ($(HAVE_X11),true)
 BASE_FLAGS += -DHAVE_X11
@@ -1151,6 +1152,10 @@ endif
 BASE_FLAGS += -Wno-unused-parameter
 BASE_FLAGS += -Wno-unused-variable
 
+ifeq ($(CPU_ARM_OR_ARM64)$(CPU_RISCV64),true)
+BASE_FLAGS += -Wno-attributes
+endif
+
 # --------------------------------------------------------------
 # also from plugins
 
@@ -1652,7 +1657,6 @@ $(BUILD_DIR)/ChowDSP/%.cpp.o: ChowDSP/%.cpp
 		-IChowDSP/lib/chowdsp_utils/modules/chowdsp_dsp/WDF \
 		-Wno-deprecated-copy
 
-
 $(BUILD_DIR)/dBiz/src/%.cpp.o: dBiz/src/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"