diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index 0ca31ea0958..11ab65620e8 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -376,7 +376,7 @@ void midway_ssio_device::ssio_map(address_map &map)
 //  default ports map
 //-------------------------------------------------
 
-void midway_ssio_device::ssio_input_ports(address_map &map, const char *ssio) const
+void midway_ssio_device::ssio_input_ports(address_map &map, const char *ssio)
 {
 	map(0x00, 0x04).mirror(0x18).r(ssio, FUNC(midway_ssio_device::ioport_read));
 	map(0x07, 0x07).mirror(0x18).r(ssio, FUNC(midway_ssio_device::read));
diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h
index ec381cbde11..bf1eea38f8e 100644
--- a/src/mame/audio/midway.h
+++ b/src/mame/audio/midway.h
@@ -67,7 +67,7 @@ public:
 	DECLARE_READ8_MEMBER(data_r);
 
 	void ssio_map(address_map &map);
-	void ssio_input_ports(address_map &map, const char *ssio) const;
+	static void ssio_input_ports(address_map &map, const char *ssio);
 
 protected:
 	// device-level overrides
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index 69b2a888cd4..2829eaa061b 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -707,7 +707,7 @@ void mcr_state::cpu_90009_portmap(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	m_ssio->ssio_input_ports(map, "ssio");
+	midway_ssio_device::ssio_input_ports(map, "ssio");
 	map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
 	map(0xe8, 0xe8).nopw();
 	map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@@ -736,7 +736,7 @@ void mcr_state::cpu_90010_portmap(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	m_ssio->ssio_input_ports(map, "ssio");
+	midway_ssio_device::ssio_input_ports(map, "ssio");
 	map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
 	map(0xe8, 0xe8).nopw();
 	map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@@ -766,7 +766,7 @@ void mcr_state::cpu_91490_portmap(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	m_ssio->ssio_input_ports(map, "ssio");
+	midway_ssio_device::ssio_input_ports(map, "ssio");
 	map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
 	map(0xe8, 0xe8).nopw();
 	map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index 03bd561b0e5..1f8f0c0affc 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -526,7 +526,7 @@ void mcr3_state::spyhunt_portmap(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	m_ssio->ssio_input_ports(map, "ssio");
+	midway_ssio_device::ssio_input_ports(map, "ssio");
 	map(0x84, 0x86).w(FUNC(mcr3_state::spyhunt_scroll_value_w));
 	map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
 	map(0xe8, 0xe8).nopw();
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 5626956f200..7daa25411eb 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -5,6 +5,10 @@
     Bally Astrocade-based hardware
 
 ***************************************************************************/
+#ifndef MAME_INCLUDES_ASTROCDE_H
+#define MAME_INCLUDES_ASTROCDE_H
+
+#pragma once
 
 #include "cpu/z80/z80.h"
 #include "machine/bankdev.h"
@@ -32,8 +36,8 @@ public:
 		TIMER_SCANLINE
 	};
 
-	astrocde_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+	astrocde_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_votrax(*this, "votrax"),
 		m_astrocade_sound1(*this, "astrocade1"),
@@ -181,9 +185,9 @@ protected:
 class seawolf2_state : public astrocde_state
 {
 public:
-	seawolf2_state(const machine_config &mconfig, device_type type, const char *tag)
-		: astrocde_state(mconfig, type, tag)
-		, m_samples(*this, "samples")
+	seawolf2_state(const machine_config &mconfig, device_type type, const char *tag) :
+		astrocde_state(mconfig, type, tag),
+		m_samples(*this, "samples")
 	{ }
 
 	void seawolf2(machine_config &config);
@@ -203,9 +207,9 @@ private:
 class ebases_state : public astrocde_state
 {
 public:
-	ebases_state(const machine_config &mconfig, device_type type, const char *tag)
-		: astrocde_state(mconfig, type, tag)
-		, m_trackball(*this, {"TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1"})
+	ebases_state(const machine_config &mconfig, device_type type, const char *tag) :
+		astrocde_state(mconfig, type, tag),
+		m_trackball(*this, {"TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1"})
 	{ }
 
 	void ebases(machine_config &config);
@@ -242,10 +246,10 @@ private:
 class tenpindx_state : public astrocde_state
 {
 public:
-	tenpindx_state(const machine_config &mconfig, device_type type, const char *tag)
-		: astrocde_state(mconfig, type, tag)
-		, m_subcpu(*this, "sub")
-		, m_lamps(*this, "lamp%0", 0U)
+	tenpindx_state(const machine_config &mconfig, device_type type, const char *tag) :
+		astrocde_state(mconfig, type, tag),
+		m_subcpu(*this, "sub"),
+		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
 	void tenpindx(machine_config &config);
@@ -263,3 +267,5 @@ private:
 	required_device<z80_device> m_subcpu;
 	output_finder<19> m_lamps;
 };
+
+#endif // MAME_INCLUDES_ASTROCDE_H