Include guards on our headers

src/include/86box/bswap.h

@@ -34,6 +34,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef BSWAP_H
 # define BSWAP_H
 

src/include/86box/cassette.h

@@ -170,4 +170,4 @@ extern int		cassette_ui_writeprot;
 extern const device_t	cassette_device;
 
 
-#endif
+#endif /*PCE_IBMPC_CASSETTE_H*/

src/include/86box/cdrom_image.h

@@ -1,6 +1,7 @@
 /* Copyright holders: RichardG867, Tenshi
    see COPYING for more details
 */
+
 #ifndef CDROM_IMAGE_H
 # define CDROM_IMAGE_H
 
@@ -23,4 +24,4 @@ extern void cdrom_set_null_handler(uint8_t id);
 }
 #endif
 
-#endif /* ! CDROM_IMAGE_H */
+#endif /*CDROM_IMAGE_H*/

src/include/86box/cdrom_image_backend.h

@@ -19,6 +19,7 @@
  *		Copyright 2017-2020 Fred N. van Kempen.
  *		Copyright 2002-2020 The DOSBox Team.
  */
+
 #ifndef CDROM_IMAGE_BACKEND_H
 # define CDROM_IMAGE_BACKEND_H
 
@@ -93,4 +94,4 @@ extern int	cdi_has_audio_track(cd_img_t *cdi);
 
 
 
-#endif /* ! CDROM_IMAGE_BACKEND_H */
+#endif /*CDROM_IMAGE_BACKEND_H*/

src/include/86box/filters.h

@@ -1,3 +1,6 @@
+#ifndef EMU_FILTERS_H
+# define EMU_FILTERS_H
+
 #define NCoef 2
 
 /* fc=150Hz */
@@ -399,3 +402,5 @@ static inline double low_fir_sb16(int c, int i, double NewSample)
                         
         return out;
 }
+
+#endif /*EMU_FILTERS_H*/

src/include/86box/flash.h

@@ -14,6 +14,9 @@
  *		Copyright 2020 Miran Grca.
  */
 
+#ifndef EMU_FLASH_H
+# define EMU_FLASH_H
+
 extern const device_t catalyst_flash_device;
 
 extern const device_t intel_flash_bxt_ami_device;
@@ -26,3 +29,5 @@ extern const device_t winbond_flash_w29c020_device;
 extern const device_t sst_flash_39sf010_device;
 extern const device_t sst_flash_39sf020_device;
 extern const device_t sst_flash_39sf040_device;
+
+#endif /*EMU_FLASH_H*/

src/include/86box/hdc_ide_sff8038i.h

@@ -16,6 +16,9 @@
  *		Copyright 2016-2020 Miran Grca.
  */
 
