summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-12-14 12:37:37 -0500
committer Brad Hughes <bradhugh@outlook.com>2016-12-28 15:07:28 -0500
commitb47ec24df6e2fd64ff4757dc5661fb9249dce617 (patch)
treec7b5d82b88c2954de4961d5f951335dede6cf96c /src/osd
parente252486d1726386c1bd2590edc0f8819fa7b1e8d (diff)
Move special windows.h include directives to build defines (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/debugger/win/debugwin.h1
-rw-r--r--src/osd/modules/diagnostics/diagnostics_win32.cpp3
-rw-r--r--src/osd/modules/file/windir.cpp1
-rw-r--r--src/osd/modules/file/winfile.cpp1
-rw-r--r--src/osd/modules/file/winptty.cpp1
-rw-r--r--src/osd/modules/file/winrtdir.cpp1
-rw-r--r--src/osd/modules/file/winrtfile.cpp1
-rw-r--r--src/osd/modules/file/winrtptty.cpp1
-rw-r--r--src/osd/modules/file/winrtsocket.cpp1
-rw-r--r--src/osd/modules/file/winsocket.cpp1
-rw-r--r--src/osd/modules/font/font_dwrite.cpp1
-rw-r--r--src/osd/modules/font/font_windows.cpp1
-rw-r--r--src/osd/modules/input/input_common.h2
-rw-r--r--src/osd/modules/input/input_dinput.cpp3
-rw-r--r--src/osd/modules/input/input_rawinput.cpp3
-rw-r--r--src/osd/modules/input/input_uwp.cpp2
-rw-r--r--src/osd/modules/input/input_win32.cpp3
-rw-r--r--src/osd/modules/input/input_windows.h1
-rw-r--r--src/osd/modules/input/input_winhybrid.cpp5
-rw-r--r--src/osd/modules/input/input_xinput.cpp3
-rw-r--r--src/osd/modules/lib/osdlib_uwp.cpp1
-rw-r--r--src/osd/modules/lib/osdlib_win32.cpp1
-rw-r--r--src/osd/modules/monitor/monitor_dxgi.cpp3
-rw-r--r--src/osd/modules/monitor/monitor_win32.cpp3
-rw-r--r--src/osd/modules/netdev/pcap.cpp1
-rw-r--r--src/osd/modules/osdwindow.h3
-rw-r--r--src/osd/modules/output/win32_output.cpp1
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp2
-rw-r--r--src/osd/modules/render/drawbgfx.cpp1
-rw-r--r--src/osd/modules/render/drawd3d.h1
-rw-r--r--src/osd/modules/render/drawgdi.h1
-rw-r--r--src/osd/modules/render/drawnone.cpp1
-rw-r--r--src/osd/modules/sound/direct_sound.cpp3
-rw-r--r--src/osd/modules/sound/xaudio2_sound.cpp3
-rw-r--r--src/osd/osdsync.cpp3
-rw-r--r--src/osd/sdl/sdlmain.cpp1
-rw-r--r--src/osd/sdl/window.cpp1
-rw-r--r--src/osd/strconv.cpp3
-rw-r--r--src/osd/strconv.h4
-rw-r--r--src/osd/uwp/uwpcompat.cpp4
-rw-r--r--src/osd/uwp/uwpcompat.h48
-rw-r--r--src/osd/uwp/video.cpp4
-rw-r--r--src/osd/uwp/window.cpp3
-rw-r--r--src/osd/uwp/window.h3
-rw-r--r--src/osd/windows/ledutil.cpp1
-rw-r--r--src/osd/windows/main.cpp1
-rw-r--r--src/osd/windows/video.cpp1
-rw-r--r--src/osd/windows/window.h1
-rw-r--r--src/osd/windows/winmain.cpp1
-rw-r--r--src/osd/windows/winmenu.cpp1
-rw-r--r--src/osd/windows/winutf8.cpp1
-rw-r--r--src/osd/windows/winutil.cpp1
52 files changed, 46 insertions, 97 deletions
diff --git a/src/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h
index 0e3bcd25131..8f4a1c3f6c0 100644
--- a/src/osd/modules/debugger/win/debugwin.h
+++ b/src/osd/modules/debugger/win/debugwin.h
@@ -10,7 +10,6 @@
#define __DEBUG_WIN_DEBUG_WIN_H__
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <windowsx.h>
#include <tchar.h>
diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp
index ac3b3b43b00..d833247274d 100644
--- a/src/osd/modules/diagnostics/diagnostics_win32.cpp
+++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp
@@ -11,7 +11,6 @@
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@@ -22,8 +21,6 @@
#include <memory>
#include <vector>
-#undef min
-#undef max
#include <utility>
#include "modules/lib/osdlib.h"
diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
index 84cdf367928..f9575b27e74 100644
--- a/src/osd/modules/file/windir.cpp
+++ b/src/osd/modules/file/windir.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shlwapi.h>
#include <tchar.h>
diff --git a/src/osd/modules/file/winfile.cpp b/src/osd/modules/file/winfile.cpp
index 44f5b5c13ce..745b9112b7b 100644
--- a/src/osd/modules/file/winfile.cpp
+++ b/src/osd/modules/file/winfile.cpp
@@ -6,7 +6,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include "winfile.h"
diff --git a/src/osd/modules/file/winptty.cpp b/src/osd/modules/file/winptty.cpp
index b3eef069d22..ab0efae37ff 100644
--- a/src/osd/modules/file/winptty.cpp
+++ b/src/osd/modules/file/winptty.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles, Vas Crabb
-#define WIN32_LEAN_AND_MEAN
#include "winfile.h"
diff --git a/src/osd/modules/file/winrtdir.cpp b/src/osd/modules/file/winrtdir.cpp
index dc0a9ae7408..be42b6fd874 100644
--- a/src/osd/modules/file/winrtdir.cpp
+++ b/src/osd/modules/file/winrtdir.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shlwapi.h>
#include <tchar.h>
diff --git a/src/osd/modules/file/winrtfile.cpp b/src/osd/modules/file/winrtfile.cpp
index a33c61cd657..2e561aa32a9 100644
--- a/src/osd/modules/file/winrtfile.cpp
+++ b/src/osd/modules/file/winrtfile.cpp
@@ -6,7 +6,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include "winfile.h"
diff --git a/src/osd/modules/file/winrtptty.cpp b/src/osd/modules/file/winrtptty.cpp
index e32f035582d..ec1e6e73b38 100644
--- a/src/osd/modules/file/winrtptty.cpp
+++ b/src/osd/modules/file/winrtptty.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles, Vas Crabb
-#define WIN32_LEAN_AND_MEAN
#include "winrtfile.h"
diff --git a/src/osd/modules/file/winrtsocket.cpp b/src/osd/modules/file/winrtsocket.cpp
index 94a8c3c3dc0..3f2241c25b5 100644
--- a/src/osd/modules/file/winrtsocket.cpp
+++ b/src/osd/modules/file/winrtsocket.cpp
@@ -6,7 +6,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include "winfile.h"
diff --git a/src/osd/modules/file/winsocket.cpp b/src/osd/modules/file/winsocket.cpp
index d1c3f4508e8..a383a876f9d 100644
--- a/src/osd/modules/file/winsocket.cpp
+++ b/src/osd/modules/file/winsocket.cpp
@@ -6,7 +6,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include "winfile.h"
diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp
index 732316738e7..74e15af9265 100644
--- a/src/osd/modules/font/font_dwrite.cpp
+++ b/src/osd/modules/font/font_dwrite.cpp
@@ -11,7 +11,6 @@
#if defined(OSD_WINDOWS) || defined(OSD_UWP)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <memory>
diff --git a/src/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp
index e1440e95af5..95f10c0a051 100644
--- a/src/osd/modules/font/font_windows.cpp
+++ b/src/osd/modules/font/font_windows.cpp
@@ -5,7 +5,6 @@
*
*/
-#define WIN32_LEAN_AND_MEAN
#include "font_module.h"
#include "modules/osdmodule.h"
diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h
index c98845eb885..96a197f2543 100644
--- a/src/osd/modules/input/input_common.h
+++ b/src/osd/modules/input/input_common.h
@@ -21,8 +21,6 @@
#include <queue>
#include <algorithm>
#include <functional>
-#undef min
-#undef max
//============================================================
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index b47a7f86e7d..4d434ce3b4c 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -12,7 +12,6 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <initguid.h>
#include <tchar.h>
@@ -22,8 +21,6 @@
#undef WINNT
#include <dinput.h>
#undef interface
-#undef min
-#undef max
#include <mutex>
diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp
index 3f5274c6eba..9243ec4a0f4 100644
--- a/src/osd/modules/input/input_rawinput.cpp
+++ b/src/osd/modules/input/input_rawinput.cpp
@@ -12,12 +12,9 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
#undef interface
-#undef min
-#undef max
#include <mutex>
#include <functional>
diff --git a/src/osd/modules/input/input_uwp.cpp b/src/osd/modules/input/input_uwp.cpp
index 86e9ecfe671..ece01a41662 100644
--- a/src/osd/modules/input/input_uwp.cpp
+++ b/src/osd/modules/input/input_uwp.cpp
@@ -14,8 +14,6 @@
#include <agile.h>
#include <ppltasks.h>
#include <collection.h>
-#undef min
-#undef max
#undef interface
// MAME headers
diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp
index a4e00eec17f..c07a1c681d8 100644
--- a/src/osd/modules/input/input_win32.cpp
+++ b/src/osd/modules/input/input_win32.cpp
@@ -12,12 +12,9 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
#undef interface
-#undef min
-#undef max
// MAME headers
#include "emu.h"
diff --git a/src/osd/modules/input/input_windows.h b/src/osd/modules/input/input_windows.h
index fb269df07cf..7afc487fb62 100644
--- a/src/osd/modules/input/input_windows.h
+++ b/src/osd/modules/input/input_windows.h
@@ -10,7 +10,6 @@
#define INPUT_WIN_H_
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef interface
diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp
index dae3c4bc3bf..6b945710e3b 100644
--- a/src/osd/modules/input/input_winhybrid.cpp
+++ b/src/osd/modules/input/input_winhybrid.cpp
@@ -11,22 +11,19 @@
#if defined(OSD_WINDOWS)
-#include <wbemcli.h>
#include <list>
#include <vector>
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <wrl/client.h>
+#include <wbemcli.h>
// XInput/DirectInput
#include <xinput.h>
#include <dinput.h>
#undef interface
-#undef min
-#undef max
// MAME headers
#include "emu.h"
diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp
index 8baf1fd6cdd..e6ecdd4d177 100644
--- a/src/osd/modules/input/input_xinput.cpp
+++ b/src/osd/modules/input/input_xinput.cpp
@@ -12,15 +12,12 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// XInput header
#include <xinput.h>
#undef interface
-#undef min
-#undef max
// MAME headers
#include "emu.h"
diff --git a/src/osd/modules/lib/osdlib_uwp.cpp b/src/osd/modules/lib/osdlib_uwp.cpp
index 170f964f74e..864177d9544 100644
--- a/src/osd/modules/lib/osdlib_uwp.cpp
+++ b/src/osd/modules/lib/osdlib_uwp.cpp
@@ -8,7 +8,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <mmsystem.h>
diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp
index 907889f37ba..d4dc3327f17 100644
--- a/src/osd/modules/lib/osdlib_win32.cpp
+++ b/src/osd/modules/lib/osdlib_win32.cpp
@@ -8,7 +8,6 @@
//
//============================================================
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <mmsystem.h>
diff --git a/src/osd/modules/monitor/monitor_dxgi.cpp b/src/osd/modules/monitor/monitor_dxgi.cpp
index 27380ed6e6e..5cac0217e6d 100644
--- a/src/osd/modules/monitor/monitor_dxgi.cpp
+++ b/src/osd/modules/monitor/monitor_dxgi.cpp
@@ -11,13 +11,10 @@
#if defined(OSD_WINDOWS) || defined(OSD_UWP)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <dxgi1_2.h>
#include <wrl/client.h>
#undef interface
-#undef min
-#undef max
#include "strconv.h"
#include "modules/lib/osdlib.h"
diff --git a/src/osd/modules/monitor/monitor_win32.cpp b/src/osd/modules/monitor/monitor_win32.cpp
index f5e273a8bb6..47012615656 100644
--- a/src/osd/modules/monitor/monitor_win32.cpp
+++ b/src/osd/modules/monitor/monitor_win32.cpp
@@ -11,11 +11,8 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef interface
-#undef min
-#undef max
#include "strconv.h"
#include "windows/video.h"
diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp
index ad49a399304..ad69c49339c 100644
--- a/src/osd/modules/netdev/pcap.cpp
+++ b/src/osd/modules/netdev/pcap.cpp
@@ -10,7 +10,6 @@
#include "modules/lib/osdlib.h"
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef interface
#define LIB_NAME "wpcap.dll"
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index a77371668c8..6e80c8c2a6b 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -16,7 +16,6 @@
// standard windows headers
#ifdef OSD_WINDOWS
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <windowsx.h>
#include <mmsystem.h>
@@ -26,8 +25,6 @@
// forward declaration
struct SDL_Window;
#endif
-#undef min
-#undef max
//============================================================
// TYPE DEFINITIONS
diff --git a/src/osd/modules/output/win32_output.cpp b/src/osd/modules/output/win32_output.cpp
index 6ae431de099..34465659ce3 100644
--- a/src/osd/modules/output/win32_output.cpp
+++ b/src/osd/modules/output/win32_output.cpp
@@ -13,7 +13,6 @@
#if defined(OSD_WINDOWS)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// MAME headers
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index a4306b9dfe2..64e71bd213a 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -20,8 +20,6 @@
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
-#undef min
-#undef max
#include "bgfxutil.h"
#include "chainmanager.h"
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index f94e3bfa631..f23a5084d9f 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -7,7 +7,6 @@
//============================================================
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) || defined(OSD_UWP)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if defined(SDLMAME_WIN32)
#include <SDL2/SDL_syswm.h>
diff --git a/src/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h
index f73f6704823..049b2c25ae3 100644
--- a/src/osd/modules/render/drawd3d.h
+++ b/src/osd/modules/render/drawd3d.h
@@ -13,7 +13,6 @@
#ifdef OSD_WINDOWS
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
#include <mmsystem.h>
diff --git a/src/osd/modules/render/drawgdi.h b/src/osd/modules/render/drawgdi.h
index 6f41148dc70..7d0c2201079 100644
--- a/src/osd/modules/render/drawgdi.h
+++ b/src/osd/modules/render/drawgdi.h
@@ -12,7 +12,6 @@
#define __DRAWGDI__
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// MAME headers
diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp
index c5213afcec3..f56660a7d05 100644
--- a/src/osd/modules/render/drawnone.cpp
+++ b/src/osd/modules/render/drawnone.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// MAME headers
diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp
index 3117b354c84..4d6c8c26c50 100644
--- a/src/osd/modules/sound/direct_sound.cpp
+++ b/src/osd/modules/sound/direct_sound.cpp
@@ -12,7 +12,6 @@
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <mmsystem.h>
@@ -20,8 +19,6 @@
#undef WINNT
#include <dsound.h>
#undef interface
-#undef min
-#undef max
// MAME headers
#include "emu.h"
diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp
index 6667fe7fccf..73573096f5a 100644
--- a/src/osd/modules/sound/xaudio2_sound.cpp
+++ b/src/osd/modules/sound/xaudio2_sound.cpp
@@ -12,7 +12,6 @@
#if defined(OSD_WINDOWS) || defined(OSD_UWP)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <wrl/client.h>
@@ -21,8 +20,6 @@
#include <xaudio2.h>
#undef interface
-#undef min
-#undef max
// stdlib includes
#include <mutex>
diff --git a/src/osd/osdsync.cpp b/src/osd/osdsync.cpp
index 2a0e996b465..12253f2acbd 100644
--- a/src/osd/osdsync.cpp
+++ b/src/osd/osdsync.cpp
@@ -7,7 +7,6 @@
//============================================================
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <process.h>
#include <tchar.h>
@@ -21,8 +20,6 @@
#include <atomic>
#include <thread>
#include <vector>
-#undef min
-#undef max
#include <algorithm>
// MAME headers
#include "osdcore.h"
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index c518191d1a7..f8bcb231796 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -29,7 +29,6 @@
// only for strconv.h
#if defined(SDLMAME_WIN32)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 17e25bbd875..fa9fe2989e9 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -9,7 +9,6 @@
//============================================================
#ifdef SDLMAME_WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp
index d8fed98d687..9ea2e00bd1a 100644
--- a/src/osd/strconv.cpp
+++ b/src/osd/strconv.cpp
@@ -6,11 +6,8 @@
//
//============================================================
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) || defined(OSD_UWP)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
-#undef min
-#undef max
#include <algorithm>
#include <assert.h>
// MAMEOS headers
diff --git a/src/osd/strconv.h b/src/osd/strconv.h
index 65f9ad35fd1..f1eed54a49a 100644
--- a/src/osd/strconv.h
+++ b/src/osd/strconv.h
@@ -19,10 +19,6 @@
#if defined(WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
#include <windows.h>
namespace osd
diff --git a/src/osd/uwp/uwpcompat.cpp b/src/osd/uwp/uwpcompat.cpp
index 156ab408219..bd7103b8e31 100644
--- a/src/osd/uwp/uwpcompat.cpp
+++ b/src/osd/uwp/uwpcompat.cpp
@@ -8,9 +8,9 @@
#include "uwpcompat.h"
-#include <errno.h>
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#include <errno.h>
+
#undef interface
#include "emu.h"
diff --git a/src/osd/uwp/uwpcompat.h b/src/osd/uwp/uwpcompat.h
index 697d5f9527f..2d495238a99 100644
--- a/src/osd/uwp/uwpcompat.h
+++ b/src/osd/uwp/uwpcompat.h
@@ -13,7 +13,9 @@
extern "C" {
#endif
-#define WIN32_LEAN_AND_MEAN
+#ifndef NOGDI
+#define NOGDI
+#endif
#include <windows.h>
#include <stdio.h>
@@ -66,6 +68,38 @@ int _pclose(
FILE *stream);
_Ret_maybenull_
+HMODULE WINAPI LoadLibraryA(
+ _In_ LPCSTR lpFileName
+);
+
+_Ret_maybenull_
+HMODULE WINAPI LoadLibraryW(
+ _In_ LPCWSTR lpFileName
+);
+
+#ifdef UNICODE
+#define LoadLibrary LoadLibraryW
+#else
+#define LoadLibrary LoadLibraryA
+#endif // !UNICODE
+
+_Ret_maybenull_
+HMODULE WINAPI GetModuleHandleA(
+ _In_ LPCSTR lpModuleName
+);
+
+_Ret_maybenull_
+HMODULE WINAPI GetModuleHandleW(
+ _In_ LPCWSTR lpModuleName
+);
+
+#ifdef UNICODE
+#define GetModuleHandle GetModuleHandleW
+#else
+#define GetModuleHandle GetModuleHandleA
+#endif // !UNICODE
+
+_Ret_maybenull_
HMODULE
WINAPI
LoadLibraryExA(
@@ -83,6 +117,12 @@ LoadLibraryExW(
_In_ DWORD dwFlags
);
+#ifdef UNICODE
+#define LoadLibraryEx LoadLibraryExW
+#else
+#define LoadLibraryEx LoadLibraryExA
+#endif // !UNICODE
+
DWORD
WINAPI
GetFileSize(
@@ -90,12 +130,6 @@ GetFileSize(
_Out_opt_ LPDWORD lpFileSizeHigh
);
-#ifdef UNICODE
-#define LoadLibraryEx LoadLibraryExW
-#else
-#define LoadLibraryEx LoadLibraryExA
-#endif // !UNICODE
-
#ifdef __cplusplus
}
#endif
diff --git a/src/osd/uwp/video.cpp b/src/osd/uwp/video.cpp
index 8a3de3a8ef1..f59b59c171b 100644
--- a/src/osd/uwp/video.cpp
+++ b/src/osd/uwp/video.cpp
@@ -6,9 +6,9 @@
//
//============================================================
-// standard windows headers
#include <exception>
-#define WIN32_LEAN_AND_MEAN
+
+// standard windows headers
#include <windows.h>
#include <dxgi1_2.h>
#include <wrl\client.h>
diff --git a/src/osd/uwp/window.cpp b/src/osd/uwp/window.cpp
index bfee83acbed..0cb74263f34 100644
--- a/src/osd/uwp/window.cpp
+++ b/src/osd/uwp/window.cpp
@@ -46,9 +46,6 @@ using namespace Windows::UI::Core;
#define MAKE_DI_SCAN(scan, isextended) (scan & 0x7f) | (isextended ? 0x80 : 0x00)
#define WINOSD(machine) downcast<windows_osd_interface*>(&machine.osd())
-#undef min
-#undef max
-
//============================================================
// PARAMETERS
//============================================================
diff --git a/src/osd/uwp/window.h b/src/osd/uwp/window.h
index f4907bb97ee..b36ca4ca694 100644
--- a/src/osd/uwp/window.h
+++ b/src/osd/uwp/window.h
@@ -10,14 +10,11 @@
#define __UWP_WINDOW__
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <windowsx.h>
#include <mmsystem.h>
#include <inspectable.h>
#include <agile.h>
-#undef min
-#undef max
#include <chrono>
#include <mutex>
diff --git a/src/osd/windows/ledutil.cpp b/src/osd/windows/ledutil.cpp
index 2db8fed4377..1d2d72d11a5 100644
--- a/src/osd/windows/ledutil.cpp
+++ b/src/osd/windows/ledutil.cpp
@@ -29,7 +29,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winioctl.h>
diff --git a/src/osd/windows/main.cpp b/src/osd/windows/main.cpp
index cd0d37bc942..7c33434c005 100644
--- a/src/osd/windows/main.cpp
+++ b/src/osd/windows/main.cpp
@@ -10,7 +10,6 @@
#ifdef OSD_SDL
#define _WIN32_WINNT 0x0501
#endif
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
#include <stdlib.h>
diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp
index 88c0f318122..b6625ea62e9 100644
--- a/src/osd/windows/video.cpp
+++ b/src/osd/windows/video.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// MAME headers
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 688739565fb..3db5177cf6d 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -10,7 +10,6 @@
#define __WIN_WINDOW__
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <windowsx.h>
#include <mmsystem.h>
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index bc7d51769dd..b146e8b6357 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -10,7 +10,6 @@
#include <functional>
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <commctrl.h>
#include <mmsystem.h>
diff --git a/src/osd/windows/winmenu.cpp b/src/osd/windows/winmenu.cpp
index a1f6aab2427..2fb0a548dbe 100644
--- a/src/osd/windows/winmenu.cpp
+++ b/src/osd/windows/winmenu.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "emu.h"
diff --git a/src/osd/windows/winutf8.cpp b/src/osd/windows/winutf8.cpp
index be23d963f5b..1c076158ebe 100644
--- a/src/osd/windows/winutf8.cpp
+++ b/src/osd/windows/winutf8.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
#include <stdlib.h>
diff --git a/src/osd/windows/winutil.cpp b/src/osd/windows/winutil.cpp
index 951ce803a7a..3bd27a8eff8 100644
--- a/src/osd/windows/winutil.cpp
+++ b/src/osd/windows/winutil.cpp
@@ -7,7 +7,6 @@
//============================================================
// standard windows headers
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <direct.h>