Removed unneeded includes

diff --git a/a2065.cpp b/a2065.cpp
index eb0d16cad844b01641cbef060d37039650fc6815..54ae9e9a20d5c6c27921daa38fda6573b7a19261 100644 (file)
--- a/a2065.cpp
+++ b/a2065.cpp
@@ -14,7 +14,6 @@
 
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
 #include "newcpu.h"
 #include "a2065.h"
 #include "ethernet.h"
@@ -22,7 +21,6 @@
 #include "savestate.h"
 #include "autoconf.h"
 #include "rommgr.h"
-#include "debug.h"
 #include "devices.h"
 #include "threaddep/thread.h"
 

diff --git a/a2091.cpp b/a2091.cpp
index cc9d313c47f98da866421289e7e1029694802259..f9914b420450817dcdfac427de52731d3c67c47a 100644 (file)
--- a/a2091.cpp
+++ b/a2091.cpp
@@ -29,19 +29,14 @@
 #include "uae.h"
 #include "memory.h"
 #include "rommgr.h"
-#include "custom.h"
 #include "newcpu.h"
-#include "debug.h"
 #include "scsi.h"
 #include "threaddep/thread.h"
 #include "a2091.h"
-#include "blkdev.h"
-#include "gui.h"
 #include "zfile.h"
 #include "filesys.h"
 #include "autoconf.h"
 #include "cdtv.h"
-#include "savestate.h"
 #include "cpuboard.h"
 #include "rtc.h"
 #include "devices.h"

diff --git a/akiko.cpp b/akiko.cpp
index 47197fee3063afa243850b7932d71a16d6bee907..688aa185c066d7354112d3cf911da62cf76b5d51 100644 (file)
--- a/akiko.cpp
+++ b/akiko.cpp
@@ -151,7 +151,6 @@
 
 #include "options.h"
 #include "memory.h"
-#include "events.h"
 #include "savestate.h"
 #include "blkdev.h"
 #include "zfile.h"

diff --git a/amax.cpp b/amax.cpp
index 1739d48788055d17f3e038d951b393ef409e5f51..110b1748a77ccd3a61a1b338c7ac73ff05b9afde 100644 (file)
--- a/amax.cpp
+++ b/amax.cpp
@@ -5,7 +5,6 @@
 #include "options.h"
 #include "zfile.h"
 #include "amax.h"
-#include "custom.h"
 #include "memory.h"
 #include "newcpu.h"
 #include "rommgr.h"

diff --git a/ar.cpp b/ar.cpp
index 73db0c42d2e588c76638c5a9c5e3904d3f731b67..1a1d27b1a105fa5b22bb50c0fe2602398129ea0c 100644 (file)
--- a/ar.cpp
+++ b/ar.cpp
@@ -214,8 +214,6 @@
 #include "ar.h"
 #include "savestate.h"
 #include "crc32.h"
-#include "akiko.h"
-#include "xwin.h"
 #include "gfxboard.h"
 
 #define DEBUG

diff --git a/arcadia.cpp b/arcadia.cpp
index 81633505a6006c8b541e29d0912924343050a073..660bedd00f50f6ae774346bb44867bd5d29b2ebb 100644 (file)
--- a/arcadia.cpp
+++ b/arcadia.cpp
@@ -15,7 +15,6 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "uae.h"
 #include "memory.h"
 #include "rommgr.h"
 #include "custom.h"
@@ -27,13 +26,10 @@
 #include "videograb.h"
 #endif
 #include "xwin.h"
-#include "drawing.h"
 #include "statusline.h"
-#include "rommgr.h"
 #include "flashrom.h"
 #include "savestate.h"
 #include "devices.h"
-#include "specialmonitors.h"
 
 #define CUBO_DEBUG 1
 

diff --git a/audio.cpp b/audio.cpp
index 02441f1f9e6d9df4d5ae284c64922e1c35b27439..8deb0c1cdde65362ad58da2c34216a501a77f0e5 100644 (file)
--- a/audio.cpp
+++ b/audio.cpp
@@ -19,7 +19,6 @@
 #include "memory.h"
 #include "custom.h"
 #include "newcpu.h"
