From: Toni Wilen <twilen@winuae.net>
Date: Sun, 26 Oct 2025 14:32:24 +0000 (+0200)
Subject: Removed unneeded includes
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=23bc1145cf8e73137e111d573015f18a1a57e953;p=francis%2Fwinuae.git

Removed unneeded includes
---

diff --git a/od-win32/ahidsound_dsonly.cpp b/od-win32/ahidsound_dsonly.cpp
index 155bfa2a..e1e73118 100644
--- a/od-win32/ahidsound_dsonly.cpp
+++ b/od-win32/ahidsound_dsonly.cpp
@@ -16,17 +16,10 @@
 
 #if defined(AHI)
 
-#include <ctype.h>
-#include <assert.h>
-
 #include <windows.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <dsound.h>
-#include <stdio.h>
 
 #include "options.h"
-#include "audio.h"
 #include "memory.h"
 #include "events.h"
 #include "custom.h"
@@ -38,7 +31,6 @@
 #include "parser.h"
 #include "enforcer.h"
 #include "ahidsound.h"
-#include "picasso96_win.h"
 
 static long samples, playchannel, intcount;
 static int record_enabled;
diff --git a/od-win32/ahidsound_new.cpp b/od-win32/ahidsound_new.cpp
index 16abd701..45436350 100644
--- a/od-win32/ahidsound_new.cpp
+++ b/od-win32/ahidsound_new.cpp
@@ -10,19 +10,10 @@
 
 #if defined(AHI)
 
-#include <ctype.h>
-#include <assert.h>
-
 #include <windows.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <math.h>
-#include <process.h>
 
 #include "sysdeps.h"
 #include "options.h"
-#include "audio.h"
 #include "memory.h"
 #include "events.h"
 #include "custom.h"
@@ -34,7 +25,6 @@
 #include "win32.h"
 #include "sounddep/sound.h"
 #include "ahidsound_new.h"
-#include "render.h"
 
 #include <al.h>
 #include <alc.h>
diff --git a/od-win32/avioutput.cpp b/od-win32/avioutput.cpp
index d15e6843..34a57657 100644
--- a/od-win32/avioutput.cpp
+++ b/od-win32/avioutput.cpp
@@ -10,7 +10,6 @@ Copyright(c) 2001 - 2002; 
 
 #include <windows.h>
 
-#include <mmsystem.h>
 #include <vfw.h>
 #include <msacm.h>
 #include <ks.h>
diff --git a/od-win32/blkdev_win32_ioctl.cpp b/od-win32/blkdev_win32_ioctl.cpp
index 970110f7..a9b3f275 100644
--- a/od-win32/blkdev_win32_ioctl.cpp
+++ b/od-win32/blkdev_win32_ioctl.cpp
@@ -18,15 +18,11 @@
 #include "scsidev.h"
 #include "gui.h"
 #include "win32.h"
-#include "audio.h"
 
-#include <devioctl.h>
 #include <ntddcdrm.h>
 #include <windows.h>
 #include <mmsystem.h>
 #include <winioctl.h>
-#include <setupapi.h>   // for SetupDiXxx functions.
-#include <stddef.h>
 
 #include "cda_play.h"
 #ifdef RETROPLATFORM
diff --git a/od-win32/blkdev_win32_spti.cpp b/od-win32/blkdev_win32_spti.cpp
index 7f9f6fb0..f3e83deb 100644
--- a/od-win32/blkdev_win32_spti.cpp
+++ b/od-win32/blkdev_win32_spti.cpp
@@ -18,16 +18,10 @@
 #include "scsidev.h"
 #include "gui.h"
 
-#include <stddef.h>
-
-#include <devioctl.h>
-#include <ntddstor.h>
 #include <winioctl.h>
-#include <initguid.h>   // Guid definition
 #include <devguid.h>    // Device guids
 #include <setupapi.h>   // for SetupDiXxx functions.
 #include <ntddscsi.h>
-#include <mmsystem.h>
 
 #include "cda_play.h"
 
diff --git a/od-win32/bsdsock.cpp b/od-win32/bsdsock.cpp
index b6c66f0d..4b7f1677 100644
--- a/od-win32/bsdsock.cpp
+++ b/od-win32/bsdsock.cpp
@@ -19,7 +19,6 @@
 
 #include "resource.h"
 
-#include <stddef.h>
 #include <process.h>
 #include <iphlpapi.h>
 
@@ -33,8 +32,6 @@
 #include "registry.h"
 #include "native2amiga.h"
 #include "win32gui.h"
