diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index a196d148f78..01aff07b4da 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -55,6 +55,7 @@ class a2bus_agat7flop_device: public a2bus_floppy_device
 public:
 	a2bus_agat7flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -63,6 +64,7 @@ class a2bus_agat9flop_device: public a2bus_floppy_device
 public:
 	a2bus_agat9flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index a282d75ea01..3d24babe0a3 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -27,11 +27,10 @@ class diskiing_device:
 	public device_t,
 	public device_a2bus_card_interface
 {
-public:
+protected:
 	// construction/destruction
 	diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a2bus/a2iwm.cpp b/src/devices/bus/a2bus/a2iwm.cpp
index 07d72144539..9e61ac28daa 100644
--- a/src/devices/bus/a2bus/a2iwm.cpp
+++ b/src/devices/bus/a2bus/a2iwm.cpp
@@ -12,10 +12,12 @@
 *********************************************************************/
 
 #include "emu.h"
-#include "formats/ap2_dsk.h"
-#include "machine/applefdintf.h"
 #include "a2iwm.h"
 
+#include "machine/applefdintf.h"
+#include "formats/ap2_dsk.h"
+
+
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
diff --git a/src/devices/bus/a2bus/a2iwm.h b/src/devices/bus/a2bus/a2iwm.h
index 89e89926eeb..3f0fe974d3a 100644
--- a/src/devices/bus/a2bus/a2iwm.h
+++ b/src/devices/bus/a2bus/a2iwm.h
@@ -27,11 +27,10 @@ class a2bus_iwm_device:
 	public device_t,
 	public device_a2bus_card_interface
 {
-public:
+protected:
 	// construction/destruction
 	a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
index 9c64e10c4a6..c399325024b 100644
--- a/src/devices/bus/centronics/epson_lx810l.h
+++ b/src/devices/bus/centronics/epson_lx810l.h
@@ -139,6 +139,7 @@ public:
 	// construction/destruction
 	epson_ap2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// optional information overrides
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
diff --git a/src/devices/machine/iwm.h b/src/devices/machine/iwm.h
index 6bb48f5043b..7ef2b8a4b4c 100644
--- a/src/devices/machine/iwm.h
+++ b/src/devices/machine/iwm.h
@@ -5,14 +5,14 @@
     Apple IWM floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_IWM_H
 #define MAME_MACHINE_IWM_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/devices/machine/swim1.h b/src/devices/machine/swim1.h
index ce47069516f..86d064a19ae 100644
--- a/src/devices/machine/swim1.h
+++ b/src/devices/machine/swim1.h
@@ -5,14 +5,14 @@
     Apple SWIM1 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM1_H
 #define MAME_MACHINE_SWIM1_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/devices/machine/swim2.h b/src/devices/machine/swim2.h
index 6a29a51356e..dc729fe533e 100644
--- a/src/devices/machine/swim2.h
+++ b/src/devices/machine/swim2.h
@@ -5,14 +5,14 @@
     Apple SWIM2 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM2_H
 #define MAME_MACHINE_SWIM2_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/devices/machine/swim3.h b/src/devices/machine/swim3.h
index 076a612377c..6e353dc9740 100644
--- a/src/devices/machine/swim3.h
+++ b/src/devices/machine/swim3.h
@@ -5,14 +5,14 @@
     Apple SWIM3 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM3_H
 #define MAME_MACHINE_SWIM3_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/mame/audio/mw8080bw.h b/src/mame/audio/mw8080bw.h
index 6e481a5248d..371781db4ca 100644
--- a/src/mame/audio/mw8080bw.h
+++ b/src/mame/audio/mw8080bw.h
@@ -304,12 +304,12 @@ private:
 class zzzap_common_audio_device : public device_t
 {
 public:
-	zzzap_common_audio_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, void (*netlist)(netlist::nlparse_t &));
-
 	void p1_w(u8 data);
 	void p2_w(u8 data);
 
 protected:
+	zzzap_common_audio_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, void (*netlist)(netlist::nlparse_t &));
+
 	virtual void device_add_mconfig(machine_config &config) override;
 	virtual ioport_constructor device_input_ports() const override;
 	virtual void device_start() override;
diff --git a/src/mame/drivers/generalplus_gpl_unknown.cpp b/src/mame/drivers/generalplus_gpl_unknown.cpp
index bc5d3d772b1..4436a674e45 100644
--- a/src/mame/drivers/generalplus_gpl_unknown.cpp
+++ b/src/mame/drivers/generalplus_gpl_unknown.cpp
@@ -24,11 +24,12 @@ this is logical for unSP2.0 based devices as the CS area typically starts at 0x2
 
 #include "emu.h"
 
-#include "screen.h"
-#include "emupal.h"
-#include "speaker.h"
 #include "cpu/unsp/unsp.h"
 
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
 
 class pcp8718_state : public driver_device
 {
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index c0ebd0daed5..b9a1484c70b 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -1,34 +1,43 @@
 // license:BSD-3-Clause
 // copyright-holders:Nicola Salmoria
 /***************************************************************************
-Seicross memory map (preliminary)
 driver by Nicola Salmoria
+
+Seicross memory map (preliminary)
+
 0000-77ff ROM
 7800-7fff RAM
 9000-93ff videoram
 9c00-9fff colorram
+
 Read:
 A000      Joystick + Players start button
 A800      player #2 controls + coin + ?
 B000      test switches
 B800      watchdog reset
+
 Write:
 8820-887f Sprite ram
 9800-981f Scroll control
 9880-989f ? (always 0?)
+
 I/O ports:
 0         8910 control
 1         8910 write
 4         8910 read
+
 There is a microcontroller on the board. Nichibutsu custom part marked
 NSC81050-102  8127 E37 and labeled No. 00363.  It's a 40-pin IC at location 4F
 on the (Seicross-) board. Looks like it is linked to the dips (and those are
 on a very small daughterboard).
+
 Differences in new/old version of Frisky Tom
 - The lady wears bikini in new version
 - Game config is backed up by 4.5v battery in old version
 - Old version uses larger board
+
 This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html
+
 ***************************************************************************/
 
 #include "emu.h"
diff --git a/src/mame/machine/swim.h b/src/mame/machine/swim.h
index 53e565b2234..017a9258ece 100644
--- a/src/mame/machine/swim.h
+++ b/src/mame/machine/swim.h
@@ -8,10 +8,11 @@
     early Macs
 
 *********************************************************************/
-
 #ifndef MAME_MACHINE_SWIM_H
 #define MAME_MACHINE_SWIM_H
 
+#pragma once
+
 #include "machine/applefdc.h"