-#include "autoconf.h"
 #include "gensound.h"
 #include "audio.h"
 #include "sounddep/sound.h"
@@ -31,7 +30,6 @@
 #include "zfile.h"
 #include "uae.h"
 #include "gui.h"
-#include "xwin.h"
 #include "debug.h"
 #ifdef WITH_SNDBOARD
 #include "sndboard.h"
@@ -40,13 +38,11 @@
 #include "avioutput.h"
 #endif
 #ifdef AHI
-#include "traps.h"
 #include "ahidsound.h"
 #ifdef AHI_v2
 #include "ahidsound_new.h"
 #endif
 #endif
-#include "threaddep/thread.h"
 
 #include <math.h>
 

diff --git a/autoconf.cpp b/autoconf.cpp
index 815d178a768c4383a3b282a3090227fce2946f4f..9e382223c32a8cdbe6d003dff0ad84349c163713 100644 (file)
--- a/autoconf.cpp
+++ b/autoconf.cpp
@@ -13,16 +13,12 @@
 #define NEW_TRAP_DEBUG 0
 
 #include "options.h"
-#include "uae.h"
 #include "memory.h"
-#include "custom.h"
-#include "events.h"
 #include "newcpu.h"
 #include "autoconf.h"
 #include "traps.h"
 #include "debug.h"
 #include "threaddep/thread.h"
-#include "native2amiga.h"
 #include "inputdevice.h"
 #ifdef WITH_PPC
 #include "uae/ppc.h"

diff --git a/blitfunc.cpp b/blitfunc.cpp
index 7813ac2bb5f7e50e2369e2e5776378c2c477525d..1135d35d741f035180aacbb25f1a7047e3904d91 100644 (file)
--- a/blitfunc.cpp
+++ b/blitfunc.cpp
@@ -1,7 +1,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 #include "options.h"
-#include "custom.h"
 #include "memory.h"
 #include "blitter.h"
 #include "blitfunc.h"

diff --git a/blitter.cpp b/blitter.cpp
index 7e7d52ff27bf5a5d2fa7edf1033db4c8abe706f7..995ffd44d12ecc0ae28633aafe656eee7ffb92ef 100644 (file)
--- a/blitter.cpp
+++ b/blitter.cpp
@@ -14,7 +14,6 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "uae.h"
 #include "memory.h"
 #include "custom.h"
 #include "events.h"

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index 76aa985a3f66bd4f9d7618ced47e0eb5ae87ae94..97f2c7fcba1932533521c14ce41bd440d6b56682 100644 (file)
--- a/blkdev_cdimage.cpp
+++ b/blkdev_cdimage.cpp
@@ -17,19 +17,16 @@
 #include <sys/timeb.h>
 
 #include "options.h"
-#include "traps.h"
 #include "blkdev.h"
 #include "zfile.h"
 #include "gui.h"
 #include "fsdb.h"
 #include "threaddep/thread.h"
-#include "scsidev.h"
 #include "mp3decoder.h"
 #include "cda_play.h"
 #include "memory.h"
 #include "audio.h"
 #include "uae.h"
-#include "uae/cdrom.h"
 #ifdef RETROPLATFORM
 #include "rp.h"
 #endif

diff --git a/bsdsocket.cpp b/bsdsocket.cpp
index 95c3752cfea62245117438ef8c76ce0f4862a500..f68e9145ff9e815fb8e6d911eece9103f7e59851 100644 (file)
--- a/bsdsocket.cpp
+++ b/bsdsocket.cpp
@@ -16,8 +16,6 @@
 
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
-#include "newcpu.h"
 #include "autoconf.h"
 #include "traps.h"
 #include "bsdsocket.h"

diff --git a/catweasel.cpp b/catweasel.cpp
index 4dfc51423d033c299fb0cb8a0ba636461c4ce21b..56c59cb34399d41a42cde4aa7a41edb504cf6136 100644 (file)
--- a/catweasel.cpp
+++ b/catweasel.cpp
@@ -7,7 +7,6 @@
 #ifdef CATWEASEL
 
 #include "options.h"
-#include "memory.h"
 #include "ioport.h"
 #include "catweasel.h"
 #include "uae.h"