-#include "wininet.h"
-#include "mmsystem.h"
 #include "win32.h"
 
 int rawsockets = 0;
diff --git a/od-win32/cda_play.cpp b/od-win32/cda_play.cpp
index 7f56452a..37acfb23 100644
--- a/od-win32/cda_play.cpp
+++ b/od-win32/cda_play.cpp
@@ -18,8 +18,6 @@
 #include "blkdev.h"
 #include "threaddep/thread.h"
 
-#include <dsound.h>
-#include <mmreg.h>
 #include <sys/timeb.h>
 
 #include "win32.h"
diff --git a/od-win32/clipboard_win32.cpp b/od-win32/clipboard_win32.cpp
index 9e158934..8f4a6722 100644
--- a/od-win32/clipboard_win32.cpp
+++ b/od-win32/clipboard_win32.cpp
@@ -2,9 +2,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-
 #include <windows.h>
 
 #include "options.h"
@@ -14,7 +11,6 @@
 #include "keybuf.h"
 #include "memory.h"
 #include "autoconf.h"
-#include "threaddep/thread.h"
 #include "native2amiga_api.h"
 
 int clipboard_debug;
diff --git a/od-win32/darkmode.cpp b/od-win32/darkmode.cpp
index 97807f4c..6338cb58 100644
--- a/od-win32/darkmode.cpp
+++ b/od-win32/darkmode.cpp
@@ -13,8 +13,6 @@
 #pragma comment(lib, "Comctl32.lib")
 #pragma comment(lib, "Uxtheme.lib")
 
-#include "resource.h"
-
 #include "darkmode.h"
 
 #include "IatHook.h"
diff --git a/od-win32/debug_win32.cpp b/od-win32/debug_win32.cpp
index ec5e1fa4..1a750cb2 100644
--- a/od-win32/debug_win32.cpp
+++ b/od-win32/debug_win32.cpp
@@ -9,8 +9,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
@@ -30,8 +28,6 @@
 #include "win32gui.h"
 #include "fpp.h"
 
-#include "uae.h"
-
 static HWND hDbgWnd = 0;
 static HWND hOutput = 0;
 static HACCEL dbgaccel = 0;
diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index 046fbaac..517b8682 100644
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -34,8 +34,6 @@ int key_swap_end_pgup = 0;
 #include "sysconfig.h"
 
 #include <stdlib.h>
-#include <stdarg.h>
-#include <signal.h>
 
 #include <windows.h>
 #include <dinput.h>
@@ -53,15 +51,11 @@ int key_swap_end_pgup = 0;
 #include "tabletlibrary.h"
 #include "gui.h"
 
-#include <winioctl.h>
 #include <ntddkbd.h>
 #include <ntddpar.h>
 #include <setupapi.h>
 #include <devguid.h>
 #include <cfgmgr32.h>