+#ifndef EMU_HDC_IDE_SFF8038I_H
+# define EMU_HDC_IDE_SFF8038I_H
+
 typedef struct
 {
     uint8_t	command, status,
@@ -56,3 +59,5 @@ extern void	sff_set_irq_mode(sff8038i_t *dev, int channel, int irq_mode);
 extern void	sff_set_irq_pin(sff8038i_t *dev, int irq_pin);
 
 extern void	sff_set_irq_level(sff8038i_t *dev, int channel, int irq_level);
+
+#endif /*EMU_HDC_IDE_SFF8038I_H*/

src/include/86box/i82335.h

@@ -1 +1,6 @@
+#ifndef EMU_I82335_H
+# define EMU_I82335_H
+
 extern void i82335_init(void);
+
+#endif /*EMU_I82335_H*/

src/include/86box/ibm_5161.h

@@ -12,4 +12,9 @@
  *		Copyright 2016-2018 Miran Grca.
  */
 
+#ifndef EMU_IBM_5161_H
+# define EMU_IBM_5161_H
+
 extern const device_t ibm_5161_device;
+
+#endif /*EMU_IBM_5151_H*/

src/include/86box/isamem.h

@@ -44,8 +44,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef ISAMEM_H
+
-# define ISAMEM_H
+#ifndef EMU_ISAMEM_H
+# define EMU_ISAMEM_H
 
 
 #define ISAMEM_MAX	4			/* max #cards in system */
@@ -74,4 +75,4 @@ extern const device_t	*isamem_get_device(int t);
 #endif
 
 
-#endif	/*ISAMEM_H*/
+#endif	/*EMU_ISAMEM_H*/

src/include/86box/isapnp.h

@@ -14,6 +14,7 @@
  *
  *		Copyright 2021 RichardG.
  */
+
 #ifndef EMU_ISAPNP_H
 # define EMU_ISAPNP_H
 # include <stdint.h>

src/include/86box/isartc.h

@@ -44,8 +44,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef ISARTC_H
+
-# define ISARTC_H
+#ifndef EMU_ISARTC_H
+# define EMU_ISARTC_H
 
 
 #ifdef __cplusplus
@@ -67,4 +68,4 @@ extern const device_t	*isartc_get_device(int t);
 #endif
 
 
-#endif	/*ISARTC_H*/
+#endif	/*EMU_ISARTC_H*/

src/include/86box/joystick_ch_flightstick_pro.h

@@ -35,4 +35,9 @@
  *   USA.
  */
 
+#ifndef EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
+# define EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
+
 extern const joystick_if_t joystick_ch_flightstick_pro;
+
+#endif /*EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H*/

src/include/86box/joystick_standard.h

@@ -35,6 +35,9 @@
  *   USA.
  */
 
+#ifndef EMU_JOYSTICK_STANDARD_H
+# define EMU_JOYSTICK_STANDARD_H
+
 extern const joystick_if_t joystick_2axis_2button;
 extern const joystick_if_t joystick_2axis_4button;
 extern const joystick_if_t joystick_3axis_2button;
@@ -42,3 +45,5 @@ extern const joystick_if_t joystick_3axis_4button;
 extern const joystick_if_t joystick_4axis_4button;
 extern const joystick_if_t joystick_2axis_6button;
 extern const joystick_if_t joystick_2axis_8button;
+
+#endif /*EMU_JOYSTICK_STANDARD_H*/

src/include/86box/joystick_sw_pad.h

@@ -35,4 +35,9 @@
  *   USA.
  */
 
+#ifndef EMU_JOYSTICK_SW_PAD_H
+# define EMU_JOYSTICK_SW_PAD_H
+
 extern const joystick_if_t joystick_sw_pad;
+
+#endif /*EMU_JOYSTICK_SW_PAD_H*/

src/include/86box/joystick_tm_fcs.h

@@ -35,4 +35,9 @@
  *   USA.
  */
 
+#ifndef EMU_JOYSTICK_TM_FCS_H
+# define EMU_JOYSTICK_TM_FCS_H
+
 extern const joystick_if_t joystick_tm_fcs;
+
+#endif /*EMU_JOYSTICK_TM_FCS_H*/

src/include/86box/keyboard.h

@@ -18,6 +18,7 @@
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2017-2019 Fred N. van Kempen.
  */
+
 #ifndef EMU_KEYBOARD_H
 # define EMU_KEYBOARD_H
 

src/include/86box/language.h

@@ -16,6 +16,7 @@
  *
  *		Copyright 2017,2018 Fred N. van Kempen.
  */
+
 #ifndef LANG_UAGE_H
 # define LANG_UAGE_H
 

src/include/86box/log.h

@@ -16,6 +16,7 @@
  *		Copyright 2021 Miran Grca.
  *		Copyright 2021 Fred N. van Kempen.
  */
+
 #ifndef EMU_LOG_H
 # define EMU_LOG_H
 

src/include/86box/m_amstrad.h

@@ -16,6 +16,10 @@
  *
  *		Copyright 2008-2019 Sarah Walker.
  */
+
+#ifndef MACHINE_AMSTRAD_H
+# define MACHINE_AMSTRAD_H
+
 extern int amstrad_latch;
 
 enum
@@ -24,3 +28,5 @@ enum
     AMSTRAD_SW9,
     AMSTRAD_SW10
 };
+
+#endif /*MACHINE_AMSTRAD.H*/

src/include/86box/m_at_t3100e.h

@@ -36,6 +36,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef MACHINE_T3100E_H
 # define MACHINE_T3100E_H
 

src/include/86box/m_xt_t1000.h

@@ -36,6 +36,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef MACHINE_T1000_H
 # define MACHINE_T1000_H
 

src/include/86box/m_xt_xi8088.h

@@ -1,3 +1,6 @@
+#ifndef MACHINE_XI80888_H
+# define MACHINE_XI80888_H
+
 #include <86box/device.h>
 
 extern const device_t xi8088_device;
@@ -6,3 +9,5 @@ uint8_t xi8088_turbo_get();
 void xi8088_turbo_set(uint8_t value);
 void xi8088_bios_128kb_set(int val);
 int xi8088_bios_128kb();
+
+#endif /*MACHINE_XI80888_H*/

src/include/86box/machine.h

@@ -18,6 +18,7 @@
  *		Copyright 2016-2020 Miran Grca.
  *		Copyright 2017-2020 Fred N. van Kempen.
  */
+
 #ifndef EMU_MACHINE_H
 # define EMU_MACHINE_H
 

src/include/86box/mca.h

@@ -1,3 +1,6 @@
+#ifndef EMU_MCA_H
+# define EMU_MCA_H
+
 extern void mca_init(int nr_cards);
 extern void mca_add(uint8_t (*read)(int addr, void *priv), void (*write)(int addr, uint8_t val, void *priv), uint8_t (*feedb)(void *priv), void (*reset)(void *priv), void *priv);
 extern void mca_set_index(int index);
@@ -7,3 +10,5 @@ extern uint8_t mca_feedb(void);
 extern void mca_reset(void);
 
 extern void ps2_cache_clean(void);
+
+#endif /*EMU_MCA_H*/

src/include/86box/mem.h

@@ -18,6 +18,7 @@
  *		Copyright 2017-2020 Fred N. van Kempen.
  *		Copyright 2016-2020 Miran Grca.
  */
+
 #ifndef EMU_MEM_H
 # define EMU_MEM_H
 

src/include/86box/midi_rtmidi.h

@@ -1,3 +1,6 @@
+#ifndef EMU_SOUND_RTMIDI_H
+# define EMU_SOUND_RTMIDI_H
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -11,3 +14,5 @@ extern void	rtmidi_in_get_dev_name(int num, char *s);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /*EMU_SOUND_RTMIDI*/

src/include/86box/mo.h

@@ -17,10 +17,10 @@
  *
  *		Copyright 2020 Miran Grca.
  */