diff --git a/cd32_fmv.cpp b/cd32_fmv.cpp
index ad7c2627694a7753bdc11d5c1b62503820809766..a7913022b3b91b312c17389ff30d3368c5c42ee2 100644 (file)
--- a/cd32_fmv.cpp
+++ b/cd32_fmv.cpp
@@ -15,11 +15,8 @@
 #include "rommgr.h"
 #include "custom.h"
 #include "newcpu.h"
-#include "zfile.h"
 #include "cd32_fmv.h"
-#include "uae.h"
 #include "debug.h"
-#include "custom.h"
 #include "audio.h"
 #include "devices.h"
 #include "threaddep/thread.h"

diff --git a/cd32_fmv_genlock.cpp b/cd32_fmv_genlock.cpp
index 025d1b736747c994788115b4cebc9a29549ac304..7e7a05e00dbf394e83a415a25a8e1a9b44905376 100644 (file)
--- a/cd32_fmv_genlock.cpp
+++ b/cd32_fmv_genlock.cpp
@@ -11,8 +11,6 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "memory.h"
-#include "cd32_fmv.h"
 #include "xwin.h"
 
 static uae_u8 *mpeg_out_buffer;

diff --git a/cdtv.cpp b/cdtv.cpp
index e95f4cc4e3e6f1dec6d5e292b1dfb45466b01506..5c5a2d91d73ef648289f8f331a8c4843785c5ece 100644 (file)
--- a/cdtv.cpp
+++ b/cdtv.cpp
@@ -34,7 +34,6 @@
 #endif
 #include "uae.h"
 #include "savestate.h"
-#include "scsi.h"
 #include "devices.h"
 #include "rommgr.h"
 

diff --git a/cdtvcr.cpp b/cdtvcr.cpp
index 738c4426ccb142cbf64eb05ea2a679bfd26e672b..6ff151d8ed3b8edb6c7fac08658947057c9b54c2 100644 (file)
--- a/cdtvcr.cpp
+++ b/cdtvcr.cpp
@@ -27,7 +27,6 @@
 #include "threaddep/thread.h"
 #include "uae.h"
 #include "custom.h"
-#include "rommgr.h"
 #include "devices.h"
 
 #if CDTVCR_4510_EMULATION

diff --git a/cfgfile.cpp b/cfgfile.cpp
index 8bc710a0c901f6db2832079f3ef7055249173211..1665b5c392ccdd10cdbb7c2c043be75b0871d19f 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -39,7 +39,6 @@
 #include "luascript.h"
 #endif
 #include "ethernet.h"
-#include "native2amiga_api.h"
 #include "ini.h"
 #ifdef WITH_SPECIALMONITORS
 #include "specialmonitors.h"

diff --git a/cia.cpp b/cia.cpp
index 355f3af5d0714ccac2468de430434ad5bbf73775..bbe303f23db52aa4790db71d1bbbd2714981e235 100644 (file)
--- a/cia.cpp
+++ b/cia.cpp
@@ -23,7 +23,6 @@
 #include "serial.h"
 #endif
 #include "disk.h"
-#include "xwin.h"
 #include "keybuf.h"
 #include "gui.h"
 #include "savestate.h"
@@ -41,7 +40,6 @@
 #endif
 #include "audio.h"
 #include "keyboard.h"
-#include "uae.h"
 #ifdef AMAX
 #include "amax.h"
 #endif

diff --git a/consolehook.cpp b/consolehook.cpp
index 023fbe9edef330188e41d0556ba5a0a9a4ba3d22..06659fb0ba1b50c341973f5d5edd6a5f97675874 100644 (file)
--- a/consolehook.cpp
+++ b/consolehook.cpp
@@ -4,7 +4,6 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "memory.h"
 #include "execlib.h"
 #include "disk.h"
 #include "rommgr.h"

diff --git a/cpuboard.cpp b/cpuboard.cpp
index de95dd5f6b2ff20f782b759cc757bfd9b3d19520..18ad78048758e20d963186257015c794f10f5398 100644 (file)
--- a/cpuboard.cpp
+++ b/cpuboard.cpp
@@ -33,8 +33,6 @@
 #include "uae/ppc.h"
 #endif
 #include "uae/vm.h"
