diff --git a/Makefile b/Makefile
index a7bb9b2a9..ab60a1517 100644
--- a/Makefile
+++ b/Makefile
@@ -127,35 +127,35 @@ $(MODULEDIR)/theme.qt5.a: .FORCE
 	@$(MAKE) -C source/theme qt5
 
 $(MODULEDIR)/%.arm32.a: .FORCE
-ifneq ($(WIN32),true)
+ifneq ($(WINDOWS),true)
 	@$(MAKE) -C source/modules/$* arm32
 else
 	$(error Trying to build ARM binaries with a Windows toolchain, this cannot work)
 endif
 
 $(MODULEDIR)/%.posix32.a: .FORCE
-ifneq ($(WIN32),true)
+ifneq ($(WINDOWS),true)
 	@$(MAKE) -C source/modules/$* posix32
 else
 	$(error Trying to build POSIX binaries with a Windows toolchain, this cannot work)
 endif
 
 $(MODULEDIR)/%.posix64.a: .FORCE
-ifneq ($(WIN32),true)
+ifneq ($(WINDOWS),true)
 	@$(MAKE) -C source/modules/$* posix64
 else
 	$(error Trying to build POSIX binaries with a Windows toolchain, this cannot work)
 endif
 
 $(MODULEDIR)/%.win32.a: .FORCE
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 	@$(MAKE) -C source/modules/$* win32
 else
 	$(error Trying to build Windows binaries with a regular toolchain, this cannot work)
 endif
 
 $(MODULEDIR)/%.win64.a: .FORCE
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 	@$(MAKE) -C source/modules/$* win64
 else
 	$(error Trying to build Windows binaries with a regular toolchain, this cannot work)
@@ -206,7 +206,7 @@ lv2-bundles: lv2-bundles-dep
 plugin: backend bridges-plugin bridges-ui discovery
 	@$(MAKE) -C source/plugin
 
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 plugin-wine:
 	@$(MAKE) -C source/plugin wine
 else
@@ -843,7 +843,7 @@ HAVE_DIST = true
 endif
 endif
 
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 HAVE_DIST = true
 endif
 
diff --git a/Makefile.dist.mk b/Makefile.dist.mk
index 2b6e91ea3..12b152f17 100644
--- a/Makefile.dist.mk
+++ b/Makefile.dist.mk
@@ -10,7 +10,7 @@
 
 PYTHON = $(EXE_WRAPPER) $(shell which python3$(APP_EXT))
 
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 QT5_DLL_EXT = .dll
 QT5_DLL_V = 5
 endif
@@ -48,12 +48,12 @@ _QT5_PLUGINS = \
 
 ifeq ($(MACOS),true)
 _QT5_PLUGINS += platforms/$(QT5_LIB_PREFIX)qcocoa$(LIB_EXT)
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 _QT5_PLUGINS += platforms/$(QT5_LIB_PREFIX)qwindows$(LIB_EXT)
 endif
 
 # NOTE this has to be hardcoded for now. oh well
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 _PYTHON_FILES = \
 	libpython3.8.dll
 endif
@@ -74,7 +74,7 @@ _CARLA_HOST_FILES = \
 ifeq ($(MACOS),true)
 _CARLA_HOST_FILES += carla-bridge-lv2-cocoa$(APP_EXT)
 _CARLA_HOST_FILES += magic.mgc
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 _CARLA_HOST_FILES += carla-bridge-lv2-windows$(APP_EXT)
 endif
 
@@ -139,7 +139,7 @@ _CARLA_VST2SYN_PLUGIN_FILES = \
 	$(_QT5_DLLS:%=carla.vst/Contents/MacOS/resources/%) \
 	$(_QT5_PLUGINS:%=carla.vst/Contents/MacOS/resources/%) \
 	$(_THEME_FILES:%=carla.vst/Contents/MacOS/resources/%)
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 _CARLA_VST2_PLUGIN_FILES = \
 	carla.vst/CarlaVstShell.dll \
 	carla.vst/CarlaVstFxShell.dll \
@@ -156,7 +156,7 @@ ifeq ($(MACOS),true)
 CARLA_APP_FILES = $(_CARLA_APP_FILES:%=build/Carla.app/Contents/MacOS/%)
 CARLA_CONTROL_APP_FILES = $(_CARLA_CONTROL_APP_FILES:%=build/Carla-Control.app/Contents/MacOS/%)
 CARLA_PLUGIN_ZIPS = $(_PLUGIN_UIS:%=build/%.app/Contents/MacOS/lib/library.zip)
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 CARLA_APP_FILES = $(_CARLA_APP_FILES:%=build/Carla/%)
 CARLA_CONTROL_APP_FILES = $(_CARLA_CONTROL_APP_FILES:%=build/Carla-Control/%)
 CARLA_PLUGIN_FILES = $(_CARLA_LV2_PLUGIN_FILES:%=build/%) $(_CARLA_VST2_PLUGIN_FILES:%=build/%)
@@ -170,9 +170,10 @@ ifeq ($(MACOS_UNIVERSAL),true)
 TARGETS = Carla-$(VERSION)-macOS-universal.dmg
 else ifeq ($(MACOS),true)
 TARGETS = Carla-$(VERSION)-macOS.dmg
-else ifeq ($(WIN64),true)
+else ifeq ($(WINDOWS),true)
+ifeq ($(CPU_X86_64),true)
 TARGETS = Carla-$(VERSION)-win64.zip