-#include <wbemidl.h>
-#include <oleauto.h>
-
 
 extern "C" 
 {
diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp
index d0ffbd17..6968a96a 100644
--- a/od-win32/direct3d.cpp
+++ b/od-win32/direct3d.cpp
@@ -2,7 +2,6 @@
 /* Direct3D 9 graphics renderer */
 
 #include <windows.h>
-#include "resource.h"
 
 #include "sysconfig.h"
 #include "sysdeps.h"
diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 63bdf2a4..0f3e8e17 100644
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -2,7 +2,6 @@
 /* Direct3D 11 graphics renderer */
 
 #include <windows.h>
-#include "resource.h"
 
 #include <DXGI1_5.h>
 #include <dxgi1_6.h>
@@ -41,7 +40,6 @@ using Microsoft::WRL::ComPtr;
 
 #include "FX11/d3dx11effect.h"
 
-#include <process.h>
 #include <Dwmapi.h>
 
 void (*D3D_free)(int, bool immediate);
diff --git a/od-win32/fpp_native_msvc_80bit.cpp b/od-win32/fpp_native_msvc_80bit.cpp
index df8f52ef..dd3b8c3c 100644
--- a/od-win32/fpp_native_msvc_80bit.cpp
+++ b/od-win32/fpp_native_msvc_80bit.cpp
@@ -13,8 +13,6 @@
 
 #if CPU_x86_64 || CPU_i386
 
-#include <math.h>
-#include <float.h>
 #include <fenv.h>
 
 #define USE_HOST_ROUNDING 1
@@ -24,7 +22,6 @@
 #include "fpp.h"
 #include "uae/attributes.h"
 #include "uae/vm.h"
-#include "newcpu.h"
 #include "softfloat/softfloat-specialize.h"
 
 extern "C"
diff --git a/od-win32/fsdb_mywin32.cpp b/od-win32/fsdb_mywin32.cpp
index 99b854b3..f62f7504 100644
--- a/od-win32/fsdb_mywin32.cpp
+++ b/od-win32/fsdb_mywin32.cpp
@@ -1,7 +1,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 #include "options.h"
-#include "memory.h"
 
 #include "fsdb.h"
 #include "zfile.h"
diff --git a/od-win32/gdirender.cpp b/od-win32/gdirender.cpp
index 9476e0f0..07b49f00 100644
--- a/od-win32/gdirender.cpp
+++ b/od-win32/gdirender.cpp
@@ -2,7 +2,6 @@
 /* GDI graphics renderer */
 
 #include <windows.h>
-#include "resource.h"
 
 #include "sysconfig.h"
 #include "sysdeps.h"
diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp
index 9c43bdf2..ec3936db 100644
--- a/od-win32/hardfile_win32.cpp
+++ b/od-win32/hardfile_win32.cpp
@@ -33,12 +33,10 @@
 #include <ntddstor.h>
 #include <winioctl.h>
 #include <initguid.h>   // Guid definition
-#include <devguid.h>    // Device guids
 #include <setupapi.h>   // for SetupDiXxx functions.
 #include <cfgmgr32.h>   // for SetupDiXxx functions.
 #include <Ntddscsi.h>
 #endif
-#include <stddef.h>
 
 static int usefloppydrives = 0;
 static int num_drives;
diff --git a/od-win32/keyboard_win32.cpp b/od-win32/keyboard_win32.cpp
index 0b1d74c5..e2422e98 100644
--- a/od-win32/keyboard_win32.cpp
+++ b/od-win32/keyboard_win32.cpp
@@ -11,9 +11,6 @@
 
 #include "sysconfig.h"
 
-#include <assert.h>
-#include <ctype.h>
-#include <signal.h>
 #include <windows.h>
 #include <dinput.h>
 
@@ -21,8 +18,6 @@
 #include "uae.h"
 #include "gui.h"
 #include "options.h"
-#include "memory.h"
-#include "custom.h"
 #include "keyboard.h"
 #include "inputdevice.h"
 #include "win32.h"
diff --git a/od-win32/midi.cpp b/od-win32/midi.cpp
index d7b14504..2d59d9e6 100644
--- a/od-win32/midi.cpp
+++ b/od-win32/midi.cpp
@@ -17,19 +17,11 @@
 */
 
 #include "sysconfig.h"
-#include <windows.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <mmsystem.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <io.h>
-
 #include "sysdeps.h"
 
-#include "resource.h"
+#include <windows.h>
 
+#include "resource.h"
 #include "options.h"
 #include "midi.h"
 #include "registry.h"
diff --git a/od-win32/mman.cpp b/od-win32/mman.cpp
index b9b10571..6e04d291 100644
--- a/od-win32/mman.cpp
+++ b/od-win32/mman.cpp
@@ -2,8 +2,6 @@
 // Copyright (C) 2000, Brian King
 // GNU Public License
 
-#include <float.h>
-
 #include "sysconfig.h"
 #include "sysdeps.h"
 #include "options.h"
diff --git a/od-win32/parser.cpp b/od-win32/parser.cpp
index 9f17230f..8d9ff4fc 100644
--- a/od-win32/parser.cpp
+++ b/od-win32/parser.cpp
@@ -15,18 +15,8 @@
 
 #include <windows.h>
 #include <winspool.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <mmsystem.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <io.h>
 
 #include <setupapi.h>
-#include <Ntddpar.h>
 
 #include "sysdeps.h"
 #include "options.h"
diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index 7da38688..24094632 100644
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -33,8 +33,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <stdlib.h>
-
 #if defined(PICASSO96)
 
 #define MULTIDISPLAY 0
diff --git a/od-win32/posixemu.cpp b/od-win32/posixemu.cpp
index ea5e5c81..a9469711 100644
--- a/od-win32/posixemu.cpp
+++ b/od-win32/posixemu.cpp
@@ -9,21 +9,12 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
+#include "options.h"
+
 #include <windows.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <io.h>
-#include <sys/types.h>
 #include <sys/timeb.h>
-#include <sys/utime.h>
 #include <process.h>
 
-#include "options.h"
 #include "posixemu.h"
 #include "threaddep/thread.h"
 #include "win32.h"
diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index c9dcf240..03bd8524 100644
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -1,7 +1,4 @@
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <signal.h>
 
 #include <windows.h>
 
diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp
index 75657c7e..d380f9b0 100644
--- a/od-win32/screenshot.cpp
+++ b/od-win32/screenshot.cpp
@@ -4,8 +4,6 @@
 
 #include <windows.h>
 
-#include <stdio.h>
-
 #include "sysconfig.h"
 #include "sysdeps.h"
 #include "options.h"
diff --git a/od-win32/sounddep/sound.cpp b/od-win32/sounddep/sound.cpp
index e0a26259..052d5eda 100644
--- a/od-win32/sounddep/sound.cpp
+++ b/od-win32/sounddep/sound.cpp
@@ -12,8 +12,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <math.h>
-
 #include "options.h"
 #include "audio.h"
 #include "events.h"
@@ -29,18 +27,15 @@
 #include "xwin.h"
 
 #include <windows.h>
-#include <mmsystem.h>
 #include <mmreg.h>
 #include <dsound.h>
 #include <ks.h>
 #include <ksmedia.h>
 #include <Audioclient.h>
-#include <audiopolicy.h>
 #include <Mmdeviceapi.h>
 #include <Functiondiscoverykeys_devpkey.h>
 #include <al.h>
 #include <alc.h>
-#include <ntverp.h>
 
 #include <portaudio.h>
 
diff --git a/od-win32/unicode.cpp b/od-win32/unicode.cpp
index 8152c128..aff21c75 100644
--- a/od-win32/unicode.cpp
+++ b/od-win32/unicode.cpp
@@ -4,8 +4,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "options.h"
-
 #define DWFLAGS (0)
 #define FS_TEST 0
 
diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 52f52f28..45e3c03c 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -15,8 +15,6 @@
 #define KBHOOK 0
 
 #include <stdlib.h>
-#include <stdarg.h>
-#include <signal.h>
 
 #include "sysconfig.h"
 
@@ -26,19 +24,13 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
-#include <commdlg.h>
 #include <shellapi.h>
-#include <zmouse.h>
 #include <dbt.h>
-#include <math.h>
-#include <mmsystem.h>
 #include <shobjidl.h>
 #include <shlobj.h>
 #include <shlwapi.h>
 #include <dbghelp.h>
-#include <float.h>
 #include <WtsApi32.h>
-#include <Avrt.h>
 #include <Cfgmgr32.h>
 #include <shellscalingapi.h>
 #include <dinput.h>
diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index a503ce55..d422136c 100644
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -13,8 +13,6 @@
 #include "drawing.h"
 #include "direct3d.h"
 
-#include <float.h>
-
 #define AUTORESIZE_FRAME_DELAY 4
 
 static float filteroffsetx, filteroffsety, filterxmult = 1.0, filterymult = 1.0;
diff --git a/od-win32/win32_uaenet.cpp b/od-win32/win32_uaenet.cpp
index f989458d..b5066950 100644
--- a/od-win32/win32_uaenet.cpp
+++ b/od-win32/win32_uaenet.cpp
@@ -7,14 +7,11 @@
 */
 
 #include <winsock2.h>
-#include <Ws2tcpip.h>
 #include <Iphlpapi.h>
 
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <stdio.h>
-
 #define HAVE_REMOTE
 #define WPCAP
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
diff --git a/od-win32/win32_videograb.cpp b/od-win32/win32_videograb.cpp
index 3d42c623..7887be4d 100644
--- a/od-win32/win32_videograb.cpp
+++ b/od-win32/win32_videograb.cpp
@@ -5,9 +5,6 @@
 
 #include "sysconfig.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-
 #include "sysdeps.h"
 #include "options.h"
 
diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 71f85267..c28a9a38 100644
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -9,9 +9,6 @@
 
 #include "sysconfig.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp
index a49989e6..1345e615 100644
--- a/od-win32/win32gui_extra.cpp
+++ b/od-win32/win32gui_extra.cpp
@@ -1,10 +1,8 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <Dwmapi.h>
-#include <shellscalingapi.h>
 #include <shlwapi.h>
 #include <uiautomation.h>
 #include "Xinput.h"
diff --git a/uaeipc.cpp b/uaeipc.cpp
index 74f9f32b..c3d3e1b0 100644
--- a/uaeipc.cpp
+++ b/uaeipc.cpp
@@ -1,9 +1,6 @@
 
 #include "sysconfig.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-
 #include "sysdeps.h"
 #include "uaeipc.h"
 #include "options.h"