-#include "idecontrollers.h"
-#include "scsi.h"
 #include "cpummu030.h"
 #include "devices.h"
 #include "a2091.h"

diff --git a/cpummu30.cpp b/cpummu30.cpp
index 5eba3697f7817d17dab93a26f4a14739b4307969..941f0acd410217d73c19f7aa841dcb209101e2dd 100644 (file)
--- a/cpummu30.cpp
+++ b/cpummu30.cpp
@@ -36,7 +36,6 @@
 #include "newcpu.h"
 #include "debug.h"
 #include "cpummu030.h"
-#include "cputbl.h"
 #include "savestate.h"
 
 // Prefetch mode and prefetch bus error: always flush and refill prefetch pipeline

diff --git a/custom.cpp b/custom.cpp
index 18d88d4b3d0d1f9b45c5933fbea600fa5bd2ec44..347a6100bf9e230dd683e9e27de057db2a1c44a0 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -19,9 +19,7 @@
 
 #include "options.h"
 #include "uae.h"
-#include "gensound.h"
 #include "audio.h"
-#include "sounddep/sound.h"
 #include "events.h"
 #include "memory.h"
 #include "custom.h"
@@ -50,7 +48,6 @@
 #ifdef WITH_LUA
 #include "luascript.h"
 #endif
-#include "crc32.h"
 #include "devices.h"
 #include "rommgr.h"
 #ifdef WITH_SPECIALMONITORS

diff --git a/debug.cpp b/debug.cpp
index c53154b7b18c07f5ae9b9436cb930f5acb361680..e105fb18b120a81eae681269d0d872f8596f4677 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -19,14 +19,12 @@
 #include "memory.h"
 #include "custom.h"
 #include "newcpu.h"
-#include "cpu_prefetch.h"
 #include "debug.h"
 #include "disasm.h"
 #include "debugmem.h"
 #include "cia.h"
 #include "xwin.h"
 #include "identify.h"
-#include "audio.h"
 #include "sounddep/sound.h"
 #include "disk.h"
 #include "savestate.h"
@@ -54,7 +52,6 @@
 #include "blitter.h"
 #include "ini.h"
 #include "readcpu.h"
-#include "cputbl.h"
 #include "keybuf.h"
 
 static int trace_mode;

diff --git a/devices.cpp b/devices.cpp
index f1d3308ffd8baf305f65a183bfae82029717836b..c9ec3682464886e3fb1eeece491e521989b12066 100644 (file)
--- a/devices.cpp
+++ b/devices.cpp
@@ -67,8 +67,6 @@
 #ifdef AVIOUTPUT
 #include "videograb.h"
 #endif
-#include "rommgr.h"
-#include "newcpu.h"
 #ifdef WITH_MIDIEMU
 #include "midiemu.h"
 #endif

diff --git a/disk.cpp b/disk.cpp
index a8afdd31a83c0ddd9c4bdc1fdb06b34d6d5a7494..da92c5574c3948ccd795c25c412e031074885364 100644 (file)
--- a/disk.cpp
+++ b/disk.cpp
@@ -33,8 +33,6 @@ int disk_debug_track = -1;
 #include "gui.h"
 #include "zfile.h"
 #include "newcpu.h"
-#include "osemu.h"
-#include "execlib.h"
 #include "savestate.h"
 #include "cia.h"
 #include "debug.h"

diff --git a/draco.cpp b/draco.cpp
index 2b5f01c067e12c7bd10a0037c0ba6e52f0cc05e9..fbb8e989b995035db1b0e5055452168a692d147b 100644 (file)
--- a/draco.cpp
+++ b/draco.cpp
@@ -9,7 +9,6 @@
 
 #ifdef WITH_DRACO
 #include "options.h"
-#include "uae.h"
 #include "memory.h"
 #include "newcpu.h"
 #include "devices.h"
@@ -19,7 +18,6 @@
 #include "ncr_scsi.h"
 #include "draco.h"
 #include "zfile.h"
-#include "keybuf.h"
 #include "rommgr.h"
 #include "disk.h"
 

