Remove redundant #ifndef conditionals for includes

include/bios_disk.h

@@ -19,9 +19,7 @@
 #ifndef DOSBOX_BIOS_DISK_H
 #define DOSBOX_BIOS_DISK_H
 
-#ifndef DOSBOX_DOS_INC_H
 #include "dos_inc.h"
-#endif
 #include "logging.h"
 #include "../src/dos/cdrom.h"
 

include/callback.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_CALLBACK_H
 #define DOSBOX_CALLBACK_H
 
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif 
 
 typedef Bitu (*CallBack_Handler)(void);
 extern CallBack_Handler CallBack_Handlers[];

include/control.h

@@ -25,9 +25,7 @@
 //#pragma warning ( disable : 4290 )
 #endif
 
-#ifndef DOSBOX_PROGRAMS_H
 #include "programs.h"
-#endif
 #include "setup.h"
 
 class Config{

include/cpu.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_CPU_H
 #define DOSBOX_CPU_H
 
-#ifndef DOSBOX_REGS_H
 #include "regs.h"
-#endif
 
 #define CPU_AUTODETERMINE_NONE		0x00
 #define CPU_AUTODETERMINE_CORE		0x01

include/dos_inc.h

@@ -22,9 +22,7 @@
 
 #define CTBUF 127
 
-#ifndef DOSBOX_DOS_SYSTEM_H
+#include "dos_system.h"
-#include "dos_system.h"
-#endif
 
 #include <list>
 #include <stddef.h> //for offsetof

include/dos_system.h

@@ -20,16 +20,10 @@
 #ifndef DOSBOX_DOS_SYSTEM_H
 #define DOSBOX_DOS_SYSTEM_H
 
-#ifndef DOSBOX_CROSS_H
 #include "cross.h"
-#endif
 #include "string.h"
-#ifndef DOSBOX_SUPPORT_H
 #include "support.h"
-#endif
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif
 
 #define DOS_NAMELENGTH 12u
 #define DOS_NAMELENGTH_ASCII (DOS_NAMELENGTH+1)

include/ipx.h

@@ -33,9 +33,7 @@
 #endif
 #endif
 
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif
 
 // In Use Flag codes
 #define USEFLAG_AVAILABLE  0x00

include/mem.h

@@ -19,9 +19,7 @@
 #ifndef DOSBOX_MEM_H
 #define DOSBOX_MEM_H
 
-#ifndef DOSBOX_DOSBOX_H
 #include "dosbox.h"
-#endif
 
 #include "byteorder.h"
 

include/midi.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_MIDI_H
 #define DOSBOX_MIDI_H
 
-#ifndef DOSBOX_PROGRAMS_H
 #include "programs.h"
-#endif
 
 class MidiHandler {
 public:

include/paging.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_PAGING_H
 #define DOSBOX_PAGING_H
 
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif
 
 // disable this to reduce the size of the TLB
 // NOTE: does not work with the dynamic core (dynrec is fine)

include/parport.h

@@ -22,9 +22,7 @@
 // set to 1 for debug messages and debugging log:
 #define PARALLEL_DEBUG 0
 
-#ifndef DOSBOX_INOUT_H
 #include "inout.h"
-#endif
 
 #include "programs.h"
 

include/programs.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_PROGRAMS_H
 #define DOSBOX_PROGRAMS_H
 
-#ifndef DOSBOX_DOS_INC_H
 #include "dos_inc.h"
-#endif
 
 class CommandLine {
 public:

include/regs.h

@@ -19,9 +19,7 @@
 #ifndef DOSBOX_REGS_H
 #define DOSBOX_REGS_H
 
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif
 
 #define FLAG_CF		0x00000001U
 #define FLAG_PF		0x00000004U

include/serialport.h

@@ -20,12 +20,8 @@
 #ifndef DOSBOX_SERIALPORT_H
 #define DOSBOX_SERIALPORT_H
 
-#ifndef DOSBOX_INOUT_H
 #include "inout.h"
-#endif
-#ifndef DOSBOX_PROGRAMS_H
 #include "programs.h"
-#endif
 
 // set this to 1 for serial debugging in release mode
 #define SERIAL_DBG_FORCED 1

include/shell.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_SHELL_H
 #define DOSBOX_SHELL_H
 
-#ifndef DOSBOX_PROGRAMS_H
 #include "programs.h"
-#endif
 
 #include <SDL.h>
 #if SDL_VERSION_ATLEAST(2, 0, 0)

include/support.h

@@ -20,9 +20,7 @@
 #ifndef DOSBOX_SUPPORT_H
 #define DOSBOX_SUPPORT_H
 
-#ifndef DOSBOX_DOSBOX_H
 #include "dosbox.h"
-#endif
 
 #if defined (_MSC_VER)						/* MS Visual C++ */
 #define	strcasecmp(a,b) stricmp(a,b)

include/zip.h

@@ -46,9 +46,7 @@ extern "C" {
 
 //#define HAVE_BZIP2
 
-#ifndef _ZLIB_H
 #include "zlib.h"
-#endif
 
 #ifndef _ZLIBIOAPI_H
 #include "ioapi.h"

src/cpu/lazyflags.h

@@ -31,9 +31,7 @@ Bitu FillFlags(void);
 void FillFlagsNoCFOF(void);
 void DestroyConditionFlags(void);
 
-#ifndef DOSBOX_REGS_H
 #include "regs.h"
-#endif
 
 struct LazyFlags {
     GenReg32 var1,var2,res;