diff --git a/hash/a2600_cass.xml b/hash/a2600_cass.xml
index f255aa6c5f5..1a59690ca1b 100644
--- a/hash/a2600_cass.xml
+++ b/hash/a2600_cass.xml
@@ -822,4 +822,4 @@ MultiLoad (TM) games, i.e. the few games which had separate chunks of data on th
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/abc80_cass.xml b/hash/abc80_cass.xml
index ac568c36b37..f88b00234df 100644
--- a/hash/abc80_cass.xml
+++ b/hash/abc80_cass.xml
@@ -14,4 +14,4 @@
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/aquarius.xml b/hash/aquarius.xml
index db05fc15585..52297b168c6 100644
--- a/hash/aquarius.xml
+++ b/hash/aquarius.xml
@@ -274,4 +274,4 @@
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml
index 31196557a26..cab4a5f207e 100644
--- a/hash/fmtowns_cd.xml
+++ b/hash/fmtowns_cd.xml
@@ -3931,9 +3931,9 @@ User/save disks that can be created from the game itself are not included.
 		<description>Hiouden II</description>
 		<year>1994</year>
 		<publisher>ウルフチーム (WolfTeam)</publisher>
-		<!-- 
+		<!--
 		Note from the dumper:
-		
+
 		When I dumped the system disk it was considerably damaged, with a lot of bad sectors
 		on side 1. Thankfully this doesn't affect the executable files and doesn't prevent the
 		game from running, but there are saved games by the original owner that probably won't work.
diff --git a/hash/fmtowns_flop.xml b/hash/fmtowns_flop.xml
index 237086c20cf..ae26476063b 100644
--- a/hash/fmtowns_flop.xml
+++ b/hash/fmtowns_flop.xml
@@ -1643,4 +1643,4 @@ Yuki Neko                                               Apr-95  Jast    (FDx4)
 	</software>
 
 </softwarelist>
-	
\ No newline at end of file
+
diff --git a/hash/interact.xml b/hash/interact.xml
index 73cb4ed5891..b8c4438d93e 100644
--- a/hash/interact.xml
+++ b/hash/interact.xml
@@ -424,4 +424,4 @@ Alignment Tape (Micro Video)
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/kayproii.xml b/hash/kayproii.xml
index 64ca249210c..6de0cc4be15 100644
--- a/hash/kayproii.xml
+++ b/hash/kayproii.xml
@@ -127,4 +127,4 @@
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/lisa2.xml b/hash/lisa2.xml
index 2941d021eb4..64c1c698e08 100644
--- a/hash/lisa2.xml
+++ b/hash/lisa2.xml
@@ -147,4 +147,4 @@ NOTE: This list is here only to document available dumps and it's not used (yet)
 			</dataarea>
 		</part>
 	</software>
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/mbc55x.xml b/hash/mbc55x.xml
index da741ca6be8..5841acf662d 100644
--- a/hash/mbc55x.xml
+++ b/hash/mbc55x.xml
@@ -200,4 +200,4 @@
 			</dataarea>
 		</part>
 	</software>
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/mz800_cass.xml b/hash/mz800_cass.xml
index f21f1148838..b0fe6cc7828 100644
--- a/hash/mz800_cass.xml
+++ b/hash/mz800_cass.xml
@@ -185,4 +185,4 @@ MZ-821 Sharp BASIC Trainer (Germany):   Account Manager: Einnahmen/Ausgaben-Verw
 <!-- Operating Systems -->
 
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/pc98_cd.xml b/hash/pc98_cd.xml
index 2bedddd3b3c..32619a0327c 100644
--- a/hash/pc98_cd.xml
+++ b/hash/pc98_cd.xml
@@ -807,7 +807,7 @@
 		<rom name="DUEL succession Plus kit (1996)(Kure Software Koubou).ccd" size="3636" crc="8317e961" sha1="57b2aa6bf0a6cf0db7c8d4dfab48d9bc84822736"/>
 		<rom name="DUEL succession Plus kit (1996)(Kure Software Koubou).img" size="589771056" crc="b49423ab" sha1="66817c10f4cbc7bdf2d7b6dbc46720ccd64b30da"/>
 		<rom name="DUEL succession Plus kit (1996)(Kure Software Koubou).sub" size="24072288" crc="669c9cdf" sha1="fa434b92fad08829bd67d57b23385c856e77ac9f"/>
-		
+
 		*after conversion with IsoBuster+EAC *
 		<rom name="DUEL succession Plus kit (1996)(Kure Software Koubou).cue" size="2073" crc="7d4b0d08" sha1="515751787775ca770e3c431914b71f89759d8b1c"/>
 		<rom name="Track01.bin" size="22226400" crc="db0ebcdb" sha1="6eb45ea96131da6a27b47589999b4363a4fe9cfb"/>
