diff --git a/hash/challenge_gear_cart.xml b/hash/challenge_gear_cart.xml
index 0bc6ecec1a47a..164920cd3c847 100644
--- a/hash/challenge_gear_cart.xml
+++ b/hash/challenge_gear_cart.xml
@@ -54,10 +54,10 @@ Extra: Nihon kaitaku no tabi Game (日本かいたくの旅ゲーム）
 <softwarelist name="challenge_gear_cart" description="Benesse Challenge Gear cartridges">
 
 	<software name="6grade" supported="no">
-		<description>6th Grade: Dance Battle</description>
+		<description>Challenge 6-nensei</description>
 		<year>2003</year>
 		<publisher>Benesse Corporation</publisher>
-		<info name="alt_title" value="ダンスバトル" />
+		<info name="alt_title" value="チャレンジ6年生" />
 		<part name="cart" interface="challenge_gear_cart">
 			<dataarea name="rom" size="0x80000">
 				<rom name="MS040601.ic1" size="0x80000" crc="487ecb9c" sha1="bc89468aff7f06f1694eed17f15cab46c0d1638e" />
diff --git a/hash/sgi_mips.xml b/hash/sgi_mips.xml
index 15ccbd7307b69..78787dac49f9f 100644
--- a/hash/sgi_mips.xml
+++ b/hash/sgi_mips.xml
@@ -5826,7 +5826,7 @@ license:CC0-1.0
 
 	<!-- NetBSD -->
 
-	<software name="netbsd_1_6_2">
+	<software name="netbsd_1_6_2" supported="no">
 		<description>NetBSD 1.6.2</description>
 		<year>2004</year> <!-- 10/04 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5846,7 +5846,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_2_0" cloneof="netbsd_2_0_2">
+	<software name="netbsd_2_0" cloneof="netbsd_2_0_2" supported="no">
 		<description>NetBSD 2.0</description>
 		<year>2004</year> <!-- 12/04 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5866,7 +5866,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_2_0_2">
+	<software name="netbsd_2_0_2" supported="no">
 		<description>NetBSD 2.0.2</description>
 		<year>2005</year> <!-- 04/05 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5886,7 +5886,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_2_1">
+	<software name="netbsd_2_1" supported="no">
 		<description>NetBSD 2.1</description>
 		<year>2005</year> <!-- 10/04 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5906,7 +5906,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_3_0" cloneof="netbsd_3_0_2">
+	<software name="netbsd_3_0" cloneof="netbsd_3_0_2" supported="no">
 		<description>NetBSD 3.0</description>
 		<year>2005</year> <!-- 12/05 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5926,7 +5926,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2">
+	<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2" supported="no">
 		<description>NetBSD 3.0.1</description>
 		<year>2006</year> <!-- 07/06 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5946,7 +5946,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_3_0_2">
+	<software name="netbsd_3_0_2" supported="no">
 		<description>NetBSD 3.0.2</description>
 		<year>2006</year> <!-- 11/06 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5966,7 +5966,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_3_1">
+	<software name="netbsd_3_1" supported="no">
 		<description>NetBSD 3.1</description>
 		<year>2006</year> <!-- 11/06 -->
 		<publisher>The NetBSD Project</publisher>
@@ -5986,7 +5986,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_4_0" cloneof="netbsd_4_0_1">
+	<software name="netbsd_4_0" cloneof="netbsd_4_0_1" supported="no">
 		<description>NetBSD 4.0</description>
 		<year>2007</year> <!-- 12/07 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6006,7 +6006,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_4_0_1">
+	<software name="netbsd_4_0_1" supported="no">
 		<description>NetBSD 4.0.1</description>
 		<year>2008</year> <!-- 10/08 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6026,7 +6026,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_0" cloneof="netbsd_5_0_2">
+	<software name="netbsd_5_0" cloneof="netbsd_5_0_2" supported="no">
 		<description>NetBSD 5.0</description>
 		<year>2009</year> <!-- 04/09 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6046,7 +6046,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2">
+	<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2" supported="no">
 		<description>NetBSD 5.0.1</description>
 		<year>2009</year> <!-- 07/09 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6066,7 +6066,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_0_2">
+	<software name="netbsd_5_0_2" supported="no">
 		<description>NetBSD 5.0.2</description>
 		<year>2010</year> <!-- 02/10 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6086,7 +6086,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1" cloneof="netbsd_5_1_5">
+	<software name="netbsd_5_1" cloneof="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1</description>
 		<year>2010</year> <!-- 11/10 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6106,7 +6106,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5">
+	<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1.1</description>
 		<year>2012</year> <!-- 01/12 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6126,7 +6126,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5">
+	<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1.2</description>
 		<year>2012</year> <!-- 02/12 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6146,7 +6146,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5">
+	<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1.3</description>
 		<year>2013</year> <!-- 09/13 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6166,7 +6166,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5">
+	<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1.4</description>
 		<year>2014</year> <!-- 01/14 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6186,7 +6186,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_1_5">
+	<software name="netbsd_5_1_5" supported="no">
 		<description>NetBSD 5.1.5</description>
 		<year>2014</year> <!-- 11/14 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6206,7 +6206,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_2" cloneof="netbsd_5_2_3">
+	<software name="netbsd_5_2" cloneof="netbsd_5_2_3" supported="no">
 		<description>NetBSD 5.2</description>
 		<year>2012</year> <!-- 11/12 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6226,7 +6226,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3">
+	<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3" supported="no">
 		<description>NetBSD 5.2.1</description>
 		<year>2013</year> <!-- 09/13 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6246,7 +6246,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3">
+	<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3" supported="no">
 		<description>NetBSD 5.2.2</description>
 		<year>2014</year> <!-- 01/14 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6266,7 +6266,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_5_2_3">
+	<software name="netbsd_5_2_3" supported="no">
 		<description>NetBSD 5.2.3</description>
 		<year>2014</year> <!-- 11/14 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6286,7 +6286,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_6_0" cloneof="netbsd_6_0_3">
+	<software name="netbsd_6_0" cloneof="netbsd_6_0_3" supported="no">
 		<description>NetBSD 6.0</description>
 		<year>2012</year> <!-- 10/12 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6306,7 +6306,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3">
+	<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3" supported="no">
 		<description>NetBSD 6.0.1</description>
 		<year>2012</year> <!-- 12/12 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6326,7 +6326,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3">
+	<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3" supported="no">
 		<description>NetBSD 6.0.2</description>
 		<year>2013</year> <!-- 05/13 -->
 		<publisher>The NetBSD Project</publisher>
@@ -6346,7 +6346,7 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="netbsd_6_0_3">
+	<software name="netbsd_6_0_3" supported="no">
 		<description>NetBSD 6.0.3</description>
 		<year>2013</year> <!-- 09/13 -->
 		<publisher>The NetBSD Project</publisher>
diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index 5ddeddd6aa6d4..183a753d02fb5 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -54223,7 +54223,7 @@ Side B: Once Upon a Lily Pad
 	</software>
 
 	<software name="bruxolc_en_dm1" cloneof="bruxolc">
-		<description>Bruxólico (demo 1.0, English)</description>
+		<description>Bruxólico (English, demo 1.0)</description>
 		<year>2022</year>
 		<publisher>Amaweks</publisher>
 		<info name="language" value="English" />
@@ -54235,7 +54235,7 @@ Side B: Once Upon a Lily Pad
 	</software>
 
 	<software name="bruxolc_pt_dm1" cloneof="bruxolc">
-		<description>Bruxólico (demo 1.0, Portuguese)</description>
+		<description>Bruxólico (Portuguese, demo 1.0)</description>
 		<year>2022</year>
 		<publisher>Amaweks</publisher>
 		<info name="language" value="Portuguese (Brazil)" />
diff --git a/src/devices/cpu/dsp56156/inst.cpp b/src/devices/cpu/dsp56156/inst.cpp
index 339156aa35e84..c091659ba6785 100644
--- a/src/devices/cpu/dsp56156/inst.cpp
+++ b/src/devices/cpu/dsp56156/inst.cpp
@@ -2,10 +2,9 @@
 // copyright-holders:Andrew Gardner
 #include "emu.h"
 #include "inst.h"
-#include "emu.h"
 
-namespace DSP_56156
-{
+namespace DSP_56156 {
+
 // Factory
 std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
 											const uint16_t word0,
@@ -783,4 +782,4 @@ std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
 	return nullptr;
 }
 
-}
+} // namespace DSP_56156
diff --git a/src/devices/cpu/z80/z80ndasm.cpp b/src/devices/cpu/z80/z80ndasm.cpp
index 402a682c427e8..ccf5be7ef986c 100644
--- a/src/devices/cpu/z80/z80ndasm.cpp
+++ b/src/devices/cpu/z80/z80ndasm.cpp
@@ -5,6 +5,7 @@
  *
  *****************************************************************************/
 