diff --git a/drawing.cpp b/drawing.cpp
index f939ddba4d25dd091c3a90fa079298becd467b2c..79e44865d2b07d1c8676f23c262a298415d5bf74 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -22,9 +22,7 @@
 #include "uae.h"
 #include "memory.h"
 #include "custom.h"
-#include "newcpu.h"
 #include "xwin.h"
-#include "autoconf.h"
 #include "gui.h"
 #include "picasso96.h"
 #include "drawing.h"

diff --git a/driveclick.cpp b/driveclick.cpp
index f8e31a8a46d48ff8b9c44a87764ad2459f4c230a..5c4262a008f309b0f990eecfe9ad8d73b79f1c73 100644 (file)
--- a/driveclick.cpp
+++ b/driveclick.cpp
@@ -16,8 +16,6 @@
 #include "audio.h"
 #include "sounddep/sound.h"
 #include "zfile.h"
-#include "fsdb.h"
-#include "events.h"
 #include "driveclick.h"
 
 static struct drvsample drvs[4][DS_END];

diff --git a/enforcer.cpp b/enforcer.cpp
index 7eddaa388a3e1691a6d29185d3eefd5d775a757c..8eecf77eaddb734baf7cf324901d5a90bf8de4f6 100644 (file)
--- a/enforcer.cpp
+++ b/enforcer.cpp
@@ -13,7 +13,6 @@
 
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
 #include "newcpu.h"
 #include "uae.h"
 #include "xwin.h"

diff --git a/epsonprinter.cpp b/epsonprinter.cpp
index f3ffc00f1b1e713769c835989ac76c106ae5beee..86aa796e6e0e3203f59d6e07753ba8cd62c9122e 100644 (file)
--- a/epsonprinter.cpp
+++ b/epsonprinter.cpp
@@ -30,7 +30,6 @@
 #define C_LIBPNG
 
 #include "epsonprinter.h"
-#include "win32.h"
 #include "parser.h"
 #include "threaddep/thread.h"
 #include "uae/io.h"

diff --git a/ethernet.cpp b/ethernet.cpp
index 9b374c2ca1067c898669527cc5d8025760d7dd86..f4078b6adea6bbced7663221c77f73ebab455156 100644 (file)
--- a/ethernet.cpp
+++ b/ethernet.cpp
@@ -8,7 +8,6 @@
 #endif
 #include "threaddep/thread.h"
 #include "options.h"
-#include "traps.h"
 #include "sana2.h"
 #include "uae/slirp.h"
 #include "gui.h"

diff --git a/events.cpp b/events.cpp
index 7652bc30b630a572beb487b1434724f0c79f1c7e..304d23cb944aea7d23e155d071a70167e2b6ba8f 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -13,17 +13,11 @@
 
 #include "options.h"
 #include "events.h"
-#include "memory.h"
-#include "newcpu.h"
 #ifdef WITH_PPC
 #include "uae/ppc.h"
 #endif
 #include "xwin.h"
-#ifdef WITH_X86
-#include "x86.h"
-#endif
 #include "audio.h"
-#include "cia.h"
 #include "custom.h"
 
 extern uae_u8 agnus_hpos;

diff --git a/expansion.cpp b/expansion.cpp
index b555e59fa5188995f56a062f1d9fcdaef812c294..f4493b72181a829c13523033221f24ad7f43e13f 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -13,11 +13,8 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "uae.h"
-#include "traps.h"
 #include "memory.h"
 #include "rommgr.h"
-#include "custom.h"
 #include "newcpu.h"
 #include "savestate.h"
 #include "zfile.h"
@@ -58,7 +55,6 @@
 #ifdef WITH_SPECIALMONITORS
 #include "specialmonitors.h"
 #endif
-#include "inputdevice.h"
 #ifdef WITH_PCI
 #include "pci.h"
 #endif

diff --git a/filesys.cpp b/filesys.cpp
index f8eb3b6ef94ab6026299d43a43ce04b458c2a8fd..b791d2d023196672babf23fe347638e643564e64 100644 (file)
--- a/filesys.cpp
+++ b/filesys.cpp
@@ -31,7 +31,6 @@
 #include "uae.h"
 #include "memory.h"
 #include "custom.h"
-#include "events.h"
 #include "newcpu.h"
 #include "filesys.h"
 #include "autoconf.h"