@@ -2191,7 +2191,7 @@
 		<rom name="Schwarzschild GX CD (1997)(KOGADO).ccd" size="7542" crc="ac4f05b3" sha1="add60653a0482dddd836c9de107b90b61eae96d2"/>
 		<rom name="Schwarzschild GX CD (1997)(KOGADO).img" size="560345184" crc="5b18f6a7" sha1="55605ee1ef9d3c316de2bf6d2f40265423a9b0a6"/>
 		<rom name="Schwarzschild GX CD (1997)(KOGADO).sub" size="22871232" crc="5a7443c6" sha1="c3e385106fe5994a935f1e6245502c5df7646383"/>
-		
+
 		*after conversion with IsoBuster+EAC *
 		<rom name="Schwarzschild GX CD (1997)(KOGADO).cue" size="4493" crc="a777c5dc" sha1="82d1aa50f8bebaa042eb1ffc3ca3a84994474a4b"/>
 		<rom name="Track01.bin" size="22111152" crc="ea405f75" sha1="010e133a25f397140eefdcf98a1f47a8a52d9391"/>
diff --git a/hash/pro128_cart.xml b/hash/pro128_cart.xml
index 7095b4379a2..6508a9aa130 100644
--- a/hash/pro128_cart.xml
+++ b/hash/pro128_cart.xml
@@ -54,4 +54,4 @@
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/pro128_flop.xml b/hash/pro128_flop.xml
index bdff7ec8444..223e5252c6e 100644
--- a/hash/pro128_flop.xml
+++ b/hash/pro128_flop.xml
@@ -32,4 +32,4 @@
 		</part>
 	</software>
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/hash/spc1000_cass.xml b/hash/spc1000_cass.xml
index b62a8efa2f0..7ed7be77ef4 100644
--- a/hash/spc1000_cass.xml
+++ b/hash/spc1000_cass.xml
@@ -1272,4 +1272,4 @@
 
 
 
-</softwarelist>
\ No newline at end of file
+</softwarelist>
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index f51a24bf57a..f30b01683c9 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -11887,7 +11887,7 @@ poizone                         // (c) 1990 Sisteme
 deluxe5                         // (c) 2000 ESD
 deluxe5a                        // (c) 2000 ESD
 deluxe5b                        // (c) 2000 ESD
-deluxe4u						// (c) 2000 ESD
+deluxe4u                        // (c) 2000 ESD
 hedpanic                        // (c) 2000 ESD
 hedpanicf                       // (c) 2000 ESD + Fuuki, Co. Ltd.
 hedpanico                       // (c) 1999 ESD
@@ -12678,7 +12678,7 @@ gteikokb                        // bootleg
 gteikoku                        // (c) Irem
 jumpbug                         // (c) 1981 Rock-ola
 jumpbugb                        // (c) 1981 Sega
-jungsub							// bootleg
+jungsub                         // bootleg
 kamakazi3                       // Video Games (UK) Ltd., hack or bootleg?
 kingball                        // (c) 1980 Namco
 kingballj                       // (c) 1980 Namco
@@ -31206,7 +31206,7 @@ r2dtank                         // (c) 1980 Sigma Ent. Inc.
 
 @source:r2dx_v33.cpp
 nzeroteam                       // (c) 1997 Seibu Kaihatsu
-nzeroteama						//
+nzeroteama                      //
 r2dx_v33                        // (c) 1996 Seibu Kaihatsu
 r2dx_v33_r2                     // (c) 1996 Seibu Kaihatsu
 zerotm2k                        // (c) 2000 Seibu Kaihatsu
@@ -32289,7 +32289,7 @@ hangon1                         // (c) 1985
 hangon2                         // (c) 1985
 shangonrb                       // (c) 1992 (but bootleg, hangon hw?)
 shangonro                       // (c) 1987 (FD1094)
-shangonho						// (c) 1987 (FD1094)
+shangonho                       // (c) 1987 (FD1094)
 sharrier                        // (c) 1985
 sharrier1                       // (c) 1985
 
@@ -33740,7 +33740,7 @@ roldfrog                        // not a gaelco game but based on splash code
 roldfroga                       // not a gaelco game but based on splash code
 splash                          // (c) 1992 - Ref 922804
 splash10                        // (c) 1992 - Ref 922804
-ringball						// not a gaelco game but based on splash code
+ringball                        // not a gaelco game but based on splash code
 
 @source:splus.cpp
 spss4240                        //