diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a05e55ee4c6..fef235457fe 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -57,6 +57,7 @@ function osdmodulesbuild()
 		MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
 		MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/none.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
@@ -113,6 +114,9 @@ function osdmodulesbuild()
 		ext_includedir("uv"),
 	}
 
+	includedirs {
+		MAME_DIR .. "src/frontend/mame", -- for internal debugger
+	}
 	if _OPTIONS["targetos"]=="windows" then
 		includedirs {
 			MAME_DIR .. "3rdparty/winpcap/Include",
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index 03f7998e460..6ac60b81b41 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -9,7 +9,7 @@
 *********************************************************************/
 
 #include "emu.h"
-#include "ui/uimain.h"
+#include "ui/ui.h"
 #include "ui/menu.h"
 #include "rendfont.h"
 #include "uiinput.h"
@@ -370,7 +370,7 @@ static void dview_draw_outlined_box(DView *dv, int rtype, int x, int y, int w, i
 	rectangle r;
 
 	dview_get_rect(dv, rtype, r);
-	dv->container->manager().machine().ui().draw_outlined_box(dv->container, NX(dv, x + r.min_x), NY(dv, y + r.min_y),
+	mame_machine_manager::instance()->ui().draw_outlined_box(dv->container, NX(dv, x + r.min_x), NY(dv, y + r.min_y),
 			NX(dv, x + r.min_x + w), NY(dv, y + r.min_y + h), bg);
 }
 
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 68af56245bf..099c5fefb77 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -217,7 +217,7 @@ void osd_common_t::register_options()
 #ifndef OSD_MINI
 	REGISTER_MODULE(m_mod_man, DEBUG_WINDOWS);
 	REGISTER_MODULE(m_mod_man, DEBUG_QT);
-//	REGISTER_MODULE(m_mod_man, DEBUG_INTERNAL);
+	REGISTER_MODULE(m_mod_man, DEBUG_INTERNAL);
 	REGISTER_MODULE(m_mod_man, DEBUG_IMGUI);
 	REGISTER_MODULE(m_mod_man, DEBUG_NONE);
 #endif