diff --git a/makefile b/makefile
index 945d4ba73be..c6a56797deb 100644
--- a/makefile
+++ b/makefile
@@ -293,15 +293,6 @@ ifdef TARGETOS
 PARAMS += --targetos=$(TARGETOS)
 endif
 
-ifndef USE_QT
-ifneq ($(TARGETOS),macosx)
-USE_QT := 1
-else
-USE_QT := 0
-endif
-endif
-PARAMS += --USE_QT=$(USE_QT)
-
 ifdef DONT_USE_NETWORK
 PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)'
 endif
@@ -314,6 +305,14 @@ ifdef USE_DISPATCH_GL
 PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
 endif
 
+ifdef NO_USE_MIDI
+PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
+endif
+
+ifdef USE_QTDEBUG
+PARAMS += --USE_QTDEBUG='$(USE_QTDEBUG)'
+endif
+
 ifdef MESA_INSTALL_ROOT
 PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
 endif
@@ -326,10 +325,6 @@ ifdef NO_USE_XINPUT
 PARAMS += --NO_USE_XINPUT='$(NO_USE_XINPUT)'
 endif
 
-ifdef NO_USE_MIDI
-PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
-endif
-
 ifdef SDL_LIBVER
 PARAMS += --SDL_LIBVER='$(SDL_LIBVER)'
 endif
