summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/lib/osdobj_common.h3
-rw-r--r--src/osd/modules/osdwindow.h2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.h1
-rw-r--r--src/osd/modules/render/bgfx/inputpair.cpp2
-rw-r--r--src/osd/modules/render/bgfx/inputpair.h2
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.h2
-rw-r--r--src/osd/modules/render/bgfx/slider.h2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.h3
-rw-r--r--src/osd/modules/render/drawbgfx.h1
-rw-r--r--src/osd/osdepend.h2
-rw-r--r--src/osd/windows/window.cpp1
13 files changed, 13 insertions, 12 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 5c26b55a6d5..d9083815fa0 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -24,8 +24,7 @@
#include "modules/midi/midi_module.h"
#include "modules/output/output_module.h"
#include "emuopts.h"
-
-class ui_menu_item;
+#include "../frontend/mame/ui/menuitem.h"
//============================================================
// Defines
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index a2ab9228454..cd602b089f4 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -10,9 +10,9 @@
#define __OSDWINDOW__
#include "emu.h"
-#include "ui/uimain.h"
#include "render.h"
#include "osdhelper.h"
+#include "../frontend/mame/ui/menuitem.h"
// standard windows headers
#ifdef OSD_WINDOWS
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 8614149b7eb..6a7875547e4 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -10,7 +10,7 @@
//============================================================
#include "emu.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
#include "osdcore.h"
#include "modules/osdwindow.h"
diff --git a/src/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h
index 979c487a237..997be246073 100644
--- a/src/osd/modules/render/bgfx/chainmanager.h
+++ b/src/osd/modules/render/bgfx/chainmanager.h
@@ -21,6 +21,7 @@
#include "texturemanager.h"
#include "targetmanager.h"
#include "effectmanager.h"
+#include "../frontend/mame/ui/menuitem.h"
class running_machine;
class osd_window;
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index 4de54404a6b..e19789b89ba 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -9,7 +9,7 @@
//
//============================================================
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
#include "emucore.h"
diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h
index 550595a1c55..1f5c4f59dfc 100644
--- a/src/osd/modules/render/bgfx/inputpair.h
+++ b/src/osd/modules/render/bgfx/inputpair.h
@@ -16,7 +16,7 @@
#include <string>
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/menuitem.h"
class bgfx_effect;
class chain_manager;
diff --git a/src/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h
index 2beca465918..bee48dcea81 100644
--- a/src/osd/modules/render/bgfx/shadermanager.h
+++ b/src/osd/modules/render/bgfx/shadermanager.h
@@ -16,7 +16,7 @@
#include <bgfx/bgfx.h>
-#include <modules/lib/osdobj_common.h>
+#include "modules/lib/osdobj_common.h"
#include <map>
#include <string>
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index 059b895ad8f..fca9d43f6a8 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/src/osd/modules/render/bgfx/slider.h
@@ -17,7 +17,7 @@
#include <vector>
#include "emu.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
class bgfx_slider
{
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 72c172b898d..a075f2748a2 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -18,7 +18,6 @@
#include "emu.h"
#include "drivenum.h"
#include "render.h"
-#include "ui/uimain.h"
#include "rendutil.h"
#include "emuopts.h"
#include "aviio.h"
@@ -32,6 +31,7 @@
#include "d3dcomm.h"
#include "strconv.h"
#include "d3dhlsl.h"
+#include "../frontend/mame/ui/slider.h"
//============================================================
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index c7813122308..57b34693d47 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -11,6 +11,7 @@
#include <vector>
#include "aviio.h"
+#include "../frontend/mame/ui/menuitem.h"
//============================================================
// CONSTANTS
@@ -21,8 +22,6 @@
// TYPE DEFINITIONS
//============================================================
-struct slider_state;
-
class effect;
class shaders;
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index 5e500fedb1e..76169834760 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -15,6 +15,7 @@
#include "bgfx/chain.h"
#include "bgfx/chainmanager.h"
#include "sliderdirtynotifier.h"
+#include "../frontend/mame/ui/menuitem.h"
class texture_manager;
class target_manager;
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index b6235f7570c..977053ded89 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -16,7 +16,7 @@
#include "emucore.h"
#include "osdcore.h"
#include "unicode.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/menuitem.h"
#include <memory>
#include <string>
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 52dfc2434d9..0edca7c79a6 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -22,6 +22,7 @@
// MAME headers
#include "emu.h"
#include "uiinput.h"
+#include "ui/uimain.h"
// MAMEOS headers
#include "winmain.h"