-else ifeq ($(WIN32),true)
+else
 TARGETS = Carla-$(VERSION)-win32.zip
 endif
 
@@ -299,7 +300,7 @@ define CLEANUP_AND_PATCH_CXFREEZE_FILES
 			$(call PATCH_QT_DEPENDENCIES,$$f); \
 		done)
 endef
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 define CLEANUP_AND_PATCH_CXFREEZE_FILES
 	# cleanup
 	find build/${1}/ -type f -name "*.py" -delete
@@ -324,7 +325,7 @@ define GENERATE_LIBRARY_ZIP
 	rm -rf build/exe.*
 	env PYTHONPATH=$(CURDIR)/source/frontend SCRIPT_NAME=${1} $(PYTHON) ./data/macos/bundle.py bdist_mac --bundle-name=${1} 1>/dev/null
 endef
-else ifeq ($(WIN32),true)
+else ifeq ($(WINDOWS),true)
 define GENERATE_LIBRARY_ZIP
 	env PYTHONPATH="$(CURDIR)/source/frontend;$(QT5_PREFIX)/lib/python3/site-packages" SCRIPT_NAME=${1} $(PYTHON) ./data/windows/app-gui.py build_exe 1>/dev/null
 endef
diff --git a/Makefile.print.mk b/Makefile.print.mk
index 6094cdcb3..b55c12f5d 100644
--- a/Makefile.print.mk
+++ b/Makefile.print.mk
@@ -53,7 +53,7 @@ ifeq ($(HAVE_LIBLO),true)
 else
 	@printf -- "OSC support:   $(ANS_NO)  $(mS)Missing liblo$(mE)\n"
 endif
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 	@printf -- "Binary detect: $(ANS_YES)\n"
 else
 ifeq ($(HAVE_LIBMAGIC),true)
@@ -93,7 +93,7 @@ ifeq ($(MACOS),true)
 else
 	@printf -- "CoreAudio:   $(ANS_NO)  $(mZ)MacOS only$(mE)\n"
 endif
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 	@printf -- "ASIO:        $(ANS_YES)\n"
 	@printf -- "DirectSound: $(ANS_YES)\n"
 	@printf -- "WASAPI:      $(ANS_YES)\n"
@@ -114,7 +114,7 @@ endif
 	@printf -- "LADSPA:   $(ANS_YES)\n"
 	@printf -- "DSSI:     $(ANS_YES)\n"
 	@printf -- "LV2:      $(ANS_YES)\n"
-ifeq ($(MACOS_OR_WIN32),true)
+ifeq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(USING_JUCE),true)
 	@printf -- "VST2:     $(ANS_YES) (with UI, using JUCE)\n"
 	@printf -- "VST3:     $(ANS_YES) (with UI, using JUCE)\n"
@@ -122,7 +122,7 @@ else  # USING_JUCE
 	@printf -- "VST2:     $(ANS_YES) (with UI)\n"
 	@printf -- "VST3:     $(ANS_NO)\n"
 endif # USING_JUCE
-else  # MACOS_OR_WIN32
+else  # MACOS_OR_WINDOWS
 ifeq ($(HAIKU),true)
 	@printf -- "VST2:     $(ANS_YES) (without UI)\n"
 	@printf -- "VST3:     $(ANS_NO)\n"
@@ -139,7 +139,7 @@ else  # HAVE_X11
 	@printf -- "VST3:     $(ANS_NO)\n"
 endif # HAVE_X11
 endif # HAIKU
-endif # MACOS_OR_WIN32
+endif # MACOS_OR_WINDOWS
 ifeq ($(MACOS),true)
 ifeq ($(USING_JUCE),true)
 	@printf -- "AU:       $(ANS_YES) (with UI, using JUCE)\n"
@@ -155,7 +155,7 @@ endif # MACOS
 	@printf -- "External: $(ANS_YES) (direct)\n"
 	@printf -- "Gtk2:     $(ANS_YES) (bridge)\n"
 	@printf -- "Gtk3:     $(ANS_YES) (bridge)\n"
-ifneq ($(MACOS_OR_WIN32),true)
+ifneq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(HAVE_QT4),true)
 	@printf -- "Qt4:      $(ANS_YES) (bridge)\n"
 else
@@ -171,17 +171,17 @@ ifeq ($(HAVE_X11),true)
 else
 	@printf -- "X11:      $(ANS_NO)  $(mS)X11 missing$(mE)\n"
 endif
-else # !MACOS_OR_WIN32
+else # !MACOS_OR_WINDOWS
 	@printf -- "Qt4:      $(ANS_NO)  $(mZ)Not available for Windows or MacOS$(mE)\n"
 	@printf -- "Qt5:      $(ANS_NO)  $(mZ)Not available for Windows or MacOS$(mE)\n"
 	@printf -- "X11:      $(ANS_NO)  $(mZ)Not available for Windows or MacOS$(mE)\n"
-endif # !MACOS_OR_WIN32
+endif # !MACOS_OR_WINDOWS
 ifeq ($(MACOS),true)
 	@printf -- "Cocoa:    $(ANS_YES) (direct+bridge)\n"
 else
 	@printf -- "Cocoa:    $(ANS_NO)  $(mZ)MacOS only$(mE)\n"
 endif
-ifeq ($(WIN32),true)
+ifeq ($(WINDOWS),true)
 	@printf -- "Windows:  $(ANS_YES) (direct+bridge)\n"
 else
 	@printf -- "Windows:  $(ANS_NO)  $(mZ)Windows only$(mE)\n"