diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96f3efee6..56a4d446a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,9 @@ endif()
 cmake_dependent_option(AMD_K5         "AMD K5"                                      ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(CYRIX_6X86     "Cyrix 6x86"                                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(GUSMAX         "Gravis UltraSound MAX"                       ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                                 ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"                           ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"                                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(LASERXT        "VTech Laser XT"                              ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(MGA            "Matrox Mystique graphics adapters"           ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(NO_SIO         "Machines without emulated Super I/O chips"   ON      "DEV_BRANCH"    OFF)
@@ -146,9 +149,6 @@ cmake_dependent_option(TANDY_ISA      "Tandy PSG ISA clone boards"
 cmake_dependent_option(VGAWONDER      "ATI VGA Wonder (ATI-18800)"                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(VNC            "VNC renderer"                                OFF     "DEV_BRANCH"    OFF)
 cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"           ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                                 ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"                           ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"                                  ON      "DEV_BRANCH"    OFF)
 
 # Ditto but for Qt
 if (QT)
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
index 5d7d2d752..658da7280 100644
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@ -19,10 +19,6 @@ add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c h
     smbus_piix4.c smbus_ali7101.c keyboard.c keyboard_xt.c keyboard_at.c
     mouse.c mouse_bus.c mouse_serial.c mouse_ps2.c phoenix_486_jumper.c)
 
-if(LASERXT)
-    target_compile_definitions(dev PRIVATE USE_LASERXT)
-endif()
-
 if(ISAMEM_RAMPAGE)
     target_compile_definitions(dev PRIVATE USE_ISAMEM_RAMPAGE)
 endif()
@@ -34,3 +30,7 @@ endif()
 if(ISAMEM_BRAT)
     target_compile_definitions(dev PRIVATE USE_ISAMEM_BRAT)
 endif()
+
+if(LASERXT)
+    target_compile_definitions(dev PRIVATE USE_LASERXT)
+endif()
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index e1a60d873..3f0b3a3b6 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -42,6 +42,15 @@ ifeq ($(DEV_BUILD), y)
  ifndef GUSMAX
   GUSMAX	:= y
  endif
+ ifndef ISAMEM_RAMPAGE
+  ISAMEM_RAMPAGE := y
+ endif
+ ifndef ISAMEM_IAB
+  ISAMEM_IAB := y
+ endif
+ ifndef ISAMEM_BRAT
+  ISAMEM_BRAT := y
+ endif
  ifndef LASERXT
   LASERXT	:= y
  endif
@@ -72,15 +81,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef XL24
   XL24		:= y
  endif
- ifndef ISAMEM_RAMPAGE
-  ISAMEM_RAMPAGE := y
- endif
- ifndef ISAMEM_IAB
-  ISAMEM_IAB := y
- endif
- ifndef ISAMEM_BRAT
-  ISAMEM_BRAT := y
- endif
  ifndef OLIVETTI
   OLIVETTI	:= y
  endif
@@ -103,6 +103,15 @@ else
  ifndef GUSMAX
   GUSMAX	:= n
  endif
+ ifndef ISAMEM_RAMPAGE
+  ISAMEM_RAMPAGE := n
+ endif
+ ifndef ISAMEM_IAB
+  ISAMEM_IAB := n
+ endif
+ ifndef ISAMEM_BRAT
+  ISAMEM_BRAT := n
+ endif
  ifndef LASERXT
   LASERXT	:= n
  endif
@@ -133,15 +142,6 @@ else
  ifndef XL24
   XL24		:= n
  endif
- ifndef ISAMEM_RAMPAGE
-  ISAMEM_RAMPAGE := n
- endif
- ifndef ISAMEM_IAB
-  ISAMEM_IAB := n
- endif
- ifndef ISAMEM_BRAT
-  ISAMEM_BRAT := n
- endif
  ifndef OLIVETTI
   OLIVETTI	:= n
  endif
@@ -434,6 +434,18 @@ ifeq ($(GUSMAX), y)
 OPTS		+= -DUSE_GUSMAX
 endif
 
+ifeq ($(ISAMEM_RAMPAGE), y)
+OPTS        += -DUSE_ISAMEM_RAMPAGE
+endif
+
+ifeq ($(ISAMEM_IAB), y)
+OPTS        += -DUSE_ISAMEM_IAB
+endif
+
+ifeq ($(ISAMEM_BRAT), y)
+OPTS        += -DUSE_ISAMEM_BRAT
+endif
+
 ifeq ($(LASERXT), y)
 OPTS		+= -DUSE_LASERXT
 DEVBROBJ	+= m_xt_laserxt.o
@@ -474,18 +486,6 @@ ifeq ($(XL24), y)
 OPTS		+= -DUSE_XL24
 endif
 
-ifeq ($(ISAMEM_RAMPAGE), y)
-OPTS        += -DUSE_ISAMEM_RAMPAGE
-endif
-
-ifeq ($(ISAMEM_IAB), y)
-OPTS        += -DUSE_ISAMEM_IAB
-endif
-
-ifeq ($(ISAMEM_BRAT), y)
-OPTS        += -DUSE_ISAMEM_BRAT
-endif
-
 ifeq ($(OLIVETTI), y)
 OPTS		+= -DUSE_OLIVETTI
 DEVBROBJ	+= olivetti_eva.o