diff --git a/src/devices/machine/k054321.cpp b/src/devices/machine/k054321.cpp
index 54c32172b37..cd28b50f65c 100644
--- a/src/devices/machine/k054321.cpp
+++ b/src/devices/machine/k054321.cpp
@@ -69,6 +69,11 @@ void k054321_device::set_gain_devices(const char *_left, const char *_right)
 
 void k054321_device::device_start()
 {
+	save_item(NAME(m_main1));
+	save_item(NAME(m_main2));
+	save_item(NAME(m_sound1));
+	save_item(NAME(m_volume));
+	save_item(NAME(m_active));
 }
 
 READ8_MEMBER( k054321_device::main1_r)
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index 18856353a59..0f9d136d3ba 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -252,7 +252,6 @@ maybe some sprite placement issues
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6809/hd6309.h"
 #include "cpu/z80/z80.h"
-#include "machine/gen_latch.h"
 #include "machine/eepromser.h"
 #include "sound/k054539.h"
 #include "screen.h"
diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h
index 37f992d9998..239f8812235 100644
--- a/src/mame/includes/gijoe.h
+++ b/src/mame/includes/gijoe.h
@@ -6,7 +6,6 @@
 
 *************************************************************************/
 
-#include "machine/gen_latch.h"
 #include "sound/k054539.h"
 #include "video/k053251.h"
 #include "video/k054156_k054157_k056832.h"
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index f81c65aa3af..aa7bd468cbf 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -7,7 +7,6 @@
 *************************************************************************/
 #include "sound/okim6295.h"
 #include "sound/k054539.h"
-#include "machine/gen_latch.h"
 #include "machine/k053252.h"
 #include "video/k053251.h"
 #include "video/k054156_k054157_k056832.h"
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index bebbcfa2130..fecfcf683e2 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -4,7 +4,6 @@
 #include "includes/konamigx.h"
 #include "video/k053246_k053247_k055673.h"
 
-#include "machine/gen_latch.h"
 #include "sound/k054539.h"
 #include "machine/k053252.h"
 #include "video/k055555.h"
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 6ea4c211117..601f121e17d 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -7,7 +7,6 @@
 *************************************************************************/
 
 #include "sound/k054539.h"
-#include "machine/gen_latch.h"
 #include "machine/k053252.h"
 #include "video/k053246_k053247_k055673.h"
 #include "video/k053936.h"
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 17280344111..5dc6d0568f5 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -9,7 +9,6 @@
 #include "video/k053250.h"
 #include "sound/flt_vol.h"
 #include "sound/k054539.h"
-#include "machine/gen_latch.h"
 #include "machine/k053252.h"
 #include "video/k054156_k054157_k056832.h"
 #include "video/k053246_k053247_k055673.h"