+
 #ifndef EMU_MO_H
 # define EMU_MO_H
 
-
 #define MO_NUM			  4
 
 #define BUF_SIZE 32768

src/include/86box/mouse.h

@@ -16,10 +16,10 @@
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2017-2019 Fred N. van Kempen.
  */
+
 #ifndef EMU_MOUSE_H
 # define EMU_MOUSE_H
 
-
 #define MOUSE_TYPE_NONE		0	/* no mouse configured */
 #define MOUSE_TYPE_INTERNAL	1	/* machine has internal mouse */
 #define MOUSE_TYPE_LOGIBUS	2	/* Logitech/ATI Bus Mouse */

src/include/86box/net_3c503.h

@@ -3,5 +3,4 @@
 
 extern const device_t	threec503_device;
 
-
 #endif	/*NET_3C503_H*/

src/include/86box/net_dp8390.h

@@ -16,6 +16,7 @@
  *		Copyright 2016-2018 Miran Grca.
  *		Copyright 2008-2018 Bochs project.
  */
+
 #ifndef NET_DP8390_H
 # define NET_DP8390_H
 

src/include/86box/net_ne2000.h

@@ -32,6 +32,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef NET_NE2000_H
 # define NET_NE2000_H
 

src/include/86box/net_pcnet.h

@@ -16,6 +16,7 @@
  *		Copyright 2004-2019 Antony T Curtis
  *		Copyright 2016-2019 Miran Grca.
  */
+
 #ifndef NET_PCNET_H
 # define NET_PCNET_H
 

src/include/86box/net_plip.h

@@ -13,6 +13,7 @@
  * Author:	RichardG, <richardg867@gmail.com>
  *		Copyright 2020 RichardG.
  */
+
 #ifndef NET_PLIP_H
 # define NET_PLIP_H
 # include <86box/device.h>

src/include/86box/net_wd8003.h

@@ -40,6 +40,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef NET_WD8003_H
 # define NET_WD8003_H
 

src/include/86box/network.h

@@ -44,6 +44,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef EMU_NETWORK_H
 # define EMU_NETWORK_H
 # include <stdint.h>

src/include/86box/nmi.h

@@ -1,6 +1,10 @@
 /* Copyright holders: Sarah Walker
    see COPYING for more details
 */
+
+#ifndef EMU_NMI_H
+# define EMU_NMI_H
+
 extern int nmi_mask;
 extern int nmi;
 extern int nmi_auto_clear;
@@ -9,3 +13,5 @@ extern int nmi_auto_clear;
 extern void nmi_init(void);
 
 extern void nmi_write(uint16_t port, uint8_t val, void *p);
+
+#endif /*EMU_NMI_H*/

src/include/86box/nvr.h

@@ -46,6 +46,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef EMU_NVR_H
 # define EMU_NVR_H
 

src/include/86box/nvr_ps2.h

@@ -34,6 +34,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
+
 #ifndef EMU_NVRPS2_H
 # define EMU_NVRPS2_H
 

src/include/86box/pci.h

@@ -18,10 +18,10 @@
  *		Copyright 2017-2020 Fred N. van Kempen.
  *		Copyright 2008-2020 Sarah Walker.
  */
+
 #ifndef EMU_PCI_H
 # define EMU_PCI_H
 
-
 #define PCI_REG_COMMAND 0x04
 
 #define PCI_COMMAND_IO  0x01

src/include/86box/pci_dummy.h

@@ -1 +1,6 @@
+#ifndef EMU_PCI_DUMMY_H
+# define EMU_PCI_DUMMY_H
+
 extern void pci_dummy_init(void);
+
+#endif /*EMU_PCI_DUMMY_H*/

src/include/86box/pic.h

@@ -15,10 +15,10 @@
  *		Copyright 2015-2020 Andrew Jenner.
  *		Copyright 2016-2020 Miran Grca.
  */
+
 #ifndef EMU_PIC_H
 # define EMU_PIC_H
 
