summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-02-11 18:23:11 +0100
committer Olivier Galibert <galibert@pobox.com>2017-02-11 18:31:20 +0100
commita2557f1b02478c5aaa1fdfa00204ac2e219319a1 (patch)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/osd
parentc49b631153be9efc3a7e7b6172c17f5418843c0b (diff)
Remove emu.h from headers (nw)
Per Vas' request. If the compile fails for you (i'm thinking osx and windows native debuggers here in particular), add '#include "emu.h"' as first include of the cpp files that fail. Due to our use of precompilation and forced inclusion, emu.h must be included as the very first non-comment thing we do if we want to be sure msvc compiles are identical to gcc/clang ones. Doing it directly instead of through an include increases the correctness probability by a magnitude.
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/debugger/debug_module.h1
-rw-r--r--src/osd/modules/debugger/none.cpp1
-rw-r--r--src/osd/modules/debugger/osx/breakpointsview.h1
-rw-r--r--src/osd/modules/debugger/osx/consoleview.h1
-rw-r--r--src/osd/modules/debugger/osx/debugconsole.h1
-rw-r--r--src/osd/modules/debugger/osx/debugview.h1
-rw-r--r--src/osd/modules/debugger/osx/debugwindowhandler.h1
-rw-r--r--src/osd/modules/debugger/osx/deviceinfoviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/devicesviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/disassemblyview.h1
-rw-r--r--src/osd/modules/debugger/osx/disassemblyviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/errorlogview.h1
-rw-r--r--src/osd/modules/debugger/osx/errorlogviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/memoryview.h1
-rw-r--r--src/osd/modules/debugger/osx/memoryviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/pointsviewer.h1
-rw-r--r--src/osd/modules/debugger/osx/registersview.h1
-rw-r--r--src/osd/modules/debugger/osx/watchpointsview.h1
-rw-r--r--src/osd/modules/debugger/qt/breakpointswindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/dasmwindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/debuggerview.cpp1
-rw-r--r--src/osd/modules/debugger/qt/deviceinformationwindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/deviceswindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/logwindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/mainwindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/memorywindow.cpp1
-rw-r--r--src/osd/modules/debugger/qt/windowqt.cpp1
-rw-r--r--src/osd/modules/debugger/qt/windowqt.h1
-rw-r--r--src/osd/modules/debugger/win/debugbaseinfo.h1
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.h1
-rw-r--r--src/osd/modules/debugger/win/debugwin.h1
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.h1
-rw-r--r--src/osd/modules/debugger/win/uimetrics.h1
-rw-r--r--src/osd/modules/monitor/monitor_common.cpp1
-rw-r--r--src/osd/modules/monitor/monitor_sdl.cpp1
-rw-r--r--src/osd/modules/osdwindow.cpp1
-rw-r--r--src/osd/modules/osdwindow.h1
-rw-r--r--src/osd/modules/render/aviwrite.cpp1
-rw-r--r--src/osd/modules/render/aviwrite.h1
-rw-r--r--src/osd/modules/render/bgfx/inputpair.cpp1
-rw-r--r--src/osd/modules/render/bgfx/slider.h1
-rw-r--r--src/osd/modules/render/bgfx/slideruniform.cpp1
-rw-r--r--src/osd/modules/render/bgfx/slideruniformreader.cpp1
-rw-r--r--src/osd/modules/render/bgfx/suppressor.cpp1
-rw-r--r--src/osd/modules/render/bgfx/suppressorreader.cpp1
-rw-r--r--src/osd/modules/render/binpacker.cpp1
-rw-r--r--src/osd/modules/render/binpacker.h1
-rw-r--r--src/osd/modules/render/copyutil.h1
-rw-r--r--src/osd/modules/render/drawgdi.h1
-rw-r--r--src/osd/osdnet.h1
50 files changed, 20 insertions, 30 deletions
diff --git a/src/osd/modules/debugger/debug_module.h b/src/osd/modules/debugger/debug_module.h
index 6fbbfe0d605..fb659a1b312 100644
--- a/src/osd/modules/debugger/debug_module.h
+++ b/src/osd/modules/debugger/debug_module.h
@@ -10,7 +10,6 @@
#include "osdepend.h"
#include "modules/osdmodule.h"
-#include "emu.h"
//============================================================
// CONSTANTS
diff --git a/src/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp
index 70252a4057c..3ce8d6572bc 100644
--- a/src/osd/modules/debugger/none.cpp
+++ b/src/osd/modules/debugger/none.cpp
@@ -6,6 +6,7 @@
//
//============================================================
+#include "emu.h"
#include "debug_module.h"
#include "modules/osdmodule.h"
diff --git a/src/osd/modules/debugger/osx/breakpointsview.h b/src/osd/modules/debugger/osx/breakpointsview.h
index 6e6bc9c8d1c..07e4e09e228 100644
--- a/src/osd/modules/debugger/osx/breakpointsview.h
+++ b/src/osd/modules/debugger/osx/breakpointsview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/consoleview.h b/src/osd/modules/debugger/osx/consoleview.h
index 2a6fff78a8c..4c801bee362 100644
--- a/src/osd/modules/debugger/osx/consoleview.h
+++ b/src/osd/modules/debugger/osx/consoleview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/debugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h
index f73945e7b2f..f8e52c9c76b 100644
--- a/src/osd/modules/debugger/osx/debugconsole.h
+++ b/src/osd/modules/debugger/osx/debugconsole.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/debugview.h b/src/osd/modules/debugger/osx/debugview.h
index c658486b287..f3a8880c3a6 100644
--- a/src/osd/modules/debugger/osx/debugview.h
+++ b/src/osd/modules/debugger/osx/debugview.h
@@ -8,7 +8,6 @@
#import "debugosx.h"
-#include "emu.h"
#include "debug/debugvw.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h
index 0fc40d9eb64..e36721b2738 100644
--- a/src/osd/modules/debugger/osx/debugwindowhandler.h
+++ b/src/osd/modules/debugger/osx/debugwindowhandler.h
@@ -8,7 +8,6 @@
#import "debugosx.h"
-#include "emu.h"
#include "debug/debugcpu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.h b/src/osd/modules/debugger/osx/deviceinfoviewer.h
index 5bf7838aa33..d5755b9ebcc 100644
--- a/src/osd/modules/debugger/osx/deviceinfoviewer.h
+++ b/src/osd/modules/debugger/osx/deviceinfoviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/devicesviewer.h b/src/osd/modules/debugger/osx/devicesviewer.h
index 98b9130c564..e56aa813cba 100644
--- a/src/osd/modules/debugger/osx/devicesviewer.h
+++ b/src/osd/modules/debugger/osx/devicesviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/disassemblyview.h b/src/osd/modules/debugger/osx/disassemblyview.h
index 04d1870b498..e841c39b182 100644
--- a/src/osd/modules/debugger/osx/disassemblyview.h
+++ b/src/osd/modules/debugger/osx/disassemblyview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#include "debug/dvdisasm.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h
index e698fb897d8..6e7ea1c6dda 100644
--- a/src/osd/modules/debugger/osx/disassemblyviewer.h
+++ b/src/osd/modules/debugger/osx/disassemblyviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/errorlogview.h b/src/osd/modules/debugger/osx/errorlogview.h
index 4830ac17a60..0dfb4cdf02b 100644
--- a/src/osd/modules/debugger/osx/errorlogview.h
+++ b/src/osd/modules/debugger/osx/errorlogview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h
index 5174f5b119b..47f7ad80dd2 100644
--- a/src/osd/modules/debugger/osx/errorlogviewer.h
+++ b/src/osd/modules/debugger/osx/errorlogviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/memoryview.h b/src/osd/modules/debugger/osx/memoryview.h
index e8a7a138f4d..0e04d3e09c9 100644
--- a/src/osd/modules/debugger/osx/memoryview.h
+++ b/src/osd/modules/debugger/osx/memoryview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#include "debug/dvmemory.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/memoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h
index 04c25e84c91..015560fca1c 100644
--- a/src/osd/modules/debugger/osx/memoryviewer.h
+++ b/src/osd/modules/debugger/osx/memoryviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/pointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h
index a5e2384e6a1..b5a6d750361 100644
--- a/src/osd/modules/debugger/osx/pointsviewer.h
+++ b/src/osd/modules/debugger/osx/pointsviewer.h
@@ -10,7 +10,6 @@
#import "debugwindowhandler.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/registersview.h b/src/osd/modules/debugger/osx/registersview.h
index eaf13c61ff9..7dcdbde7f4d 100644
--- a/src/osd/modules/debugger/osx/registersview.h
+++ b/src/osd/modules/debugger/osx/registersview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/osx/watchpointsview.h b/src/osd/modules/debugger/osx/watchpointsview.h
index c03d71e992e..6941784a346 100644
--- a/src/osd/modules/debugger/osx/watchpointsview.h
+++ b/src/osd/modules/debugger/osx/watchpointsview.h
@@ -10,7 +10,6 @@
#import "debugview.h"
-#include "emu.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp
index 029cf2d0b72..5d091694d66 100644
--- a/src/osd/modules/debugger/qt/breakpointswindow.cpp
+++ b/src/osd/modules/debugger/qt/breakpointswindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QActionGroup>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QMenu>
diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp
index fd98a6483be..396f97c78bf 100644
--- a/src/osd/modules/debugger/qt/dasmwindow.cpp
+++ b/src/osd/modules/debugger/qt/dasmwindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QAction>
diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp
index 3b5c9d88cb3..71a736f6bb7 100644
--- a/src/osd/modules/debugger/qt/debuggerview.cpp
+++ b/src/osd/modules/debugger/qt/debuggerview.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QScrollBar>
#include <QtWidgets/QApplication>
#include <QtGui/QPainter>
diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
index 30daaaec9ea..14ea8b04296 100644
--- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QFrame>
#include <QtWidgets/QLabel>
#include <QtWidgets/QVBoxLayout>
diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp
index 599022f40f9..6313e9bf98e 100644
--- a/src/osd/modules/debugger/qt/deviceswindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceswindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "deviceswindow.h"
#include "deviceinformationwindow.h"
diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp
index ecb8bf66e14..d0478a24e40 100644
--- a/src/osd/modules/debugger/qt/logwindow.cpp
+++ b/src/osd/modules/debugger/qt/logwindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QVBoxLayout>
#include "logwindow.h"
diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp
index 68a8fa0c644..fffe3577e9e 100644
--- a/src/osd/modules/debugger/qt/mainwindow.cpp
+++ b/src/osd/modules/debugger/qt/mainwindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QAction>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMenuBar>
diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp
index 9875cc3dca8..19e3dee6785 100644
--- a/src/osd/modules/debugger/qt/memorywindow.cpp
+++ b/src/osd/modules/debugger/qt/memorywindow.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtGui/QClipboard>
#include <QtGui/QMouseEvent>
#include <QtWidgets/QActionGroup>
diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp
index c908ac583c7..dda9ee64dc7 100644
--- a/src/osd/modules/debugger/qt/windowqt.cpp
+++ b/src/osd/modules/debugger/qt/windowqt.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <QtWidgets/QMenu>
#include <QtWidgets/QMenuBar>
diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h
index 28b3039c28f..29debc70bc6 100644
--- a/src/osd/modules/debugger/qt/windowqt.h
+++ b/src/osd/modules/debugger/qt/windowqt.h
@@ -5,7 +5,6 @@
#include <QtWidgets/QMainWindow>
-#include "emu.h"
#include "config.h"
#include "debugger.h"
diff --git a/src/osd/modules/debugger/win/debugbaseinfo.h b/src/osd/modules/debugger/win/debugbaseinfo.h
index 749e432a6bc..03fd5a8018d 100644
--- a/src/osd/modules/debugger/win/debugbaseinfo.h
+++ b/src/osd/modules/debugger/win/debugbaseinfo.h
@@ -11,7 +11,6 @@
#include "debugwin.h"
-#include "emu.h"
class debugbase_info
diff --git a/src/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h
index d56e2cd9ab0..37d6930e445 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.h
+++ b/src/osd/modules/debugger/win/debugviewinfo.h
@@ -13,7 +13,6 @@
#include "debugbaseinfo.h"
-#include "emu.h"
#include "debug/debugvw.h"
diff --git a/src/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h
index 8f4a1c3f6c0..9cb97f19a27 100644
--- a/src/osd/modules/debugger/win/debugwin.h
+++ b/src/osd/modules/debugger/win/debugwin.h
@@ -20,7 +20,6 @@
#undef min
#undef max
-#include "emu.h"
class debugview_info;
diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h
index 7e99c69320c..c967329447b 100644
--- a/src/osd/modules/debugger/win/debugwininfo.h
+++ b/src/osd/modules/debugger/win/debugwininfo.h
@@ -13,7 +13,6 @@
#include "debugbaseinfo.h"
-#include "emu.h"
class debugwin_info : protected debugbase_info
diff --git a/src/osd/modules/debugger/win/uimetrics.h b/src/osd/modules/debugger/win/uimetrics.h
index 337e10aa193..a360d66924e 100644
--- a/src/osd/modules/debugger/win/uimetrics.h
+++ b/src/osd/modules/debugger/win/uimetrics.h
@@ -11,7 +11,6 @@
#include "debugwin.h"
-#include "emu.h"
#include "modules/lib/osdobj_common.h"
diff --git a/src/osd/modules/monitor/monitor_common.cpp b/src/osd/modules/monitor/monitor_common.cpp
index 7e4571e01a8..8f935db7da2 100644
--- a/src/osd/modules/monitor/monitor_common.cpp
+++ b/src/osd/modules/monitor/monitor_common.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include <algorithm>
#include "monitor_common.h"
diff --git a/src/osd/modules/monitor/monitor_sdl.cpp b/src/osd/modules/monitor/monitor_sdl.cpp
index eb2a1bc2713..b32ade230e1 100644
--- a/src/osd/modules/monitor/monitor_sdl.cpp
+++ b/src/osd/modules/monitor/monitor_sdl.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "modules/osdmodule.h"
#include "monitor_module.h"
diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
index 808318b58b8..64b6528f5f3 100644
--- a/src/osd/modules/osdwindow.cpp
+++ b/src/osd/modules/osdwindow.cpp
@@ -6,6 +6,7 @@
//
//============================================================
+#include "emu.h"
#include "osdwindow.h"
#include "render/drawnone.h"
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 6e80c8c2a6b..506b4978161 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -9,7 +9,6 @@
#ifndef __OSDWINDOW__
#define __OSDWINDOW__
-#include "emu.h"
#include "render.h"
#include "osdhelper.h"
#include "../frontend/mame/ui/menuitem.h"
diff --git a/src/osd/modules/render/aviwrite.cpp b/src/osd/modules/render/aviwrite.cpp
index 013a81bbb9f..291f42f9656 100644
--- a/src/osd/modules/render/aviwrite.cpp
+++ b/src/osd/modules/render/aviwrite.cpp
@@ -6,6 +6,7 @@
//
//============================================================
+#include "emu.h"
#include "aviwrite.h"
#include "modules/lib/osdobj_common.h"
diff --git a/src/osd/modules/render/aviwrite.h b/src/osd/modules/render/aviwrite.h
index 9030dfae176..e59ce275168 100644
--- a/src/osd/modules/render/aviwrite.h
+++ b/src/osd/modules/render/aviwrite.h
@@ -11,7 +11,6 @@
#ifndef __RENDER_AVIWRITE__
#define __RENDER_AVIWRITE__
-#include "emu.h"
#include "aviio.h"
class running_machine;
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index a64341c6111..19d0136e72e 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -9,6 +9,7 @@
//
//============================================================
+#include "emu.h"
#include "../frontend/mame/ui/slider.h"
#include "emucore.h"
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index 6ee7d12c80c..74f19c7e4bc 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/src/osd/modules/render/bgfx/slider.h
@@ -16,7 +16,6 @@
#include <string>
#include <vector>
-#include "emu.h"
#include "../frontend/mame/ui/slider.h"
class bgfx_slider : public slider_changed_notifier
diff --git a/src/osd/modules/render/bgfx/slideruniform.cpp b/src/osd/modules/render/bgfx/slideruniform.cpp
index 7a63b1e6901..6770c7e10ac 100644
--- a/src/osd/modules/render/bgfx/slideruniform.cpp
+++ b/src/osd/modules/render/bgfx/slideruniform.cpp
@@ -9,6 +9,7 @@
//
//============================================================
+#include "emu.h"
#include "slideruniform.h"
#include "slider.h"
diff --git a/src/osd/modules/render/bgfx/slideruniformreader.cpp b/src/osd/modules/render/bgfx/slideruniformreader.cpp
index 314cff0b78b..eb359a01b2c 100644
--- a/src/osd/modules/render/bgfx/slideruniformreader.cpp
+++ b/src/osd/modules/render/bgfx/slideruniformreader.cpp
@@ -6,6 +6,7 @@
//
//==================================================================
+#include "emu.h"
#include "slideruniformreader.h"
#include <vector>
diff --git a/src/osd/modules/render/bgfx/suppressor.cpp b/src/osd/modules/render/bgfx/suppressor.cpp
index 6e788280631..fa592255735 100644
--- a/src/osd/modules/render/bgfx/suppressor.cpp
+++ b/src/osd/modules/render/bgfx/suppressor.cpp
@@ -7,6 +7,7 @@
//
//============================================================
+#include "emu.h"
#include "suppressor.h"
#include "slider.h"
diff --git a/src/osd/modules/render/bgfx/suppressorreader.cpp b/src/osd/modules/render/bgfx/suppressorreader.cpp
index 5cfc9b2b4ce..77a109a264b 100644
--- a/src/osd/modules/render/bgfx/suppressorreader.cpp
+++ b/src/osd/modules/render/bgfx/suppressorreader.cpp
@@ -6,6 +6,7 @@
//
//============================================================
+#include "emu.h"
#include <string>
#include "suppressorreader.h"
diff --git a/src/osd/modules/render/binpacker.cpp b/src/osd/modules/render/binpacker.cpp
index fcd126f5c14..aa80f600e2a 100644
--- a/src/osd/modules/render/binpacker.cpp
+++ b/src/osd/modules/render/binpacker.cpp
@@ -6,6 +6,7 @@
//
//============================================================
+#include "emu.h"
#include "binpacker.h"
#include <algorithm>
diff --git a/src/osd/modules/render/binpacker.h b/src/osd/modules/render/binpacker.h
index 175a3d3c798..55bd03116e5 100644
--- a/src/osd/modules/render/binpacker.h
+++ b/src/osd/modules/render/binpacker.h
@@ -5,7 +5,6 @@
#ifndef __RECTPACKER_H__
#define __RECTPACKER_H__
-#include "emu.h"
#include <vector>
diff --git a/src/osd/modules/render/copyutil.h b/src/osd/modules/render/copyutil.h
index 2324c521d42..81a880555cd 100644
--- a/src/osd/modules/render/copyutil.h
+++ b/src/osd/modules/render/copyutil.h
@@ -11,7 +11,6 @@
#ifndef __RENDER_COPYUTIL__
#define __RENDER_COPYUTIL__
-#include "emu.h"
class copy_util
{
diff --git a/src/osd/modules/render/drawgdi.h b/src/osd/modules/render/drawgdi.h
index 7d0c2201079..9b9f7aac049 100644
--- a/src/osd/modules/render/drawgdi.h
+++ b/src/osd/modules/render/drawgdi.h
@@ -15,7 +15,6 @@
#include <windows.h>
// MAME headers
-#include "emu.h"
// MAMEOS headers
#include "window.h"
diff --git a/src/osd/osdnet.h b/src/osd/osdnet.h
index 9725d76536c..b154d21ef9b 100644
--- a/src/osd/osdnet.h
+++ b/src/osd/osdnet.h
@@ -3,7 +3,6 @@
#ifndef __OSDNET_H__
#define __OSDNET_H__
-#include "emu.h"
class osd_netdev;