@@ -710,7 +705,8 @@ GEN_FOLDERS :=  \
 
 LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/$(TARGET)/layout/*.lay)
 
-ifeq ($(USE_QT),0)
+# TODO: this will attempt to build on many platforms lacking Qt, e.g. emscripten and OS/2
+ifneq ($(TARGETOS),macosx)
 MOC_FILES=
 else
 MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 6c69cdc8b20..4cbce4a281d 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -182,20 +182,6 @@ newoption {
 	}
 } 
 
-newoption {
-	trigger = "USE_QT",
-	description = "Use of QT.",
-	allowed = {
-		{ "0",   "Disabled" 	},
-		{ "1",   "Enabled"      },
-	}
-}
-
-newoption {
-	trigger = "DONT_USE_NETWORK",
-	description = "Disable network access",
-}
-
 local os_version = str_to_version(_OPTIONS["os_version"])
 
 USE_BGFX = 1
@@ -206,11 +192,6 @@ if(_OPTIONS["USE_BGFX"]~=nil) then
 	USE_BGFX = tonumber(_OPTIONS["USE_BGFX"])
 end
 
-USE_QT = 1
-if(_OPTIONS["USE_QT"]~=nil) then
-	USE_QT = tonumber(_OPTIONS["USE_QT"])
-end
-
 GEN_DIR = MAME_BUILD_DIR .. "generated/"
 
 if (_OPTIONS["target"] == nil) then return false end
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
new file mode 100644
index 00000000000..588af418b8e
--- /dev/null
+++ b/scripts/src/osd/modules.lua
@@ -0,0 +1,251 @@
+function osdmodulesbuild()
+
+	removeflags {
+		"SingleOutputDir",
+	}
+
+	options {
+		"ForceCPP",
+	}
+
+	files {
+		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
+		MAME_DIR .. "src/osd/modules/debugger/none.c",
+		MAME_DIR .. "src/osd/modules/debugger/debugint.c",
+		MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
+		MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
+		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
+		MAME_DIR .. "src/osd/modules/font/font_windows.c",
+		MAME_DIR .. "src/osd/modules/font/font_osx.c",
+		MAME_DIR .. "src/osd/modules/font/font_none.c",
+		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
+		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
+		MAME_DIR .. "src/osd/modules/netdev/none.c",
+		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
+		MAME_DIR .. "src/osd/modules/midi/none.c",
+		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
+		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
+		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
+		MAME_DIR .. "src/osd/modules/sound/none.c",
+	}
+
+	if _OPTIONS["targetos"]=="windows" then
+		includedirs {
+			MAME_DIR .. "3rdparty/winpcap/Include",
+		}
+	end
+
+	if _OPTIONS["NO_OPENGL"]=="1" then
+		defines {
+			"USE_OPENGL=0",
+		}
+	else
+		files {
+			MAME_DIR .. "src/osd/modules/render/drawogl.c",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
+		}
+		defines {
+			"USE_OPENGL=1",
+		}
+		if _OPTIONS["USE_DISPATCH_GL"]=="1" then
+			defines {
+				"USE_DISPATCH_GL=1",
+			}
+		end
+	end
+
+	if USE_BGFX == 1 then
+		files {
+			MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
+		}
+		defines {
+			"USE_BGFX"
+		}
+		includedirs {
+			MAME_DIR .. "3rdparty/bgfx/include",
+			MAME_DIR .. "3rdparty/bx/include",
+		}
+	end
+
+	if _OPTIONS["NO_USE_MIDI"]=="1" then
+		defines {
+			"NO_USE_MIDI",
+		}
+	end
+
+	if _OPTIONS["USE_QTDEBUG"]=="1" then
+		files {
+			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.c",
+			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.c",
+			GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c",
+		}
+		defines {
+			"USE_QTDEBUG=1",
+		}
+		if _OPTIONS["targetos"]=="windows" then
+			configuration { "mingw*" }
+				buildoptions {
+					"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtCore",
+					"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtGui",
+					"-I$(shell qmake -query QT_INSTALL_HEADERS)",
+				}
+			configuration { }
+		elseif _OPTIONS["targetos"]=="macosx" then
+			-- TODO: search path for Qt on OSX platform
+		else
+			buildoptions {
+				string.gsub(os.outputof("pkg-config --cflags QtGui"), '[\r\n]+', ' '),
+			}
+		end
+	else
+		defines {
+			"USE_QTDEBUG=0",
+		}
+	end
+
+end
+
+
+function osdmodulestargetconf()
+
+	if _OPTIONS["NO_OPENGL"]~="1" then
+		if _OPTIONS["targetos"]=="macosx" then
+			links {
+				"OpenGL.framework",
+			}
+		elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then
+			if _OPTIONS["targetos"]=="windows" then
+				links {
+					"opengl32",
+				}
+			else
+				links {
+					"GL",
+				}
+			end
+		end
+	end
+
+	if _OPTIONS["NO_USE_MIDI"]~="1" then
+		if _OPTIONS["targetos"]=="linux" then
+			linkoptions {
+				string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
+			}
+		elseif _OPTIONS["targetos"]=="macosx" then
+			links {
+				"CoreAudio.framework",
+				"CoreMIDI.framework",
+			}
+		end
+	end
+
+	if _OPTIONS["USE_QTDEBUG"]=="1" then
+		if _OPTIONS["targetos"]=="windows" then
+			linkoptions {
+				"-L$(shell qmake -query QT_INSTALL_LIBS)",
+			}
+			links {
+				"qtmain",
+				"QtGui4",
+				"QtCore4",
+			}
+		elseif _OPTIONS["targetos"]=="macosx" then
+			-- TODO: Qt libs for OSX platform
+		else
+			linkoptions {
+				string.gsub(os.outputof("pkg-config --libs QtGui"), '[\r\n]+', ' '),
+			}
+		end
+	end
+
+end
+
+
+newoption {
+	trigger = "DONT_USE_NETWORK",
+	description = "Disable network access",
+}
+
+newoption {
+	trigger = "NO_OPENGL",
+	description = "Disable use of OpenGL",
+	allowed = {
+		{ "0",  "Enable OpenGL"  },
+		{ "1",  "Disable OpenGL" },
+	},
+}
+
+if not _OPTIONS["NO_OPENGL"] then
+	if _OPTIONS["targetos"]=="os2" then
+		_OPTIONS["NO_OPENGL"] = "1"
+	else
+		_OPTIONS["NO_OPENGL"] = "0"
+	end
+end
+
+newoption {
+	trigger = "USE_DISPATCH_GL",
+	description = "Use GL-dispatching",
+	allowed = {
+		{ "0",  "Link to OpenGL library"  },
+		{ "1",  "Use GL-dispatching"      },
+	},
+}
+
+if not _OPTIONS["USE_DISPATCH_GL"] then
+	if USE_BGFX == 1 then
+		_OPTIONS["USE_DISPATCH_GL"] = "0"
+	else
+		_OPTIONS["USE_DISPATCH_GL"] = "1"
+	end
+end
+
+newoption {
+	trigger = "NO_USE_MIDI",
+	description = "Disable MIDI I/O",
+	allowed = {
+		{ "0",  "Enable MIDI"  },
+		{ "1",  "Disable MIDI" },
+	},
+}
+
+if not _OPTIONS["NO_USE_MIDI"] then
+	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+		_OPTIONS["NO_USE_MIDI"] = "1"
+	else
+		_OPTIONS["NO_USE_MIDI"] = "0"
+	end
+end
+
+newoption {
+	trigger = "USE_QTDEBUG",
+	description = "Use QT debugger",
+	allowed = {
+		{ "0",  "Don't use Qt debugger"  },
+		{ "1",  "Use Qt debugger" },
+	},
+}
+
+if not _OPTIONS["USE_QTDEBUG"] then
+	if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+		_OPTIONS["USE_QTDEBUG"] = "0"
+	else
+		_OPTIONS["USE_QTDEBUG"] = "1"
+	end
+end
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 194558e38e2..c95272d5d93 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -1,4 +1,9 @@
+dofile("modules.lua")
+
+
 function maintargetosdoptions(_target)
+	osdmodulestargetconf()
+
 	if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
 		libdirs {
 			path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
@@ -32,22 +37,12 @@ function maintargetosdoptions(_target)
 				"SDL_ttf",
 			}
 		end
-		if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
-			links {
-				"GL"
-			}
-		end
 		linkoptions {
 			string.gsub(os.outputof("pkg-config --libs fontconfig"), '[\r\n]+', ' '),
 		}
 	end
 
 	if _OPTIONS["targetos"]=="windows" then
-		if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
-			links {
-				"opengl32"
-			}
-		end
 		configuration { "mingw*" }
 			linkoptions{
 				"-municode",
@@ -65,39 +60,6 @@ function maintargetosdoptions(_target)
 				"SDL2",
 			}
 		configuration {}
-
-		if (USE_QT == 1) then
-			linkoptions{
-				"-L$(shell qmake -query QT_INSTALL_LIBS)",
-			}
-			links {
-				"qtmain",
-				"QtGui4",
-				"QtCore4",
-			}
-		end
-	elseif _OPTIONS["targetos"]=="linux" then
-		if USE_QT == 1 then
-			linkoptions {
-				"$(shell pkg-config --libs QtGui)",
-			}
-			links {
-				"QtGui",
-				"QtCore",
-			}
-		end
-		if _OPTIONS["NO_USE_MIDI"]~="1" then
-			linkoptions {
-				string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
-			}
-		end
-	elseif _OPTIONS["targetos"]=="macosx" then
-		if _OPTIONS["NO_USE_MIDI"]~="1" then
-			links {
-				"CoreAudio.framework",
-				"CoreMIDI.framework",
-			}
-		end
 	elseif _OPTIONS["targetos"]=="haiku" then
 		links {
 			"network",
@@ -121,43 +83,9 @@ function sdlconfigcmd()
 end
 
 
-newoption {
-	trigger = "NO_OPENGL",
-	description = "Disable use of OpenGL",
-	allowed = {
-		{ "0",  "Enable OpenGL"  },
-		{ "1",  "Disable OpenGL" },
-	},
-}
-
-if not _OPTIONS["NO_OPENGL"] then
-	if _OPTIONS["targetos"]=="os2" then
-		_OPTIONS["NO_OPENGL"] = "1"
-	else
-		_OPTIONS["NO_OPENGL"] = "0"
-	end
-end
-
-newoption {
-	trigger = "USE_DISPATCH_GL",
-	description = "Use GL-dispatching (takes precedence over MESA_INSTALL_ROOT)",
-	allowed = {
-		{ "0",  "Link to OpenGL library"  },
-		{ "1",  "Use GL-dispatching"      },
-	},
-}
-
-if not _OPTIONS["USE_DISPATCH_GL"] then
-	if USE_BGFX == 1 then
-		_OPTIONS["USE_DISPATCH_GL"] = "0"
-	else
-		_OPTIONS["USE_DISPATCH_GL"] = "1"
-	end
-end
-
 newoption {
 	trigger = "MESA_INSTALL_ROOT",
-	description = "link against specific GL-Library - also adds rpath to executable",
+	description = "link against specific GL-Library - also adds rpath to executable (overridden by USE_DISPATCH_GL)",
 }
 
 newoption {
@@ -190,23 +118,6 @@ if not _OPTIONS["NO_USE_XINPUT"] then
 	_OPTIONS["NO_USE_XINPUT"] = "1"
 end
 
-newoption {
-	trigger = "NO_USE_MIDI",
-	description = "Disable MIDI I/O",
-	allowed = {
-		{ "0",  "Enable MIDI"  },
-		{ "1",  "Disable MIDI" },
-	},
-}
-
-if not _OPTIONS["NO_USE_MIDI"] then
-	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
-		_OPTIONS["NO_USE_MIDI"] = "1"
-	else
-		_OPTIONS["NO_USE_MIDI"] = "0"
-	end
-end
-
 newoption {
 	trigger = "SDL_LIBVER",
 	description = "Choose SDL version",
@@ -312,7 +223,6 @@ if BASE_TARGETOS=="unix" then
 	if _OPTIONS["targetos"]=="macosx" then
 		links {
 			"Cocoa.framework",
-			"OpenGL.framework",
 		}
 		if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
 			linkoptions {
@@ -374,16 +284,9 @@ project ("osd_" .. _OPTIONS["osd"])
 	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
 	kind "StaticLib"
 
-	removeflags {
-		"SingleOutputDir",
-	}
-	
-	options {
-		"ForceCPP",
-	}
-
 	dofile("sdl_cfg.lua")
-	
+	osdmodulesbuild()
+
 	includedirs {
 		MAME_DIR .. "src/emu",
 		MAME_DIR .. "src/osd",
@@ -391,9 +294,6 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/lib/util",
 		MAME_DIR .. "src/osd/modules/render",
 		MAME_DIR .. "3rdparty",
-		MAME_DIR .. "3rdparty/winpcap/Include",
-		MAME_DIR .. "3rdparty/bgfx/include",
-		MAME_DIR .. "3rdparty/bx/include",
 		MAME_DIR .. "src/osd/sdl",
 	}
 
@@ -439,69 +339,14 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/sdl/window.c",
 		MAME_DIR .. "src/osd/sdl/output.c",
 		MAME_DIR .. "src/osd/sdl/watchdog.c",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
 		MAME_DIR .. "src/osd/modules/render/drawsdl.c",
-		MAME_DIR .. "src/osd/modules/debugger/none.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugint.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
-		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
-		MAME_DIR .. "src/osd/modules/font/font_windows.c",
-		MAME_DIR .. "src/osd/modules/font/font_osx.c",
-		MAME_DIR .. "src/osd/modules/font/font_none.c",
-		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
-		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
-		MAME_DIR .. "src/osd/modules/netdev/none.c",
-		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
-		MAME_DIR .. "src/osd/modules/midi/none.c",
-		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/none.c",
 	}
-	if _OPTIONS["NO_OPENGL"]~="1" then
-		files {
-			MAME_DIR .. "src/osd/modules/render/drawogl.c",
-			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
-			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
-		}
-	end
 	if _OPTIONS["SDL_LIBVER"]=="sdl2" then
 		files {
 			MAME_DIR .. "src/osd/modules/render/draw13.c",
 		}
 	end
 
-	if USE_QT == 1 then
-		files {
-			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.c",
-
-			GEN_DIR  .. "osd/modules/debugger/qt/debuggerview.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/windowqt.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/logwindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/dasmwindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/mainwindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/memorywindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/breakpointswindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/deviceswindow.moc.c",
-			GEN_DIR  .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c",
-		}
-	end
-
-	if USE_BGFX == 1 then
-		files {
-			MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
-		}
-	end
-
 
 project ("ocore_" .. _OPTIONS["osd"])
 	uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 2c7cd075f08..2636438d3e5 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -8,23 +8,10 @@ if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then
 	}
 end
 
-if _OPTIONS["NO_OPENGL"]=="1" then
-	defines {
-		"USE_OPENGL=0",
+if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
+	includedirs {
+		path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
 	}
-else
-	defines {
-		"USE_OPENGL=1",
-	}
-	if _OPTIONS["USE_DISPATCH_GL"]=="1" then
-		defines {
-			"USE_DISPATCH_GL=1",
-		}
-	elseif _OPTIONS["MESA_INSTALL_ROOT"] then
-		includedirs {
-			path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
-		}
-	end
 end
 
 
@@ -54,11 +41,7 @@ else
 	}
 end
 
-if _OPTIONS["NO_USE_MIDI"]=="1" then
-	defines {
-		"NO_USE_MIDI",
-	}
-elseif _OPTIONS["targetos"]=="linux" then
+if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then
 	buildoptions {
 		string.gsub(os.outputof("pkg-config --cflags alsa"), '[\r\n]+', ' '),
 	}
@@ -79,12 +62,6 @@ else
 	}
 end
 
-if USE_BGFX == 1 then
-	defines {
-		"USE_BGFX"
-	}
-end
-
 defines {
 	"OSD_SDL",
 	"SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
@@ -124,16 +101,9 @@ if _OPTIONS["targetos"]=="windows" then
 	defines {
 		"UNICODE",
 		"_UNICODE",
-		"USE_QTDEBUG=" .. USE_QT,
 		"main=utf8_main",
 	}
-	configuration { "mingw*" }
-		buildoptions {
-			"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtCore",
-			"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtGui",
-			"-I$(shell qmake -query QT_INSTALL_HEADERS)",
-		}
-		
+
 	configuration { "vs*" }
 		includedirs {
 			path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")
@@ -141,9 +111,6 @@ if _OPTIONS["targetos"]=="windows" then
 	configuration { }
 
 elseif _OPTIONS["targetos"]=="linux" then
-	defines {
-		"USE_QTDEBUG=" .. USE_QT,
-	}
 	buildoptions {
 		'$(shell pkg-config --cflags QtGui)',
 	}
@@ -151,7 +118,6 @@ elseif _OPTIONS["targetos"]=="macosx" then
 	defines {
 		"SDLMAME_MACOSX",
 		"SDLMAME_DARWIN",
-		"USE_QTDEBUG=0",
 	}
 elseif _OPTIONS["targetos"]=="freebsd" then
 	buildoptions {
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 4df57e24d5c..7f02118b054 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -1,4 +1,9 @@
+dofile("modules.lua")
+
+
 function maintargetosdoptions(_target)
+	osdmodulestargetconf()
+
 	linkoptions {
 		"-municode",
 	}
@@ -21,15 +26,8 @@ project ("osd_" .. _OPTIONS["osd"])
 	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
 	kind "StaticLib"
 
-	removeflags {
-		"SingleOutputDir",
-	}
-
-	options {
-		"ForceCPP",
-	}
-
 	dofile("windows_cfg.lua")
+	osdmodulesbuild()
 
 	defines {
 		"DIRECTINPUT_VERSION=0x0800",
@@ -43,9 +41,6 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/lib/util",
 		MAME_DIR .. "src/osd/modules/render",
 		MAME_DIR .. "3rdparty",
-		MAME_DIR .. "3rdparty/winpcap/Include",
-		MAME_DIR .. "3rdparty/bgfx/include",
-		MAME_DIR .. "3rdparty/bx/include",
 	}
 
 	includedirs {
@@ -65,10 +60,6 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/windows/window.c",
 		MAME_DIR .. "src/osd/windows/winmenu.c",
 		MAME_DIR .. "src/osd/windows/winmain.c",
-		MAME_DIR .. "src/osd/modules/debugger/none.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugint.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
 		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.c",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.c",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.c",
@@ -82,31 +73,8 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.c",
 		MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.c",
 		MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.c",
-		MAME_DIR .. "src/osd/modules/render/drawogl.c",
-		MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
-		MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
-		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
-		MAME_DIR .. "src/osd/modules/font/font_windows.c",
-		MAME_DIR .. "src/osd/modules/font/font_osx.c",
-		MAME_DIR .. "src/osd/modules/font/font_none.c",
-		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
-		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
-		MAME_DIR .. "src/osd/modules/netdev/none.c",
-		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
-		MAME_DIR .. "src/osd/modules/midi/none.c",
-		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/none.c",
 	}
 
-	if USE_BGFX == 1 then
-		files {
-			MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
-		}
-	end
-
 
 project ("ocore_" .. _OPTIONS["osd"])
 	uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 824d616aac7..ddcb923b4c8 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -3,10 +3,6 @@ defines {
 	"_UNICODE",
 	"OSD_WINDOWS",
 	"USE_SDL=0",
-	"USE_QTDEBUG=0",
-	"USE_OPENGL=1",
-	"USE_DISPATCH_GL=1",
-	"DIRECTINPUT_VERSION=0x0800",
 	"main=utf8_main",
 	"_WIN32_WINNT=0x0501",
 }
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index 8527639a461..66cea9a964e 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -30,12 +30,6 @@
 	#define SDL13_COMBINE_RESIZE (0)
 #endif
 
-#if defined(NO_DEBUGGER)
-#define SDLMAME_HAS_DEBUGGER            (0)
-#else
-#define SDLMAME_HAS_DEBUGGER            (1)
-#endif
-
 //============================================================
 //  Defines
 //============================================================
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index 94dd9b5644e..e2cfc5898f4 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -397,7 +397,6 @@ static void defines_verbose(void)
 	MACRO_VERBOSE(LSB_FIRST);
 	MACRO_VERBOSE(PTR64);
 	MACRO_VERBOSE(MAME_DEBUG);
-	MACRO_VERBOSE(NO_DEBUGBER);
 	MACRO_VERBOSE(BIGENDIAN);
 	MACRO_VERBOSE(CPP_COMPILE);
 	MACRO_VERBOSE(SYNC_IMPLEMENTATION);
@@ -599,14 +598,6 @@ void sdl_osd_interface::init(running_machine &machine)
 
 	defines_verbose();
 
-	if (!SDLMAME_HAS_DEBUGGER)
-		if (machine.debug_flags & DEBUG_FLAG_OSD_ENABLED)
-		{
-			osd_printf_error("sdlmame: -debug not supported on X11-less builds\n\n");
-			osd_exit();
-			exit(-1);
-		}
-
 	osd_common_t::init_subsystems();
 
 	if (options().oslog())