@@ -44,15 +43,7 @@
 #include "zarchive.h"
 #include "gui.h"
 #include "gayle.h"
-#include "idecontrollers.h"
 #include "savestate.h"
-#ifdef A2091
-#include "a2091.h"
-#endif
-#ifdef NCR
-#include "ncr_scsi.h"
-#endif
-#include "cdtv.h"
 #include "sana2.h"
 #include "bsdsocket.h"
 #include "uaeresource.h"
@@ -68,7 +59,6 @@
 #include "tabletlibrary.h"
 #include "cia.h"
 #include "picasso96.h"
-#include "cpuboard.h"
 #include "rommgr.h"
 #include "debug.h"
 #include "debugmem.h"

diff --git a/flashrom.cpp b/flashrom.cpp
index 220e8ecb2f302414be91810ec622da046e6f8ec0..9417681c15457c7d27d4bdbc771ceab5317fed1f 100644 (file)
--- a/flashrom.cpp
+++ b/flashrom.cpp
@@ -14,8 +14,6 @@
 #include "options.h"
 #include "zfile.h"
 #include "flashrom.h"
-#include "memory.h"
-#include "newcpu.h"
 #include "debug.h"
 #include "gui.h"
 

diff --git a/fpp.cpp b/fpp.cpp
index 13d54a2899d0d5a2553262f603f29853e1d9ef3d..e1ce8baa893d48f5b9d87d766dbd253ebf11ad17 100644 (file)
--- a/fpp.cpp
+++ b/fpp.cpp
@@ -22,15 +22,9 @@
 
 #include "options.h"
 #include "memory.h"
-#include "uae/attributes.h"
-#include "uae/vm.h"
-#include "custom.h"
-#include "events.h"
 #include "newcpu.h"
 #include "fpp.h"
 #include "savestate.h"
-#include "cpu_prefetch.h"
-#include "cpummu.h"
 #include "cpummu030.h"
 #include "debug.h"
 #include "uae.h"

diff --git a/fpp_softfloat.cpp b/fpp_softfloat.cpp
index 150788cf308ef8aa076d3bdcb1cfd9a9d7e5c5d2..baa1ffda5c384dc259a8ff6dc0cd006f384e5e87 100644 (file)
--- a/fpp_softfloat.cpp
+++ b/fpp_softfloat.cpp
@@ -22,7 +22,6 @@
 #include "memory.h"
 #include "newcpu.h"
 #include "fpp.h"
-#include "newcpu.h"
 
 #include "softfloat/softfloat-macros.h"
 #include "softfloat/softfloat-specialize.h"

diff --git a/framebufferboards.cpp b/framebufferboards.cpp
index 00dc53838c2a434fae92b1bb076d10329b1a375a..ae8c5c4112e6faeb8e8766861045377b32102299 100644 (file)
--- a/framebufferboards.cpp
+++ b/framebufferboards.cpp
@@ -16,7 +16,6 @@
 #include "custom.h"
 #include "picasso96.h"
 #include "gfxboard.h"
-#include "statusline.h"
 #include "rommgr.h"
 #include "framebufferboards.h"
 #include "xwin.h"

diff --git a/fsdb.cpp b/fsdb.cpp
index cf27ba966c8ab100c876f946ab9fbd10ee371908..d340c124b0e236fe7c33329039eca924d7a0f0ee 100644 (file)
--- a/fsdb.cpp
+++ b/fsdb.cpp
@@ -11,15 +11,7 @@
 #include "sysdeps.h"
 
 #include "options.h"
-#include "uae.h"
-#include "traps.h"
 #include "memory.h"
-#include "custom.h"
-#include "newcpu.h"
-#include "filesys.h"
-#include "autoconf.h"
-#include "fsusage.h"
-#include "scsidev.h"
 #include "fsdb.h"
 #include "uae/io.h"
 

diff --git a/gayle.cpp b/gayle.cpp
index c13d56bdcc5bf8332c710b31fd0ff32c2b3e8017..b5fb11d0830504b631d8e2922d41e16bf362a49a 100644 (file)
--- a/gayle.cpp
+++ b/gayle.cpp
@@ -22,17 +22,10 @@
 #include "gayle.h"
 #include "savestate.h"
 #include "uae.h"
