Harmonized the style of including headers from headers.

We surely don't care about some file I/O on host machines in 2018 ;-)

include/ace.h

@@ -45,9 +45,7 @@
 
 
 
-#ifndef _STDDEF_H
 #include <stddef.h>
-#endif
 
 
 

include/apple2.h

@@ -41,9 +41,10 @@
 #  error This module may only be used when compiling for the Apple ][!
 #endif
 
-
 #include <apple2_filetype.h>
 
+
+
 /*****************************************************************************/
 /*                                   Data                                    */
 /*****************************************************************************/

include/apple2enh.h

@@ -42,10 +42,7 @@
 
 
 
-/* If not already done, include the apple2.h header file */
-#if !defined(_APPLE2_H)
-#  include <apple2.h>
-#endif
+#include <apple2.h>
 
 
 

include/atari.h

@@ -355,5 +355,7 @@ struct __iocb {
 #define IOCB_GETCWD      0x30  /* get current directory (MyDOS/SpartaDOS) */
 #define IOCB_FORMAT      0xFE  /* format */
 
+
+
 /* End of atari.h */
 #endif

include/atari2600.h

@@ -8,9 +8,13 @@
 /*                                                                           */
 /*****************************************************************************/
 
+
+
 #ifndef _ATARI2600_H
 #define _ATARI2600_H
 
+
+
 /* Check for errors */
 #if !defined(__ATARI2600__)
 #  error This module may only be used when compiling for the Atari 2600!
@@ -22,5 +26,7 @@
 #include <_riot.h>
 #define RIOT (*(struct __riot*)0x0280)
 
+
+
 /* End of atari2600.h */
-#endif /* #ifndef _ATARI2600_H */
+#endif

include/c16.h

@@ -47,9 +47,7 @@
 
 /* Include the base header file for the 264 series. include file.
  */
-#ifndef _CBM264_H
 #include <cbm264.h>
-#endif
 
 
 

include/cbm.h

@@ -46,10 +46,7 @@
 
 
 /* We need NULL. */
-
-#if !defined(_STDDEF_H)
-#  include <stddef.h>
-#endif
+#include <stddef.h>
 
 /* Load the system-specific files here, if needed. */
 #if   defined(__C64__)    && !defined(_C64_H)

include/geos.h

@@ -19,53 +19,19 @@
 
 
 
-#ifndef _GCONST_H
 #include <geos/gconst.h>
-#endif
-
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
-
-#ifndef _GSYM_H
 #include <geos/gsym.h>
-#endif
-
-#ifndef _GDISK_H
 #include <geos/gdisk.h>
-#endif
-
-#ifndef _GFILE_H
 #include <geos/gfile.h>
-#endif
-
-#ifndef _GPROCESS_H
 #include <geos/gprocess.h>
-#endif
-
-#ifndef _GGRAPH_H
 #include <geos/ggraph.h>
-#endif
-
-#ifndef _GMENU_H
 #include <geos/gmenu.h>
-#endif
-
-#ifndef _GSPRITE_H
 #include <geos/gsprite.h>
-#endif
-
-#ifndef _GMEMORY_H
 #include <geos/gmemory.h>
-#endif
-
-#ifndef _GSYS_H
 #include <geos/gsys.h>
-#endif
-
-#ifndef _GDLGBOX_H
 #include <geos/gdlgbox.h>
-#endif
+
 
 
 #define CH_ULCORNER             '+'
@@ -140,5 +106,6 @@
 #define JOY_BTN_1_MASK          0x10
 
 
+
 /* End of geos.h */
 #endif

include/geos/gdisk.h

@@ -7,9 +7,7 @@
 #ifndef _GDISK_H
 #define _GDISK_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 char __fastcall__ ReadBuff(struct tr_se *myTrSe);
 char __fastcall__ WriteBuff(struct tr_se *myTrSe);

include/geos/gfile.h

@@ -7,9 +7,7 @@
 #ifndef _GFILE_H
 #define _GFILE_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 struct filehandle *Get1stDirEntry(void);
 struct filehandle *GetNxtDirEntry(void);

include/geos/ggraph.h

@@ -7,9 +7,7 @@
 #ifndef _GGRAPH_H
 #define _GGRAPH_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 void __fastcall__ SetPattern(char newpattern);
 

include/geos/gmemory.h

@@ -7,9 +7,7 @@
 #ifndef _GMEMORY_H
 #define _GMEMORY_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 void __fastcall__ CopyString(char *dest, const char *source);
 char __fastcall__ CmpString(const char *dest, const char *source);

include/geos/gmenu.h

@@ -7,9 +7,7 @@
 #ifndef _GMENU_H
 #define _GMENU_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 void __fastcall__ DoMenu(struct menu *myMenu);
 void ReDoMenu(void);

include/geos/gprocess.h

@@ -7,9 +7,7 @@
 #ifndef _GPROCESS_H
 #define _GPROCESS_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 void __fastcall__ InitProcesses(char number, struct process *proctab);
 void __fastcall__ RestartProcess(char number);

include/geos/gsym.h

@@ -7,9 +7,7 @@
 #ifndef _GSYM_H
 #define _GSYM_H
 
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
 
 #define r0              (*(unsigned*)(R_BASE + 0x00))
 #define r0L             (*(char*)(R_BASE + 0x00))

include/lynx.h

@@ -123,6 +123,8 @@ extern void lynx_160_102_16_tgi[];    /* Referred to by tgi_static_stddrv[] */
 /*                           Sound support                                   */
 /*****************************************************************************/
 
+
+
 void lynx_snd_init (void);
 /* Initialize the sound driver */
 
@@ -144,6 +146,8 @@ void __fastcall__ lynx_snd_stop_channel (unsigned char channel);
 unsigned char lynx_snd_active(void);
 /* Show which channels are active */
 
+
+
 /*****************************************************************************/
 /*                           Accessing the cart                              */
 /*****************************************************************************/
@@ -209,5 +213,6 @@ unsigned __fastcall__ lynx_eewrite (unsigned cell, unsigned val);
 #define SUZY        (*(struct __suzy*)0xFC00)
 
 
+
 /* End of lynx.h */
 #endif

include/plus4.h

@@ -47,9 +47,7 @@
 
 /* Include the base header file for the 264 series. include file.
  */
-#ifndef _CBM264_H
 #include <cbm264.h>
-#endif
 
 /* Define hardware */
 #include <_6551.h>

include/stdio.h

@@ -38,12 +38,8 @@
 
 
 
-#ifndef _STDDEF_H
-#  include <stddef.h>
-#endif
-#ifndef _STDARG_H
-#  include <stdarg.h>
-#endif
+#include <stddef.h>
+#include <stdarg.h>
 
 
 
@@ -147,6 +143,3 @@ void __fastcall__ _poserror (const char* msg);          /* cc65 */
 
 /* End of stdio.h */
 #endif
-
-
-