-
 typedef struct pic {
     uint8_t	icw1, icw2, icw3, icw4,
 		imr, isr, irr, ocw2,

src/include/86box/pit.h

@@ -14,6 +14,7 @@
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2019,2020 Miran Grca.
  */
+
 #ifndef EMU_PIT_H
 # define EMU_PIT_H
 

src/include/86box/plat.h

@@ -17,6 +17,7 @@
  *		Copyright 2017-2019 Fred N. van Kempen.
  *		Copyright 2021 Laci bá'
  */
+
 #ifndef EMU_PLAT_H
 # define EMU_PLAT_H
 

src/include/86box/plat_dir.h

@@ -13,10 +13,10 @@
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2017 Fred N. van Kempen.
  */
+
 #ifndef PLAT_DIR_H
 # define PLAT_DIR_H
 
-
 #ifdef _MAX_FNAME
 # define MAXNAMLEN	_MAX_FNAME
 #else

src/include/86box/plat_dynld.h

@@ -13,10 +13,10 @@
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2017 Fred N. van Kempen
  */
+
 #ifndef PLAT_DYNLD_H
 # define PLAT_DYNLD_H
 
-
 typedef struct {
     const char	*name;
     void	*func;

src/include/86box/png_struct.h

@@ -44,6 +44,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef EMU_PNG_STRUCT_H
 # define EMU_PNG_STRUCT_H
 

src/include/86box/port_6x.h

@@ -15,10 +15,10 @@
  *
  *		Copyright 2021 Miran Grca.
  */
+
 #ifndef EMU_PORT_6X_H
 # define EMU_PORT_6X_H
 
-
 #ifdef _TIMER_H_
 typedef struct
 {

src/include/86box/port_92.h

@@ -15,6 +15,7 @@
  *
  *		Copyright 2019 Miran Grca.
  */
+
 #ifndef EMU_PORT_92_H
 # define EMU_PORT_92_H
 

src/include/86box/postcard.h

@@ -14,10 +14,10 @@
  *
  *		Copyright 2020 RichardG.
  */
+
 #ifndef POSTCARD_H
 # define POSTCARD_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/include/86box/printer.h

@@ -44,10 +44,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef PRINTER_H
 # define PRINTER_H
 
-
 #define FONT_FILE_DOTMATRIX	"dotmatrix.ttf"
 
 #define FONT_FILE_ROMAN		"roman.ttf"

src/include/86box/prt_devs.h

@@ -1,3 +1,8 @@
+#ifndef EMU_PRT_DEVS_H
+# define EMU_PRT_DEVS_H
+
 extern const lpt_device_t	lpt_prt_text_device;
 extern const lpt_device_t	lpt_prt_escp_device;
 extern const lpt_device_t	lpt_prt_ps_device;
+
+#endif /*EMU_PRT_DEVS_H*/

src/include/86box/random.h

@@ -14,12 +14,11 @@
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016,2017 Miran Grca.
  */
+
 #ifndef EMU_RANDOM_H
 # define EMU_RANDOM_H
 
-
 extern uint8_t	random_generate(void);
 extern void	random_init(void);
 
-
 #endif	/*EMU_RANDOM_H*/

src/include/86box/resource.h

@@ -19,10 +19,10 @@
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2018,2019 David Hrdlička.
  */
+
 #ifndef WIN_RESOURCE_H
 # define WIN_RESOURCE_H
 
-
 /* Dialog IDs. */
 #define DLG_ABOUT				101	/* top-level dialog */
 #define DLG_STATUS				102	/* top-level dialog */

src/include/86box/rom.h

@@ -13,10 +13,10 @@
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2018,2019 Fred N. van Kempen.
  */
+
 #ifndef EMU_ROM_H
 # define EMU_ROM_H
 
-
 #define FLAG_INT	1
 #define FLAG_INV	2
 #define FLAG_AUX	4

src/include/86box/scsi_aha154x.h

@@ -10,5 +10,4 @@ extern const device_t aha1640_device;
 
 extern	void aha_device_reset(void *p);
 
-  
 #endif	/*SCSI_AHA154X_H*/

src/include/86box/scsi_buslogic.h

@@ -19,7 +19,6 @@
 #ifndef SCSI_BUSLOGIC_H
 # define SCSI_BUSLOGIC_H
 
-
 extern const device_t buslogic_542b_device;
 extern const device_t buslogic_545s_device;
 extern const device_t buslogic_542bh_device;
@@ -31,5 +30,4 @@ extern const device_t buslogic_958d_pci_device;
 
 extern	void BuslogicDeviceReset(void *p);
 
-  
 #endif	/*SCSI_BUSLOGIC_H*/

src/include/86box/scsi_cdrom.h

@@ -15,10 +15,10 @@
  *
  *		Copyright 2018,2019 Miran Grca.
  */
+
 #ifndef EMU_SCSI_CDROM_H
 #define EMU_SCSI_CDROM_H
 
-
 #define CDROM_TIME	10.0
 
 

src/include/86box/scsi_device.h

@@ -16,10 +16,10 @@
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2017-2019 Fred N. van Kempen.
  */
+
 #ifndef SCSI_DEVICE_H
 # define SCSI_DEVICE_H
 
-
 /* Configuration. */
 #define SCSI_BUS_MAX		4		/* currently we support up to 4 controllers */
 

src/include/86box/scsi_disk.h

@@ -12,6 +12,8 @@
  *		Copyright 2017,2018 Miran Grca.
  */
 
+#ifndef SCSI_DISK_H
+# define SCSI_DISK_H
 
 typedef struct {
     mode_sense_pages_t ms_pages_saved;
@@ -48,3 +50,5 @@ extern scsi_disk_t *scsi_disk[HDD_NUM];
 
 extern void	scsi_disk_hard_reset(void);
 extern void	scsi_disk_close(void);
+
+#endif /*SCSI_DISK_H*/

src/include/86box/scsi_ncr5380.h

@@ -20,10 +20,10 @@
  *		Copyright 2017-2018 TheCollector1995.
  *		Copyright 2017,2018 Fred N. van Kempen.
  */
+
 #ifndef SCSI_NCR5380_H
 # define SCSI_NCR5380_H
 
-
 extern const device_t scsi_lcs6821n_device;
 extern const device_t scsi_rt1000b_device;
 extern const device_t scsi_t128_device;
@@ -32,5 +32,4 @@ extern const device_t scsi_t130b_device;
 extern const device_t scsi_scsiat_device;
 #endif
 
-  
 #endif	/*SCSI_NCR5380_H*/

src/include/86box/scsi_ncr53c8xx.h

@@ -21,10 +21,10 @@
  *		Copyright 2009-2018 Artyom Tarasenko.
  *		Copyright 2017,2018 Miran Grca.
  */
+
 #ifndef SCSI_NCR53C8XX_H
 # define SCSI_NCR53C8XX_H
 
-
 extern const device_t ncr53c810_pci_device;
 extern const device_t ncr53c810_onboard_pci_device;
 extern const device_t ncr53c815_pci_device;

src/include/86box/scsi_pcscsi.h

@@ -25,9 +25,7 @@
 #ifndef SCSI_PCSCSI_H
 # define SCSI_PCSCSI_H
 
-
 extern const device_t dc390_pci_device;
 extern const device_t ncr53c90_mca_device;
 
-  
 #endif	/*SCSI_BUSLOGIC_H*/

src/include/86box/scsi_spock.h

@@ -17,6 +17,7 @@
  *		Copyright 2020 Sarah Walker.
  *		Copyright 2020 TheCollector1995.
  */
+
 #ifndef SCSI_SPOCK_H
 # define SCSI_SPOCK_H
 

src/include/86box/scsi_x54x.h

@@ -20,8 +20,8 @@
  *		Copyright 2016-2018 Miran Grca.
  *		Copyright 2017,2018 Fred N. van Kempen.
  */
-#ifndef SCSI_X54X_H
 
+#ifndef SCSI_X54X_H
 # define SCSI_X54X_H
 
 #define SCSI_DELAY_TM		1			/* was 50 */
@@ -511,5 +511,4 @@ extern void	*x54x_init(const device_t *info);
 extern void	x54x_close(void *priv);
 extern void	x54x_device_reset(void *priv);
 
-
 #endif

src/include/86box/serial.h

@@ -19,10 +19,10 @@
  *		Copyright 2016-2020 Miran Grca.
  *		Copyright 2017-2020 Fred N. van Kempen.
  */
+
 #ifndef EMU_SERIAL_H
 # define EMU_SERIAL_H
 
-
 #define SERIAL_8250			0
 #define SERIAL_8250_PCJR	1
 #define SERIAL_16450		2
@@ -101,5 +101,4 @@ extern const device_t	ns16750_device;
 extern const device_t	ns16850_device;
 extern const device_t	ns16950_device;
 
-
 #endif	/*EMU_SERIAL_H*/

src/include/86box/sio.h

@@ -11,10 +11,10 @@
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2017-2020 Fred N. van Kempen.
  */
+
 #ifndef EMU_SIO_H
 # define EMU_SIO_H
 
-
 extern void		vt82c686_sio_write(uint8_t addr, uint8_t val, void *priv);
 
 
@@ -83,5 +83,4 @@ extern const device_t	w83977tf_device;
 extern const device_t	w83977ef_device;
 extern const device_t	w83977ef_370_device;
 
-
 #endif	/*EMU_SIO_H*/

src/include/86box/smbus.h

@@ -14,6 +14,7 @@
  *
  *		Copyright 2020 RichardG.
  */
+
 #ifndef EMU_SMBUS_PIIX4_H
 # define EMU_SMBUS_PIIX4_H
 
@@ -66,5 +67,4 @@ extern const device_t via_smbus_device;
 extern const device_t ali7101_smbus_device;
 #endif
 
-
 #endif	/*EMU_SMBUS_PIIX4_H*/

src/include/86box/smbus_piix4.h

@@ -1,53 +0,0 @@
-/*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
- *		running old operating systems and software designed for IBM
- *		PC systems and compatibles from 1981 through fairly recent
- *		system designs based on the PCI bus.
- *
- *		This file is part of the 86Box distribution.
- *
-  *		Definitions for the generic PIIX4-compatible SMBus host controller.
- *
- *
- *
- * Authors:	RichardG, <richardg867@gmail.com>
- *
- *		Copyright 2020 RichardG.
- */
-#ifndef EMU_SMBUS_PIIX4_H
-# define EMU_SMBUS_PIIX4_H
-
-
-#define SMBUS_PIIX4_BLOCK_DATA_SIZE	32
-#define SMBUS_PIIX4_BLOCK_DATA_MASK	(SMBUS_PIIX4_BLOCK_DATA_SIZE - 1)
-
-
-enum {
-    SMBUS_PIIX4 = 0,
-    SMBUS_VIA
-};
-
-typedef struct {
-    uint32_t	local;
-    uint16_t	io_base;
-    int		clock;
-    double	bit_period;
-    uint8_t	stat, next_stat, ctl, cmd, addr,
-		data0, data1,
-		index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
-    pc_timer_t	response_timer;
-    void	*i2c;
-} smbus_piix4_t;
-
-
-extern void	smbus_piix4_remap(smbus_piix4_t *dev, uint16_t new_io_base, uint8_t enable);
-extern void	smbus_piix4_setclock(smbus_piix4_t *dev, int clock);
-
-
-#ifdef EMU_DEVICE_H
-extern const device_t piix4_smbus_device;
-extern const device_t via_smbus_device;
-#endif
-
-
-#endif	/*EMU_SMBUS_PIIX4_H*/

src/include/86box/smram.h

@@ -14,10 +14,10 @@
  *
  *		Copyright 2016-2020 Miran Grca.
  */
+
 #ifndef EMU_SMRAM_H
 # define EMU_SMRAM_H
 
-
 typedef struct _smram_
 {
     struct _smram_	*prev, *next;
@@ -62,5 +62,4 @@ extern void	smram_state_change(smram_t *smr, int smm, int flags);
 /* Enables or disables the use of a separate SMRAM for addresses below A0000. */
 extern void	smram_set_separate_smram(uint8_t set);
 
-
 #endif	/*EMU_SMRAM_H*/

src/include/86box/snd_ac97.h

@@ -14,9 +14,8 @@
  *
  *		Copyright 2021 RichardG.
  */
-#ifndef EMU_SND_AC97_H
+#ifndef SOUND_AC97_H
-# define EMU_SND_AC97_H
+# define SOUND_AC97_H
-
 
 #define AC97_VENDOR_ID(f, s, t, dev)	((((f) & 0xff) << 24) | (((s) & 0xff) << 16) | (((t) & 0xff) << 8) | ((dev) & 0xff))
 
@@ -153,5 +152,4 @@ extern const device_t	wm9701a_device;
 extern const device_t	ac97_via_device;
 #endif
 
-
+#endif /*SOUND_AC97_H*/
-#endif

src/include/86box/snd_ad1848.h

@@ -19,6 +19,9 @@
  *		Copyright 2021 RichardG.
  */
 
+#ifndef SOUND_AD1848_H
+# define SOUND_AD1848_H
+
 enum {
     AD1848_TYPE_DEFAULT = 0,
     AD1848_TYPE_CS4248,
@@ -66,3 +69,5 @@ extern void	ad1848_speed_changed(ad1848_t *ad1848);
 extern void	ad1848_filter_cd_audio(int channel, double *buffer, void *priv);
 
 extern void	ad1848_init(ad1848_t *ad1848, uint8_t type);
+
+#endif /*SOUND_AD1848_H*/

src/include/86box/snd_azt2316a.h

@@ -1 +1,6 @@
+#ifndef SOUND_AZT2316A_H
+# define SOUND_AZT2316A_H
+
 extern void azt2316a_enable_wss(uint8_t enable, void *p);
+
+#endif /*SOUND_AZT2316A*/

src/include/86box/snd_cms.h

@@ -1,5 +1,5 @@
-#ifndef SOUND_SND_CMS_H
+#ifndef SOUND_CMS_H
-# define SOUND_SND_CMS_H
+# define SOUND_CMS_H
 
 #include <stdint.h>
 #include <86box/sound.h>
@@ -32,4 +32,4 @@ extern void cms_update(cms_t *cms);
 extern void cms_write(uint16_t addr, uint8_t val, void *p);
 extern uint8_t cms_read(uint16_t addr, void *p);
 
-#endif	/*SOUND_SND_CMS_H*/
+#endif	/*SOUND_CMS_H*/

src/include/86box/snd_emu8k.h

@@ -1,3 +1,5 @@
+#ifndef SOUND_EMU8K_H
+# define SOUND_EMU8K_H
 
 /* All these defines are in samples, not in bytes. */
 #define EMU8K_MEM_ADDRESS_MASK 0xFFFFFF
@@ -776,3 +778,5 @@ Treble Parameters:
 0xD308  0xD308  0xD308  0xD308  0xD308  0xD308  0xD3019 0xD32A  0xD34C  0xD36E  0xD36E  0xD36E
 0x0001  0x0001  0x0001  0x0001  0x0001  0x0002  0x0002  0x0002  0x0002  0x0002  0x0002  0x0002
 */
+
+#endif /*SOUND_EMU8K_H*/

src/include/86box/snd_mpu401.h

@@ -19,6 +19,7 @@
  *		Copyright 2016-2020 Miran Grca.
  *		Copyright 2016-2020 TheCollector1995.
  */
+
 #ifndef SOUND_MPU401_H
 # define SOUND_MPU401_H
 
@@ -163,5 +164,4 @@ extern void	mpu401_irq_attach(mpu_t *mpu, void (*ext_irq_update)(void *priv, int
 extern int	MPU401_InputSysex(void *p, uint8_t *buffer, uint32_t len, int abort);
 extern void	MPU401_InputMsg(void *p, uint8_t *msg, uint32_t len);
 
-
 #endif	/*SOUND_MPU401_H*/

src/include/86box/snd_opl.h

@@ -17,7 +17,6 @@
 #ifndef SOUND_OPL_H
 # define SOUND_OPL_H
 
-
 typedef void	(*tmrfunc)(void *priv, int timer, uint64_t period);
 
 /* Define an OPLx chip. */
@@ -53,5 +52,4 @@ extern void	opl3_write(uint16_t port, uint8_t val, void *);
 extern void	opl3_init(opl_t *);
 extern void	opl3_update(opl_t *);
 
-
 #endif	/*SOUND_OPL_H*/

src/include/86box/snd_opl_nuked.h

@@ -16,6 +16,7 @@
  *		Copyright 2017-2020 Fred N. van Kempen.
  *		Copyright 2016-2019 Miran Grca.
  */
+
 #ifndef SOUND_OPL_NUKED_H
 # define SOUND_OPL_NUKED_H
 
@@ -31,5 +32,4 @@ extern void	nuked_generate(void *, int32_t *buf);
 extern void	nuked_generate_resampled(void *, int32_t *buf);
 extern void	nuked_generate_stream(void *, int32_t *sndptr, uint32_t num);
 
-
 #endif	/*SOUND_OPL_NUKED_H*/

src/include/86box/snd_resid.h

@@ -1,3 +1,6 @@
+#ifndef SOUND_RESID_H
+# define SOUND_RESID_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -10,3 +13,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+
+#endif /*SOUND_RESID_H*/

src/include/86box/snd_sn76489.h

@@ -1,3 +1,6 @@
+#ifndef SOUND_SN76489_H
+# define SOUND_SN76489_H
+
 enum
 {
         SN76496,
@@ -31,3 +34,5 @@ typedef struct sn76489_t
 
 void sn76489_init(sn76489_t *sn76489, uint16_t base, uint16_t size, int type, int freq);
 void sn74689_set_extra_divide(sn76489_t *sn76489, int enable);
+
+#endif /*SOUND_SN76489_H*/

src/include/86box/snd_speaker.h

@@ -16,6 +16,10 @@
  *		Copyright 2008-2019 Sarah Walker.
  *		Copyright 2016-2019 Miran Grca.
  */
+
+#ifndef SOUND_SPEAKER_H
+# define SOUND_SPEAKER_H
+
 extern int	speaker_mute;
 
 extern int	speaker_gated;
@@ -26,3 +30,5 @@ extern void	speaker_init();
 
 extern void	speaker_set_count(uint8_t new_m, int new_count);
 extern void	speaker_update(void);
+
+#endif /*SOUND_SPEAKER_H*/

src/include/86box/snd_ym7128.h

@@ -1,3 +1,6 @@
+#ifndef SOUND_YM7128_H
+# define SOUND_YM7128_H
+
 typedef struct ym7128_t
 {
         int a0, sci;
@@ -23,3 +26,5 @@ typedef struct ym7128_t
 void ym7128_init(ym7128_t *ym7128);
 void ym7128_write(ym7128_t *ym7128, uint8_t val);
 void ym7128_apply(ym7128_t *ym7128, int16_t *buffer, int len);
+
+#endif /*SOUND_YM7128_H*/

src/include/86box/spd.h

@@ -14,10 +14,10 @@
  *
  *		Copyright 2020 RichardG.
  */
+
 #ifndef EMU_SPD_H
 # define EMU_SPD_H
 
-
 #define SPD_BASE_ADDR		0x50
 #define SPD_MAX_SLOTS		8
 #define SPD_DATA_SIZE		256
@@ -110,5 +110,4 @@ extern void spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_
 extern void spd_write_drbs_interleaved(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit);
 extern void spd_write_drbs_ali1621(uint8_t *regs, uint8_t reg_min, uint8_t reg_max);
 
-
 #endif	/*EMU_SPD_H*/

src/include/86box/ui.h

@@ -19,7 +19,6 @@
 #ifndef EMU_UI_H
 # define EMU_UI_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -80,5 +79,4 @@ extern void	ui_sb_mt32lcd(char *str);
 }
 #endif
 
-
 #endif	/*EMU_UI_H*/

src/include/86box/unix_sdl.h

@@ -1,5 +1,6 @@
 #ifndef _UNIX_SDL_H
 # define _UNIX_SDL_H
+
 extern void	sdl_close(void);
 extern int	sdl_inits();
 extern int	sdl_inith();
@@ -9,4 +10,5 @@ extern void	sdl_resize(int x, int y);
 extern void	sdl_enable(int enable);
 extern void	sdl_set_fs(int fs);
 extern void	sdl_reload(void);
-#endif
+
+#endif /*_UNIX_SDL_H*/

src/include/86box/usb.h

@@ -14,6 +14,7 @@
  *
  *		Copyright 2020 Miran Grca.
  */
+
 #ifndef USB_H
 # define USB_H
 
@@ -44,5 +45,4 @@ extern void		ohci_update_mem_mapping(usb_t *dev, uint8_t base1, uint8_t base2, u
 }
 #endif
 
-
 #endif	/*USB_H*/

src/include/86box/vid_ati_eeprom.h

@@ -1,3 +1,6 @@
+#ifndef VIDEO_ATI_EEPROM_H
+# define VIDEO_ATI_EEPROM_H
+
 /* Copyright holders: Sarah Walker
    see COPYING for more details
 */
@@ -47,3 +50,5 @@ typedef struct ati_eeprom_t
 void ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type);
 void ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat);
 int ati_eeprom_read(ati_eeprom_t *eeprom);
+
+#endif /*VIDEO_ATI_EEPROM_H*/

src/include/86box/vid_cga.h

@@ -15,6 +15,7 @@
  *		Copyright 2008-2018 Sarah Walker.
  *		Copyright 2016-2018 Miran Grca.
  */
+
 #ifndef VIDEO_CGA_H
 # define VIDEO_CGA_H
 

src/include/86box/vid_cga_comp.h

@@ -16,6 +16,7 @@
  *		Copyright 2015-2018 reenigne.
  *		Copyright 2015-2018 Miran Grca.
  */
+
 #ifndef VIDEO_CGA_COMP_H
 # define VIDEO_CGA_COMP_H
 

src/include/86box/vid_colorplus.h

@@ -1,3 +1,6 @@
+#ifndef VIDEO_COLORPLUS_H
+# define VIDEO_COLORPLUS_H
+
 typedef struct colorplus_t
 {
 	cga_t cga;
@@ -13,3 +16,5 @@ void    colorplus_recalctimings(colorplus_t *colorplus);
 void    colorplus_poll(void *p);
 
 extern const device_t colorplus_device;
+
+#endif /*VIDEO_COLORPLUS_H*/

src/include/86box/vid_ddc.h

@@ -16,6 +16,7 @@
  *		Copyright 2008-2020 Sarah Walker.
  *		Copyright 2020 RichardG.
  */
+
 #ifndef EMU_VID_DDC_H
 # define EMU_VID_DDC_H
 

src/include/86box/vid_ega.h

@@ -17,6 +17,7 @@
  *		Copyright 2008-2020 Sarah Walker.
  *		Copyright 2016-2020 Miran Grca.
  */
+
 #ifndef VIDEO_EGA_H
 # define VIDEO_EGA_H
 
@@ -129,5 +130,4 @@ void ega_render_4bpp_lowres(ega_t *ega);
 void ega_render_4bpp_highres(ega_t *ega);
 #endif
 
-
 #endif	/*VIDEO_EGA_H*/

src/include/86box/vid_hercules.h

@@ -16,6 +16,7 @@
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2021 Jasmine Iwanek.
  */
+
 #ifndef VIDEO_HERCULES_H
 # define VIDEO_HERCULES_H
 

src/include/86box/vid_mda.h

@@ -1,6 +1,10 @@
 /* Copyright holders: Sarah Walker
    see COPYING for more details
 */
+
+#ifndef VIDEO_MDA_H
+# define VIDEO_MDA_H
+
 typedef struct mda_t
 {
         mem_mapping_t mapping;
@@ -38,3 +42,5 @@ void    mda_poll(void *p);
 #ifdef EMU_DEVICE_H
 extern const device_t mda_device;
 #endif
+
+#endif /*VIDEO_MDA_H*/

src/include/86box/vid_nga.h

@@ -22,6 +22,9 @@
  *		Copyright 2020 EngiNerd.
  */
 
+#ifndef VIDEO_NGA_H
+# define VIDEO_NGA_H
+
 typedef struct nga_t {
     cga_t cga;
 	/* unused in OGC, required for M19 video card structure idiom */
@@ -46,3 +49,5 @@ void    nga_mdaattr_rebuild();
 extern const device_config_t nga_config[];
 extern const device_t nga_device;
 #endif
+
+#endif /*VIDEO_NGA_H*/

src/include/86box/vid_ogc.h

@@ -22,6 +22,9 @@
  *		Copyright 2020 EngiNerd.
  */
 
+#ifndef VIDEO_OGC_H
+# define VIDEO_OGC_H
+
 typedef struct ogc_t {
     cga_t cga;
 	/* unused in OGC, required for M19 video card structure idiom */
@@ -46,3 +49,5 @@ void    ogc_mdaattr_rebuild();
 extern const device_config_t ogc_config[];
 extern const device_t ogc_device;
 #endif
+
+#endif /*VIDEO_OGC_H*/

src/include/86box/vid_pgc.h

@@ -19,7 +19,6 @@
 #ifndef VID_PGC_H
 # define VID_PGC_H
 
-
 #define PGC_ERROR_RANGE    0x01
 #define PGC_ERROR_INTEGER  0x02
 #define PGC_ERROR_MEMORY   0x03
@@ -181,5 +180,4 @@ extern int	pgc_result_coord(pgc_t *, int32_t val);
 extern void	pgc_hndl_lut8(pgc_t *);
 extern void	pgc_hndl_lut8rd(pgc_t *);
 
-
 #endif	/*VID_PGC_H*/

src/include/86box/vid_pgc_palette.h

@@ -16,6 +16,7 @@
  *		Copyright 2019 Fred N. van Kempen.
  *		Copyright 2019 John Elliott.
  */
+
 #ifndef VID_PGC_PALETTE_H
 # define VID_PGC_PALETTE_H
 
@@ -1575,5 +1576,4 @@
 		makecol(0x00,0x00,0x00),
 	},
 
-
 #endif	/*VID_PGC_PALETTE_H*/

src/include/86box/vid_svga.h

@@ -16,10 +16,10 @@
  *		Copyright 2008-2020 Sarah Walker.
  *		Copyright 2016-2020 Miran Grca.
  */
+
 #ifndef VIDEO_SVGA_H
 # define VIDEO_SVGA_H
 
-
 #define FLAG_EXTRA_BANKS	1
 #define	FLAG_ADDR_BY8		2
 #define FLAG_EXT_WRITE		4

src/include/86box/vid_svga_render.h

@@ -16,6 +16,9 @@
  *		Copyright 2016-2018 Miran Grca.
  */
 
+#ifndef VIDEO_SVGA_RENDER_H
+# define VIDEO_SVGA_RENDER_H
+
 extern int firstline_draw, lastline_draw;
 extern int displine;
 extern int sc;
@@ -66,3 +69,5 @@ void svga_render_RGBA8888_lowres(svga_t *svga);
 void svga_render_RGBA8888_highres(svga_t *svga);
 
 extern void (*svga_render)(svga_t *svga);
+
+#endif /*VID_SVGA_RENDER_H*/