-#include "gui.h"
-#include "threaddep/thread.h"
-#ifdef A2091
-#include "a2091.h"
-#endif
 #include "ncr_scsi.h"
 #include "ncr9x_scsi.h"
-#include "blkdev.h"
 #include "scsi.h"
 #include "ide.h"
-#include "idecontrollers.h"
 #ifdef WITH_PCI
 #include "pci_hw.h"
 #endif

diff --git a/genblitter.cpp b/genblitter.cpp
index 51b94c1d07c76bed74e1e9f14f49c80c9fdabac6..e9f89018f2be4b175c9f5e275f42c1d325ab2ce7 100644 (file)
--- a/genblitter.cpp
+++ b/genblitter.cpp
@@ -39,7 +39,6 @@ static void generate_func(void)
     printf("#include \"sysconfig.h\"\n");
     printf("#include \"sysdeps.h\"\n");
     printf("#include \"options.h\"\n");
-    printf("#include \"custom.h\"\n");
     printf("#include \"memory.h\"\n");
     printf("#include \"blitter.h\"\n");
     printf("#include \"blitfunc.h\"\n\n");

diff --git a/gfxboard.cpp b/gfxboard.cpp
index fcdb343a1bb703e36ea1df6d5ed653bcb184c6e2..677ce2e2e33b4abf7e71ec5e6e975bb5b1282aae 100644 (file)
--- a/gfxboard.cpp
+++ b/gfxboard.cpp
@@ -53,7 +53,6 @@ static bool memlogw = true;
 #include "rommgr.h"
 #include "zfile.h"
 #include "gfxboard.h"
-#include "rommgr.h"
 #include "xwin.h"
 #include "devices.h"
 #include "gfxfilter.h"
@@ -62,7 +61,6 @@ static bool memlogw = true;
 #include "pci_hw.h"
 #include "pcem/pcemglue.h"
 #include "qemuvga/qemuuaeglue.h"
-#include "qemuvga/vga.h"
 #include "draco.h"
 #include "autoconf.h"
 

diff --git a/gfxutil.cpp b/gfxutil.cpp
index fcaf04eb4ed64b2ae5e94619e76e26f729191a55..245c995a838c0126d0d00ce0640428b820b6bca2 100644 (file)
--- a/gfxutil.cpp
+++ b/gfxutil.cpp
@@ -12,7 +12,6 @@
 #include "custom.h"
 #include "rtgmodes.h"
 #include "xwin.h"
-#include "gfxfilter.h"
 #include "machdep/maccess.h"
 
 #include <math.h>

diff --git a/hardfile.cpp b/hardfile.cpp
index 9f2165d85c9caa21e72c452fda623f48b6c547d3..17703b60eed6cce4d3752a097653c2f80407f9c1 100644 (file)
--- a/hardfile.cpp
+++ b/hardfile.cpp
@@ -13,9 +13,7 @@
 #include "threaddep/thread.h"
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
 #include "newcpu.h"
-#include "disk.h"
 #include "autoconf.h"
 #include "traps.h"
 #include "filesys.h"

diff --git a/idecontrollers.cpp b/idecontrollers.cpp
index b2ef4e8b880f75af53acc0fb90f0dbe4764f7600..7d764658f007525fb1275ad33a36f07378eace65 100644 (file)
--- a/idecontrollers.cpp
+++ b/idecontrollers.cpp
@@ -13,15 +13,11 @@
 
 #include "memory.h"
 #include "newcpu.h"
-#include "uae.h"
-#include "gui.h"
 #include "filesys.h"
-#include "threaddep/thread.h"
 #include "debug.h"
 #include "ide.h"
 #include "idecontrollers.h"
 #include "zfile.h"
-#include "custom.h"
 #include "rommgr.h"
 #include "cpuboard.h"
 #include "scsi.h"

diff --git a/identify.cpp b/identify.cpp
index 3048ef6c12683a950883e33708b8598227867fa3..e17084d180db4d88abbca43a80906e92c8555cdb 100644 (file)
--- a/identify.cpp
+++ b/identify.cpp
@@ -11,7 +11,6 @@
 #ifdef DEBUGGER
 
 #include "options.h"