+#include "emu.h"
 #include "z80ndasm.h"
 
 const z80_disassembler::z80dasm z80n_disassembler::mnemonic_ed_n[256] =
diff --git a/src/mame/bandai/wswan.cpp b/src/mame/bandai/wswan.cpp
index 4fb5fe4ae2ac0..d892621267c25 100644
--- a/src/mame/bandai/wswan.cpp
+++ b/src/mame/bandai/wswan.cpp
@@ -321,7 +321,7 @@ void wswan_state::pockchv2(machine_config &config)
 	wswan_base(config);
 
 	// software lists
-	SOFTWARE_LIST(config, "pc2_list").set_compatible("pockchalv2");
+	SOFTWARE_LIST(config, "pc2_list").set_original("pockchalv2");
 }
 
 void wscolor_state::wscolor(machine_config &config)
diff --git a/src/mame/tomy/tomy_princ.cpp b/src/mame/tomy/tomy_princ.cpp
index c151c0af26b64..4a753a3be36c0 100644
--- a/src/mame/tomy/tomy_princ.cpp
+++ b/src/mame/tomy/tomy_princ.cpp
@@ -1508,6 +1508,7 @@ ROM_START( princnt )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD("tc538000.u3", 0x00000, 0x100000, CRC(e4e2bfe9) SHA1(b3a7727544918b9030c362694ddf9a2fc3bca8b4))
 ROM_END
+
 ROM_START( princnt3 )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD("tc538000.3.u3", 0x00000, 0x100000, CRC(eed0a0f9) SHA1(c15b97c2c29b354136cef046f72a6443b415e673))