diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index 1b006219629..a9a9b752b30 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -1658,7 +1658,7 @@ void trackfld_state::init_atlantol()
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	uint8_t *rom = memregion("maincpu")->base();
 
-	((konami1_device*)m_maincpu.target())->set_encryption_boundary(0x6000);
+	downcast<konami1_device &>(*m_maincpu).set_encryption_boundary(0x6000);
 
 	space.install_write_handler(0x0800, 0x0800, write8_delegate(FUNC(trackfld_state::atlantol_gfxbank_w),this));
 	space.nop_write(0x1000, 0x1000);
diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h
index 119c2242e0c..f1e8769f0b1 100644
--- a/src/mame/includes/20pacgal.h
+++ b/src/mame/includes/20pacgal.h
@@ -7,9 +7,15 @@
     driver by Nicola Salmoria
 
 ***************************************************************************/
+#ifndef MAME_INCLUDES_20PACGAL_H
+#define MAME_INCLUDES_20PACGAL_H
+
+#pragma once
+
 #include "machine/eepromser.h"
-#include "sound/namco.h"
 #include "machine/intelfsh.h"
+#include "sound/namco.h"
+#include "emupal.h"
 
 class _20pacgal_state : public driver_device
 {
@@ -93,9 +99,15 @@ public:
 		: _20pacgal_state(mconfig, type, tag)
 	{ }
 
-	DECLARE_READ8_MEMBER( _25pacman_io_87_r );
-	virtual void machine_start() override;
 	void _25pacman(machine_config &config);
+
+protected:
+	DECLARE_READ8_MEMBER( _25pacman_io_87_r );
+
+	virtual void machine_start() override;
+
 	void _25pacman_io_map(address_map &map);
 	void _25pacman_map(address_map &map);
 };
+
+#endif // MAME_INCLUDES_20PACGAL_H