-#include "memory.h"
 #include "identify.h"
 
 const struct mem_labels int_labels[] =

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 9b9367c76c87dd9a3c74d9028d0eb5944316da1c..32d7744e45d1e9a3b4fc1c83eea30282d3f6fd15 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -44,13 +44,11 @@
 #include "ar.h"
 #include "gui.h"
 #include "disk.h"
-#include "audio.h"
 #include "sounddep/sound.h"
 #include "savestate.h"
 #ifdef ARCADIA
 #include "arcadia.h"
 #endif
-#include "zfile.h"
 #include "cia.h"
 #include "autoconf.h"
 #ifdef WITH_X86

diff --git a/inputrecord.cpp b/inputrecord.cpp
index 383e6259f676a05d19758747dc00ef73d02ced9a..70f486c213ac64136c3776ec022ef9d987802531 100644 (file)
--- a/inputrecord.cpp
+++ b/inputrecord.cpp
@@ -21,7 +21,6 @@
 #include "zfile.h"
 #include "custom.h"
 #include "savestate.h"
-#include "cia.h"
 #include "events.h"
 #include "uae.h"
 #include "disk.h"

diff --git a/keybuf.cpp b/keybuf.cpp
index 7a00032e4b7c218d5d4dc28ca526212ff37be80c..f6d4bc036ab7bb3b837c8fb9a3195f006a8d3ea5 100644 (file)
--- a/keybuf.cpp
+++ b/keybuf.cpp
@@ -18,10 +18,8 @@
 
 #include "options.h"
 #include "keybuf.h"
-#include "keyboard.h"
 #include "inputdevice.h"
 #include "custom.h"
-#include "savestate.h"
 
 int key_swap_hack2 = false;
 

diff --git a/luascript.cpp b/luascript.cpp
index c134f1dedaa6b00fa2e7dee5220db6f6a3ee01e5..4dead1093342c5426d71e994d1a580bb211fd9d7 100644 (file)
--- a/luascript.cpp
+++ b/luascript.cpp
@@ -13,8 +13,6 @@
 #endif
 
 #include "options.h"
-#include "savestate.h"
-#include "memory.h"
 #include "debug.h"
 #include "identify.h"
 #include "luascript.h"

diff --git a/main.cpp b/main.cpp
index bc730f73955bf31d0d1ee855c0634084a62f5e7b..12aec9651042f36a060f6174aaaade83c21e36ef 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -30,18 +30,14 @@
 #include "gui.h"
 #include "zfile.h"
 #include "autoconf.h"
-#include "picasso96.h"
 #include "native2amiga.h"
 #include "savestate.h"
-#include "filesys.h"
 #include "blkdev.h"
 #include "consolehook.h"
 #include "gfxboard.h"
 #ifdef WITH_LUA
 #include "luascript.h"
 #endif
-#include "uaenative.h"
-#include "tabletlibrary.h"
 #include "cpuboard.h"
 #ifdef WITH_PPC
 #include "uae/ppc.h"

diff --git a/memory.cpp b/memory.cpp
index e1cf7e90db8b32a125549230114eed91658061ce..eee381093456feff3c38d1f9c41864cdf56d8609 100644 (file)
--- a/memory.cpp
+++ b/memory.cpp
@@ -18,10 +18,8 @@
 #include "uae.h"
 #include "memory.h"
 #include "rommgr.h"
-#include "ersatz.h"
 #include "zfile.h"
 #include "custom.h"
-#include "events.h"
 #include "newcpu.h"
 #include "autoconf.h"
 #include "savestate.h"
@@ -36,17 +34,14 @@
 #ifdef ENFORCER
 #include "enforcer.h"
 #endif
-#include "threaddep/thread.h"
 #include "gayle.h"
 #include "debug.h"
 #include "debugmem.h"
-#include "gfxboard.h"
 #include "cpuboard.h"
 #ifdef WITH_PPC
 #include "uae/ppc.h"
 #endif
 #include "devices.h"
-#include "inputdevice.h"
 #ifdef WITH_DRACO
 #include "draco.h"
 #endif