diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
index 2894092ac30..cde83c3fe7f 100644
--- a/src/osd/modules/osdwindow.cpp
+++ b/src/osd/modules/osdwindow.cpp
@@ -6,14 +6,6 @@
 //
 //============================================================
 
-// standard windows headers
-#ifdef OSD_WINDOWS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h>
-#include <mmsystem.h>
-#endif
-
 #include "osdwindow.h"
 
 #include "render/drawnone.h"
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 3354afe94bb..3543273e031 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -13,6 +13,14 @@
 #include "ui/ui.h"
 #include "osdhelper.h"
 
+// standard windows headers
+#ifdef OSD_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <windowsx.h>
+#include <mmsystem.h>
+#endif
+
 #ifdef OSD_SDL
 // forward declaration
 struct SDL_Window;
@@ -132,11 +140,11 @@ public:
 
 	virtual osd_dim get_size() = 0;
 
-#ifdef OSD_SDL
 	virtual osd_monitor_info *monitor() const = 0;
+
+#ifdef OSD_SDL
 	virtual SDL_Window *sdl_window() = 0;
 #else
-	virtual osd_monitor_info *monitor() const = 0;
 	virtual bool win_has_menu() = 0;
 	// FIXME: cann we replace winwindow_video_window_monitor(NULL) with monitor() ?
 	virtual osd_monitor_info *winwindow_video_window_monitor(const osd_rect *proposed) = 0;
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index f356dc5545b..ad12d0c6758 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -8,18 +8,6 @@
 //  by chain.h and read by chainreader.h
 //
 //============================================================
-// TODO: RH 10 Apr. 2016 12:43 - hire assassin to deal with team member who made this #include chicanery necessary
-#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
-// standard windows headers
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#if defined(SDLMAME_WIN32)
-#include <SDL2/SDL_syswm.h>
-#endif
-//#else
-//#include "sdlinc.h"
-//#endif
-#endif
 
 #include "emu.h"
 #include "osdcore.h"