Revert "Fix SDL compile on linux. Took the opportunity to remove a number of"

Partial revert only, some changes still in
This reverts commit 632b10cd0e.

src/osd/modules/render/bgfx/chainentry.cpp

@@ -9,14 +9,13 @@
 //
 //============================================================
 
+#include "emu.h"
 
 #include <bgfx/bgfx.h>
 #include <bx/fpumath.h>
 
 #include "chainentry.h"
 
-#include "emu.h"
-#include "render.h"
 #include "effect.h"
 #include "texture.h"
 #include "target.h"

src/osd/modules/render/bgfx/chainentryreader.cpp

@@ -8,6 +8,8 @@
 
 #include <string>
 
+#include "emu.h"
+#include "rendutil.h"
 #include <modules/render/copyutil.h>
 
 #include <modules/lib/osdobj_common.h>

src/osd/modules/render/bgfx/chainmanager.cpp

@@ -9,11 +9,12 @@
 //
 //============================================================
 
+#include "emu.h"
+#include "window.h"
+
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 
-#include "window.h"
-
 #include <bx/readerwriter.h>
 #include <bx/crtimpl.h>
 
@@ -283,4 +284,4 @@ slider_state* chain_manager::get_slider_list()
         (*tailptr)->next = nullptr;
     }
     return listhead;
-}
+}

src/osd/modules/render/bgfx/chainreader.cpp

@@ -10,6 +10,7 @@
 #include <vector>
 #include <map>
 
+#include "emu.h"
 #include <modules/lib/osdobj_common.h>
 
 #include "chainreader.h"

src/osd/modules/render/bgfx/effectmanager.cpp

@@ -9,18 +9,13 @@
 //
 //============================================================
 
+#include "emu.h"
+
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 
 #include <bgfx/bgfxplatform.h>
 #include <bgfx/bgfx.h>
-
-/* FIXME: Including emu.h here will include src/emu/memory.h.
- * bx/readerwriter.h includes allocator.h which includes a memory.h as well.
- * This memory.h is part of bgfx. However, src/emu/memory.h will be included.
- */
-#include "emu.h"
-
 #include <bx/readerwriter.h>
 #include <bx/crtimpl.h>
 

src/osd/modules/render/bgfx/effectreader.cpp

@@ -10,6 +10,8 @@
 
 #include <bgfx/bgfx.h>
 
+#include "emu.h"
+
 #include "effect.h"
 #include "blendreader.h"
 #include "depthreader.h"

src/osd/modules/render/bgfx/shadermanager.cpp

@@ -9,17 +9,11 @@
 //
 //============================================================
 
+#include "emu.h"
 
 #include <bgfx/bgfxplatform.h>
 #include <bgfx/bgfx.h>
 #include <bx/fpumath.h>
-
-/* FIXME: Including emu.h here will include src/emu/memory.h.
- * bx/readerwriter.h includes allocator.h which includes a memory.h as well.
- * This memory.h is part of bgfx. However, src/emu/memory.h will be included.
- */
-#include "emu.h"
-
 #include <bx/readerwriter.h>
 #include <bx/crtimpl.h>
 

src/osd/modules/render/bgfx/slider.cpp

@@ -6,6 +6,8 @@
 //
 //============================================================
 
+#include "emu.h"
+
 #include "slider.h"
 #include "ui/ui.h"
 

src/osd/modules/render/bgfx/sliderreader.cpp

@@ -8,6 +8,7 @@
 
 #include "sliderreader.h"
 
+#include "emu.h"
 #include "slider.h"
 
 const slider_reader::string_to_enum slider_reader::TYPE_NAMES[slider_reader::TYPE_COUNT] = {

src/osd/modules/render/bgfx/statereader.h

@@ -12,11 +12,11 @@
 #ifndef __DRAWBGFX_STATE_READER__
 #define __DRAWBGFX_STATE_READER__
 
+#include "emu.h"
+
 #include <string>
 #include "rapidjson/document.h"
 
-#include "osdcore.h"
-
 using namespace rapidjson;
 
 class state_reader

src/osd/modules/render/bgfx/targetreader.cpp

@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "emu.h"
 #include <modules/lib/osdobj_common.h>
 
 #include "targetreader.h"