diff --git a/makefile b/makefile
index 5181b510391..1522688e10b 100644
--- a/makefile
+++ b/makefile
@@ -341,7 +341,6 @@ endif
 ifdef PROFILE
 PROFILER =
 SYMBOLS = 1
-OPTIMIZE = 3
 ifndef SYMLEVEL
 SYMLEVEL = 1
 endif
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 515c55a222c..cb80c5403f4 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -359,6 +359,22 @@ if (CPUS["ESRIP"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/esrip/esripdsm.c")
 end
 
+--------------------------------------------------
+-- Seiko Epson E0C6200 series
+---@src/emu/cpu/e0c6200/e0c6200.h,CPUS += E0C6200
+--------------------------------------------------
+
+if (CPUS["E0C6200"]~=null) then
+	files {
+		MAME_DIR .. "src/emu/cpu/e0c6200/e0c6200.c",
+		MAME_DIR .. "src/emu/cpu/e0c6200/e0c6200.h",
+	}
+end
+
+if (CPUS["E0C6200"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/e0c6200/e0c6200d.c")
+end
+
 --------------------------------------------------
 -- RCA COSMAC
 ---@src/emu/cpu/cosmac/cosmac.h,CPUS += COSMAC
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 44120517e4b..b8959dc8c63 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -100,7 +100,7 @@ CPUS["SM8500"] = true
 CPUS["MINX"] = true
 CPUS["SSEM"] = true
 CPUS["AVR8"] = true
-CPUS["TMS0980"] = true
+--CPUS["TMS0980"] = true
 CPUS["I4004"] = true
 CPUS["SUPERFX"] = true
 CPUS["Z8"] = true
@@ -123,9 +123,10 @@ CPUS["ALTO2"] = true
 --CPUS["W65816"] = true
 CPUS["ARC"] = true
 CPUS["ARCOMPACT"] = true
-CPUS["AMIS2000"] = true
-CPUS["UCOM4"] = true
+--CPUS["AMIS2000"] = true
+--CPUS["UCOM4"] = true
 CPUS["HMCS40"] = true
+--CPUS["E0C6200"] = true
 
 --------------------------------------------------
 -- specify available sound cores
diff --git a/scripts/target/mess/mess.lua b/scripts/target/mess/mess.lua
index c60b8f16d09..5c1c1a7e3f5 100644
--- a/scripts/target/mess/mess.lua
+++ b/scripts/target/mess/mess.lua
@@ -103,7 +103,7 @@ CPUS["SUPERFX"] = true
 CPUS["Z8"] = true
 CPUS["I8008"] = true
 CPUS["SCMP"] = true
-CPUS["MN10200"] = true
+--CPUS["MN10200"] = true
 CPUS["COSMAC"] = true
 CPUS["UNSP"] = true
 CPUS["HCD62121"] = true
@@ -123,6 +123,7 @@ CPUS["ARCOMPACT"] = true
 CPUS["AMIS2000"] = true
 CPUS["UCOM4"] = true
 CPUS["HMCS40"] = true
+CPUS["E0C6200"] = true
 
 --------------------------------------------------
 -- specify available sound cores; some of these are
diff --git a/src/build/file2str.py b/src/build/file2str.py
index 2b420eef339..7417f338328 100644
--- a/src/build/file2str.py
+++ b/src/build/file2str.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+##
+## license:BSD-3-Clause
+## copyright-holders:Aaron Giles, Andrew Gardner
 
 from __future__ import with_statement
 
diff --git a/src/build/makelist.py b/src/build/makelist.py
index 15c0ac9b605..eeaac070427 100644
--- a/src/build/makelist.py
+++ b/src/build/makelist.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+##
+## license:BSD-3-Clause
+## copyright-holders:Aaron Giles, Andrew Gardner
 
 from __future__ import with_statement
 
diff --git a/src/build/verinfo.py b/src/build/verinfo.py
index 331992115b2..863ffe2926c 100644
--- a/src/build/verinfo.py
+++ b/src/build/verinfo.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+##
+## license:BSD-3-Clause
+## copyright-holders:Aaron Giles, Andrew Gardner
 
 from __future__ import with_statement
 
diff --git a/src/emu/bus/a1bus/a1bus.c b/src/emu/bus/a1bus/a1bus.c
index 48c23fed772..9fe16c6da54 100644
--- a/src/emu/bus/a1bus/a1bus.c
+++ b/src/emu/bus/a1bus/a1bus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   a1bus.c - Apple I slot bus and card emulation
diff --git a/src/emu/bus/a1bus/a1bus.h b/src/emu/bus/a1bus/a1bus.h
index ec98eccbb4f..0efa357908f 100644
--- a/src/emu/bus/a1bus/a1bus.h
+++ b/src/emu/bus/a1bus/a1bus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   a1bus.h - Apple I expansion slot and card emulation
diff --git a/src/emu/bus/a2bus/a2alfam2.c b/src/emu/bus/a2bus/a2alfam2.c
index 12e4d25ab1b..6c23c40656d 100644
--- a/src/emu/bus/a2bus/a2alfam2.c
+++ b/src/emu/bus/a2bus/a2alfam2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2alfsm2.c
diff --git a/src/emu/bus/a2bus/a2alfam2.h b/src/emu/bus/a2bus/a2alfam2.h
index 044ec964839..1c7db2cfbfe 100644
--- a/src/emu/bus/a2bus/a2alfam2.h
+++ b/src/emu/bus/a2bus/a2alfam2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2alfam2.h
diff --git a/src/emu/bus/a2bus/a2applicard.c b/src/emu/bus/a2bus/a2applicard.c
index 224c7be6d20..15c37430e56 100644
--- a/src/emu/bus/a2bus/a2applicard.c
+++ b/src/emu/bus/a2bus/a2applicard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2applicard.c
diff --git a/src/emu/bus/a2bus/a2applicard.h b/src/emu/bus/a2bus/a2applicard.h
index 14e16296a06..300fc3571a1 100644
--- a/src/emu/bus/a2bus/a2applicard.h
+++ b/src/emu/bus/a2bus/a2applicard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2applicard.h
diff --git a/src/emu/bus/a2bus/a2arcadebd.c b/src/emu/bus/a2bus/a2arcadebd.c
index 04c6ee7a832..cec9ba4940b 100644
--- a/src/emu/bus/a2bus/a2arcadebd.c
+++ b/src/emu/bus/a2bus/a2arcadebd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2arcadeboard.c
diff --git a/src/emu/bus/a2bus/a2arcadebd.h b/src/emu/bus/a2bus/a2arcadebd.h
index 50a67aa41f8..e2eac28aabb 100644
--- a/src/emu/bus/a2bus/a2arcadebd.h
+++ b/src/emu/bus/a2bus/a2arcadebd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2arcadebd.h
diff --git a/src/emu/bus/a2bus/a2cffa.c b/src/emu/bus/a2bus/a2cffa.c
index ff3da1b21db..45613c5b33b 100644
--- a/src/emu/bus/a2bus/a2cffa.c
+++ b/src/emu/bus/a2bus/a2cffa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2cffa.c
diff --git a/src/emu/bus/a2bus/a2cffa.h b/src/emu/bus/a2bus/a2cffa.h
index be77335cd24..479fd7c97c7 100644
--- a/src/emu/bus/a2bus/a2cffa.h
+++ b/src/emu/bus/a2bus/a2cffa.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2cffa.h
diff --git a/src/emu/bus/a2bus/a2corvus.c b/src/emu/bus/a2bus/a2corvus.c
index a770da679a9..b727ac4b4c8 100644
--- a/src/emu/bus/a2bus/a2corvus.c
+++ b/src/emu/bus/a2bus/a2corvus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2corvus.c
diff --git a/src/emu/bus/a2bus/a2corvus.h b/src/emu/bus/a2bus/a2corvus.h
index cf1b98c0402..7cf53c0b159 100644
--- a/src/emu/bus/a2bus/a2corvus.h
+++ b/src/emu/bus/a2bus/a2corvus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2corvus.h
diff --git a/src/emu/bus/a2bus/a2diskii.c b/src/emu/bus/a2bus/a2diskii.c
index 1a94c699442..b22928f38ae 100644
--- a/src/emu/bus/a2bus/a2diskii.c
+++ b/src/emu/bus/a2bus/a2diskii.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2diskii.c
diff --git a/src/emu/bus/a2bus/a2diskii.h b/src/emu/bus/a2bus/a2diskii.h
index 5086345fc69..579a3b2a638 100644
--- a/src/emu/bus/a2bus/a2diskii.h
+++ b/src/emu/bus/a2bus/a2diskii.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2diskii.h
diff --git a/src/emu/bus/a2bus/a2diskiing.c b/src/emu/bus/a2bus/a2diskiing.c
index d6d7b6c6089..be8244ed27e 100644
--- a/src/emu/bus/a2bus/a2diskiing.c
+++ b/src/emu/bus/a2bus/a2diskiing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2diskii.c
diff --git a/src/emu/bus/a2bus/a2diskiing.h b/src/emu/bus/a2bus/a2diskiing.h
index 8b3bd18c624..95e7f06b7a7 100644
--- a/src/emu/bus/a2bus/a2diskiing.h
+++ b/src/emu/bus/a2bus/a2diskiing.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2diskiing.h
diff --git a/src/emu/bus/a2bus/a2eauxslot.c b/src/emu/bus/a2bus/a2eauxslot.c
index a40f9be6454..351ee7dcd49 100644
--- a/src/emu/bus/a2bus/a2eauxslot.c
+++ b/src/emu/bus/a2bus/a2eauxslot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   a2eauxslot.c - Apple IIe auxiliary slot and card emulation
diff --git a/src/emu/bus/a2bus/a2eauxslot.h b/src/emu/bus/a2bus/a2eauxslot.h
index 97f56b4ee63..5559e948105 100644
--- a/src/emu/bus/a2bus/a2eauxslot.h
+++ b/src/emu/bus/a2bus/a2eauxslot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   a2eauxslot.h - Apple IIe auxiliary slot and card emulation
diff --git a/src/emu/bus/a2bus/a2echoii.c b/src/emu/bus/a2bus/a2echoii.c
index 3d4da6b9116..65cdf03dfc3 100644
--- a/src/emu/bus/a2bus/a2echoii.c
+++ b/src/emu/bus/a2bus/a2echoii.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2echoii.c
diff --git a/src/emu/bus/a2bus/a2echoii.h b/src/emu/bus/a2bus/a2echoii.h
index d38d73654b7..dca8f9a5038 100644
--- a/src/emu/bus/a2bus/a2echoii.h
+++ b/src/emu/bus/a2bus/a2echoii.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2echoii.h
diff --git a/src/emu/bus/a2bus/a2eext80col.c b/src/emu/bus/a2bus/a2eext80col.c
index f4ffbb0505e..50a87df4a80 100644
--- a/src/emu/bus/a2bus/a2eext80col.c
+++ b/src/emu/bus/a2bus/a2eext80col.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2eext80col.c
diff --git a/src/emu/bus/a2bus/a2eext80col.h b/src/emu/bus/a2bus/a2eext80col.h
index 614eb9911c6..df485c7f50a 100644
--- a/src/emu/bus/a2bus/a2eext80col.h
+++ b/src/emu/bus/a2bus/a2eext80col.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2eext80col.c
diff --git a/src/emu/bus/a2bus/a2eramworks3.c b/src/emu/bus/a2bus/a2eramworks3.c
index 46cdcf07675..a475186ec16 100644
--- a/src/emu/bus/a2bus/a2eramworks3.c
+++ b/src/emu/bus/a2bus/a2eramworks3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2eramworks3.c
diff --git a/src/emu/bus/a2bus/a2eramworks3.h b/src/emu/bus/a2bus/a2eramworks3.h
index 04665143cba..8551b1415f1 100644
--- a/src/emu/bus/a2bus/a2eramworks3.h
+++ b/src/emu/bus/a2bus/a2eramworks3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2eramworks3.c
diff --git a/src/emu/bus/a2bus/a2estd80col.c b/src/emu/bus/a2bus/a2estd80col.c
index 2bfcef11a8c..bbf97f1e7ea 100644
--- a/src/emu/bus/a2bus/a2estd80col.c
+++ b/src/emu/bus/a2bus/a2estd80col.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2estd80col.c
diff --git a/src/emu/bus/a2bus/a2estd80col.h b/src/emu/bus/a2bus/a2estd80col.h
index 29ce8d1dc08..5b63235c428 100644
--- a/src/emu/bus/a2bus/a2estd80col.h
+++ b/src/emu/bus/a2bus/a2estd80col.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2estd80col.c
diff --git a/src/emu/bus/a2bus/a2hsscsi.c b/src/emu/bus/a2bus/a2hsscsi.c
index 5463f48152f..5a4fa71d3df 100644
--- a/src/emu/bus/a2bus/a2hsscsi.c
+++ b/src/emu/bus/a2bus/a2hsscsi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2hsscsi.c
diff --git a/src/emu/bus/a2bus/a2hsscsi.h b/src/emu/bus/a2bus/a2hsscsi.h
index 01c24dfbb4f..2b361df39e9 100644
--- a/src/emu/bus/a2bus/a2hsscsi.h
+++ b/src/emu/bus/a2bus/a2hsscsi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2hsscsi.h
diff --git a/src/emu/bus/a2bus/a2lang.c b/src/emu/bus/a2bus/a2lang.c
index 1f257789e55..eedd90577eb 100644
--- a/src/emu/bus/a2bus/a2lang.c
+++ b/src/emu/bus/a2bus/a2lang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2lang.c
diff --git a/src/emu/bus/a2bus/a2lang.h b/src/emu/bus/a2bus/a2lang.h
index 69f65710766..9ee4471b29d 100644
--- a/src/emu/bus/a2bus/a2lang.h
+++ b/src/emu/bus/a2bus/a2lang.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2lang.h
diff --git a/src/emu/bus/a2bus/a2memexp.c b/src/emu/bus/a2bus/a2memexp.c
index 9da8130ce03..d31a28a0e37 100644
--- a/src/emu/bus/a2bus/a2memexp.c
+++ b/src/emu/bus/a2bus/a2memexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2memexp.c
diff --git a/src/emu/bus/a2bus/a2memexp.h b/src/emu/bus/a2bus/a2memexp.h
index 03b0ede895e..9e49249e169 100644
--- a/src/emu/bus/a2bus/a2memexp.h
+++ b/src/emu/bus/a2bus/a2memexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2memexp.h
diff --git a/src/emu/bus/a2bus/a2midi.c b/src/emu/bus/a2bus/a2midi.c
index 66928bb16b6..ceec43998fe 100644
--- a/src/emu/bus/a2bus/a2midi.c
+++ b/src/emu/bus/a2bus/a2midi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2midi.c
diff --git a/src/emu/bus/a2bus/a2midi.h b/src/emu/bus/a2bus/a2midi.h
index 2c7073b4c68..97073bb604d 100644
--- a/src/emu/bus/a2bus/a2midi.h
+++ b/src/emu/bus/a2bus/a2midi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2midi.h
diff --git a/src/emu/bus/a2bus/a2mockingboard.c b/src/emu/bus/a2bus/a2mockingboard.c
index 2e0d607cb9c..4ea1cd9c0c8 100644
--- a/src/emu/bus/a2bus/a2mockingboard.c
+++ b/src/emu/bus/a2bus/a2mockingboard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2mockingboard.c
diff --git a/src/emu/bus/a2bus/a2mockingboard.h b/src/emu/bus/a2bus/a2mockingboard.h
index e873b583207..dd22578c749 100644
--- a/src/emu/bus/a2bus/a2mockingboard.h
+++ b/src/emu/bus/a2bus/a2mockingboard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2mockingboard.h
diff --git a/src/emu/bus/a2bus/a2pic.c b/src/emu/bus/a2bus/a2pic.c
index 009aead5a01..ef618a0af82 100644
--- a/src/emu/bus/a2bus/a2pic.c
+++ b/src/emu/bus/a2bus/a2pic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2pic.c
diff --git a/src/emu/bus/a2bus/a2pic.h b/src/emu/bus/a2bus/a2pic.h
index b8813a55ce9..5e5bc414a1a 100644
--- a/src/emu/bus/a2bus/a2pic.h
+++ b/src/emu/bus/a2bus/a2pic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2pic.h
diff --git a/src/emu/bus/a2bus/a2sam.c b/src/emu/bus/a2bus/a2sam.c
index b9a73d95d06..f7dfe16d34c 100644
--- a/src/emu/bus/a2bus/a2sam.c
+++ b/src/emu/bus/a2bus/a2sam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2sam.c
diff --git a/src/emu/bus/a2bus/a2sam.h b/src/emu/bus/a2bus/a2sam.h
index 9c60958a0bb..ece57bce6b6 100644
--- a/src/emu/bus/a2bus/a2sam.h
+++ b/src/emu/bus/a2bus/a2sam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2sam.h
diff --git a/src/emu/bus/a2bus/a2scsi.c b/src/emu/bus/a2bus/a2scsi.c
index b7816a09d23..f8bc3920774 100644
--- a/src/emu/bus/a2bus/a2scsi.c
+++ b/src/emu/bus/a2bus/a2scsi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2scsi.c
diff --git a/src/emu/bus/a2bus/a2scsi.h b/src/emu/bus/a2bus/a2scsi.h
index 74e2cfb4fce..d8bcf38484a 100644
--- a/src/emu/bus/a2bus/a2scsi.h
+++ b/src/emu/bus/a2bus/a2scsi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2scsi.h
diff --git a/src/emu/bus/a2bus/a2softcard.c b/src/emu/bus/a2bus/a2softcard.c
index 2def3ca23a3..5108b6f988d 100644
--- a/src/emu/bus/a2bus/a2softcard.c
+++ b/src/emu/bus/a2bus/a2softcard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2softcard.c
diff --git a/src/emu/bus/a2bus/a2softcard.h b/src/emu/bus/a2bus/a2softcard.h
index 55d4fd8ae6a..39a9cb296b7 100644
--- a/src/emu/bus/a2bus/a2softcard.h
+++ b/src/emu/bus/a2bus/a2softcard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2softcard.h
diff --git a/src/emu/bus/a2bus/a2ssc.c b/src/emu/bus/a2bus/a2ssc.c
index 16c0050f702..88456b80c5a 100644
--- a/src/emu/bus/a2bus/a2ssc.c
+++ b/src/emu/bus/a2bus/a2ssc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2ssc.c
diff --git a/src/emu/bus/a2bus/a2ssc.h b/src/emu/bus/a2bus/a2ssc.h
index b47fd973b8a..18dbd5bacdc 100644
--- a/src/emu/bus/a2bus/a2ssc.h
+++ b/src/emu/bus/a2bus/a2ssc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2ssc.h
diff --git a/src/emu/bus/a2bus/a2swyft.c b/src/emu/bus/a2bus/a2swyft.c
index d998f57475a..0e1da45eca0 100644
--- a/src/emu/bus/a2bus/a2swyft.c
+++ b/src/emu/bus/a2bus/a2swyft.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2swyft.c
diff --git a/src/emu/bus/a2bus/a2swyft.h b/src/emu/bus/a2bus/a2swyft.h
index 7e689c80d55..43a417ec23d 100644
--- a/src/emu/bus/a2bus/a2swyft.h
+++ b/src/emu/bus/a2bus/a2swyft.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2swyft.h
diff --git a/src/emu/bus/a2bus/a2themill.c b/src/emu/bus/a2bus/a2themill.c
index 168e07926fb..920e86e71bd 100644
--- a/src/emu/bus/a2bus/a2themill.c
+++ b/src/emu/bus/a2bus/a2themill.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2themill.c
diff --git a/src/emu/bus/a2bus/a2themill.h b/src/emu/bus/a2bus/a2themill.h
index 9424eddfa5d..465f5155668 100644
--- a/src/emu/bus/a2bus/a2themill.h
+++ b/src/emu/bus/a2bus/a2themill.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2themill.h
diff --git a/src/emu/bus/a2bus/a2thunderclock.c b/src/emu/bus/a2bus/a2thunderclock.c
index 3bccff5788f..e37541e1191 100644
--- a/src/emu/bus/a2bus/a2thunderclock.c
+++ b/src/emu/bus/a2bus/a2thunderclock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2thunderclock.c
diff --git a/src/emu/bus/a2bus/a2thunderclock.h b/src/emu/bus/a2bus/a2thunderclock.h
index 53a1eb6b1c7..418d4cc71dd 100644
--- a/src/emu/bus/a2bus/a2thunderclock.h
+++ b/src/emu/bus/a2bus/a2thunderclock.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2thunderclock.h
diff --git a/src/emu/bus/a2bus/a2ultraterm.c b/src/emu/bus/a2bus/a2ultraterm.c
index 9dc0882b3b8..da6c97e4aa8 100644
--- a/src/emu/bus/a2bus/a2ultraterm.c
+++ b/src/emu/bus/a2bus/a2ultraterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2ultraterm.c
diff --git a/src/emu/bus/a2bus/a2ultraterm.h b/src/emu/bus/a2bus/a2ultraterm.h
index 7495db2eca3..74b784d2bdd 100644
--- a/src/emu/bus/a2bus/a2ultraterm.h
+++ b/src/emu/bus/a2bus/a2ultraterm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2ultraterm.h
diff --git a/src/emu/bus/a2bus/a2videoterm.c b/src/emu/bus/a2bus/a2videoterm.c
index 5d6406a0ead..c159ef9c2ae 100644
--- a/src/emu/bus/a2bus/a2videoterm.c
+++ b/src/emu/bus/a2bus/a2videoterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2videoterm.c
diff --git a/src/emu/bus/a2bus/a2videoterm.h b/src/emu/bus/a2bus/a2videoterm.h
index 50d2165dfe9..761577f19bf 100644
--- a/src/emu/bus/a2bus/a2videoterm.h
+++ b/src/emu/bus/a2bus/a2videoterm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2videoterm.h
diff --git a/src/emu/bus/a2bus/a2vulcan.c b/src/emu/bus/a2bus/a2vulcan.c
index dae999c3932..95556e43c39 100644
--- a/src/emu/bus/a2bus/a2vulcan.c
+++ b/src/emu/bus/a2bus/a2vulcan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2vulcan.c
diff --git a/src/emu/bus/a2bus/a2vulcan.h b/src/emu/bus/a2bus/a2vulcan.h
index cabe7e7b00e..eb2dbe589b8 100644
--- a/src/emu/bus/a2bus/a2vulcan.h
+++ b/src/emu/bus/a2bus/a2vulcan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2vulcan.h
diff --git a/src/emu/bus/a2bus/a2zipdrive.c b/src/emu/bus/a2bus/a2zipdrive.c
index 8b4f7f04524..d5647a0558c 100644
--- a/src/emu/bus/a2bus/a2zipdrive.c
+++ b/src/emu/bus/a2bus/a2zipdrive.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2zipdrive.c
diff --git a/src/emu/bus/a2bus/a2zipdrive.h b/src/emu/bus/a2bus/a2zipdrive.h
index d0fdb2b9a8e..8c1e99fcec2 100644
--- a/src/emu/bus/a2bus/a2zipdrive.h
+++ b/src/emu/bus/a2bus/a2zipdrive.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     a2zipdrive.h
diff --git a/src/emu/bus/a2bus/corvfdc01.c b/src/emu/bus/a2bus/corvfdc01.c
index d0fe1d9ed22..db5d833f5aa 100644
--- a/src/emu/bus/a2bus/corvfdc01.c
+++ b/src/emu/bus/a2bus/corvfdc01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     corvfdc01.c
diff --git a/src/emu/bus/a2bus/corvfdc01.h b/src/emu/bus/a2bus/corvfdc01.h
index 5a6b38ed74d..4a8d55bb434 100644
--- a/src/emu/bus/a2bus/corvfdc01.h
+++ b/src/emu/bus/a2bus/corvfdc01.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     corvfdc01.h
diff --git a/src/emu/bus/a2bus/corvfdc02.c b/src/emu/bus/a2bus/corvfdc02.c
index 653098c54af..3c116f83e8f 100644
--- a/src/emu/bus/a2bus/corvfdc02.c
+++ b/src/emu/bus/a2bus/corvfdc02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     corvfdc02.c
diff --git a/src/emu/bus/a2bus/corvfdc02.h b/src/emu/bus/a2bus/corvfdc02.h
index 7b16e1c899d..89d8dfa4465 100644
--- a/src/emu/bus/a2bus/corvfdc02.h
+++ b/src/emu/bus/a2bus/corvfdc02.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     corvfdc02.h
diff --git a/src/emu/bus/a2bus/ezcgi.c b/src/emu/bus/a2bus/ezcgi.c
index 3c3a937b781..3d4fa07c002 100644
--- a/src/emu/bus/a2bus/ezcgi.c
+++ b/src/emu/bus/a2bus/ezcgi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ezcgi.c
diff --git a/src/emu/bus/a2bus/ezcgi.h b/src/emu/bus/a2bus/ezcgi.h
index 0f2474e004b..41d9cda7cf4 100644
--- a/src/emu/bus/a2bus/ezcgi.h
+++ b/src/emu/bus/a2bus/ezcgi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ezcgi.h
diff --git a/src/emu/bus/a2bus/laser128.c b/src/emu/bus/a2bus/laser128.c
index 81315311ae3..af4196d9177 100644
--- a/src/emu/bus/a2bus/laser128.c
+++ b/src/emu/bus/a2bus/laser128.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     laser128.c
diff --git a/src/emu/bus/a2bus/laser128.h b/src/emu/bus/a2bus/laser128.h
index 30515ed9a5c..3a19d68e64b 100644
--- a/src/emu/bus/a2bus/laser128.h
+++ b/src/emu/bus/a2bus/laser128.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     laser128.h
diff --git a/src/emu/bus/a2bus/mouse.c b/src/emu/bus/a2bus/mouse.c
index 816a8a28ffd..09900f6e123 100644
--- a/src/emu/bus/a2bus/mouse.c
+++ b/src/emu/bus/a2bus/mouse.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mouse.c
diff --git a/src/emu/bus/a2bus/mouse.h b/src/emu/bus/a2bus/mouse.h
index 807c53c8128..4e06a0a5924 100644
--- a/src/emu/bus/a2bus/mouse.h
+++ b/src/emu/bus/a2bus/mouse.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mouse.h
diff --git a/src/emu/bus/a2bus/timemasterho.c b/src/emu/bus/a2bus/timemasterho.c
index d93e6d97500..74e6ff6ab4f 100644
--- a/src/emu/bus/a2bus/timemasterho.c
+++ b/src/emu/bus/a2bus/timemasterho.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     timemasterho.c
diff --git a/src/emu/bus/a2bus/timemasterho.h b/src/emu/bus/a2bus/timemasterho.h
index bbe37c4a089..61eb31f2eb7 100644
--- a/src/emu/bus/a2bus/timemasterho.h
+++ b/src/emu/bus/a2bus/timemasterho.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     timemasterho.h
diff --git a/src/emu/bus/abcbus/abc890.c b/src/emu/bus/abcbus/abc890.c
index f9347eb6e3f..be5254cca6f 100644
--- a/src/emu/bus/abcbus/abc890.c
+++ b/src/emu/bus/abcbus/abc890.c
@@ -4,9 +4,6 @@
 
     Luxor ABC 890 bus expander emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "abc890.h"
diff --git a/src/emu/bus/abcbus/abc890.h b/src/emu/bus/abcbus/abc890.h
index 3d808ec5a28..3c878bfa95c 100644
--- a/src/emu/bus/abcbus/abc890.h
+++ b/src/emu/bus/abcbus/abc890.h
@@ -4,9 +4,6 @@
 
     Luxor ABC 890 bus expander emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/abcbus.c b/src/emu/bus/abcbus/abcbus.c
index 925a158ee2f..fd801b8ebbc 100644
--- a/src/emu/bus/abcbus/abcbus.c
+++ b/src/emu/bus/abcbus/abcbus.c
@@ -4,9 +4,6 @@
 
     Luxor ABC (Databoard 4680) Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "abcbus.h"
diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h
index a009bd17b81..cdfd436495d 100644
--- a/src/emu/bus/abcbus/abcbus.h
+++ b/src/emu/bus/abcbus/abcbus.h
@@ -4,9 +4,6 @@
 
     Luxor ABC (Databoard 4680) Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                               ABC 80
diff --git a/src/emu/bus/abcbus/fd2.c b/src/emu/bus/abcbus/fd2.c
index 0d5d8c3d93b..73ddeba54df 100644
--- a/src/emu/bus/abcbus/fd2.c
+++ b/src/emu/bus/abcbus/fd2.c
@@ -4,9 +4,6 @@
 
     Scandia Metric ABC FD2 floppy controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abcbus/fd2.h b/src/emu/bus/abcbus/fd2.h
index d0774818dbb..ef183e92843 100644
--- a/src/emu/bus/abcbus/fd2.h
+++ b/src/emu/bus/abcbus/fd2.h
@@ -4,9 +4,6 @@
 
     Scandia Metric ABC FD2 floppy controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/hdc.c b/src/emu/bus/abcbus/hdc.c
index 228bac17e21..628fbcb2d7d 100644
--- a/src/emu/bus/abcbus/hdc.c
+++ b/src/emu/bus/abcbus/hdc.c
@@ -4,9 +4,6 @@
 
     Luxor XEBEC Winchester controller card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "hdc.h"
diff --git a/src/emu/bus/abcbus/hdc.h b/src/emu/bus/abcbus/hdc.h
index b5111579729..cebe7619174 100644
--- a/src/emu/bus/abcbus/hdc.h
+++ b/src/emu/bus/abcbus/hdc.h
@@ -4,9 +4,6 @@
 
     Luxor XEBEC Winchester controller card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/lux10828.c b/src/emu/bus/abcbus/lux10828.c
index 7c95f7236bc..f809d8fe13d 100644
--- a/src/emu/bus/abcbus/lux10828.c
+++ b/src/emu/bus/abcbus/lux10828.c
@@ -4,9 +4,6 @@
 
     Luxor 55-10828 "slow" floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abcbus/lux10828.h b/src/emu/bus/abcbus/lux10828.h
index b5e8a89e427..3ffa18e9122 100644
--- a/src/emu/bus/abcbus/lux10828.h
+++ b/src/emu/bus/abcbus/lux10828.h
@@ -4,9 +4,6 @@
 
     Luxor 55-10828 "slow" floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/lux21046.c b/src/emu/bus/abcbus/lux21046.c
index bd1081e569d..e5cd3b001b6 100644
--- a/src/emu/bus/abcbus/lux21046.c
+++ b/src/emu/bus/abcbus/lux21046.c
@@ -4,9 +4,6 @@
 
     Luxor 55 21046-11/-21/-41 5.25"/8" Controller Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abcbus/lux21046.h b/src/emu/bus/abcbus/lux21046.h
index 2cd7a48798a..f670b9d5768 100644
--- a/src/emu/bus/abcbus/lux21046.h
+++ b/src/emu/bus/abcbus/lux21046.h
@@ -4,9 +4,6 @@
 
     Luxor 55 21046-11/-21/-41 5.25"/8" Controller Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/lux21056.c b/src/emu/bus/abcbus/lux21056.c
index 5b404440958..375a5927c47 100644
--- a/src/emu/bus/abcbus/lux21056.c
+++ b/src/emu/bus/abcbus/lux21056.c
@@ -4,9 +4,6 @@
 
     Luxor 55 21056-00 Xebec Interface Host Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abcbus/lux21056.h b/src/emu/bus/abcbus/lux21056.h
index 248a8326795..56d550155bf 100644
--- a/src/emu/bus/abcbus/lux21056.h
+++ b/src/emu/bus/abcbus/lux21056.h
@@ -4,9 +4,6 @@
 
     Luxor 55 21056-00 Xebec Interface Host Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/lux4105.c b/src/emu/bus/abcbus/lux4105.c
index 8d3422d8913..52e0446d86a 100644
--- a/src/emu/bus/abcbus/lux4105.c
+++ b/src/emu/bus/abcbus/lux4105.c
@@ -4,9 +4,6 @@
 
     Luxor 4105 SASI hard disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "lux4105.h"
diff --git a/src/emu/bus/abcbus/lux4105.h b/src/emu/bus/abcbus/lux4105.h
index d00511a727b..9d1aae90b4b 100644
--- a/src/emu/bus/abcbus/lux4105.h
+++ b/src/emu/bus/abcbus/lux4105.h
@@ -4,9 +4,6 @@
 
     Luxor 4105 SASI hard disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/memcard.c b/src/emu/bus/abcbus/memcard.c
index cec6a7f93c4..c7fbd2f3f31 100644
--- a/src/emu/bus/abcbus/memcard.c
+++ b/src/emu/bus/abcbus/memcard.c
@@ -4,9 +4,6 @@
 
     Luxor ABC Memory Card 55 10762-01 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abcbus/memcard.h b/src/emu/bus/abcbus/memcard.h
index e901ac5050c..a3308c47f6f 100644
--- a/src/emu/bus/abcbus/memcard.h
+++ b/src/emu/bus/abcbus/memcard.h
@@ -4,9 +4,6 @@
 
     Luxor ABC Memory Card 55 10762-01 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/ram.c b/src/emu/bus/abcbus/ram.c
index 4d85030b23b..a91e29bd9c7 100644
--- a/src/emu/bus/abcbus/ram.c
+++ b/src/emu/bus/abcbus/ram.c
@@ -4,9 +4,6 @@
 
     ABC 80 16 KB RAM expansion card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "ram.h"
diff --git a/src/emu/bus/abcbus/ram.h b/src/emu/bus/abcbus/ram.h
index 64f3265422d..f7fbd351927 100644
--- a/src/emu/bus/abcbus/ram.h
+++ b/src/emu/bus/abcbus/ram.h
@@ -4,9 +4,6 @@
 
     ABC 80 16 KB RAM expansion card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abcbus/turbo.c b/src/emu/bus/abcbus/turbo.c
index 26a0ca3b052..55ac6a7fa3d 100644
--- a/src/emu/bus/abcbus/turbo.c
+++ b/src/emu/bus/abcbus/turbo.c
@@ -4,9 +4,6 @@
 
     MyAB Turbo-Kontroller disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "turbo.h"
diff --git a/src/emu/bus/abcbus/turbo.h b/src/emu/bus/abcbus/turbo.h
index 9a9b287c10b..c2242eca29e 100644
--- a/src/emu/bus/abcbus/turbo.h
+++ b/src/emu/bus/abcbus/turbo.h
@@ -4,9 +4,6 @@
 
     MyAB Turbo-Kontroller disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abckb/abc77.c b/src/emu/bus/abckb/abc77.c
index a7614bdf9e0..f0efaba23e4 100644
--- a/src/emu/bus/abckb/abc77.c
+++ b/src/emu/bus/abckb/abc77.c
@@ -4,9 +4,6 @@
 
     Luxor ABC-55/77 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abckb/abc77.h b/src/emu/bus/abckb/abc77.h
index 71fc368fd84..5ead0a32f96 100644
--- a/src/emu/bus/abckb/abc77.h
+++ b/src/emu/bus/abckb/abc77.h
@@ -4,9 +4,6 @@
 
     Luxor ABC-55/77 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abckb/abc800kb.c b/src/emu/bus/abckb/abc800kb.c
index 55a18604f86..dd3cbbc7f51 100644
--- a/src/emu/bus/abckb/abc800kb.c
+++ b/src/emu/bus/abckb/abc800kb.c
@@ -4,9 +4,6 @@
 
     Luxor ABC-800 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/abckb/abc800kb.h b/src/emu/bus/abckb/abc800kb.h
index 6428f332f6e..52719062314 100644
--- a/src/emu/bus/abckb/abc800kb.h
+++ b/src/emu/bus/abckb/abc800kb.h
@@ -4,9 +4,6 @@
 
     Luxor ABC-800 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abckb/abc99.c b/src/emu/bus/abckb/abc99.c
index 38ea5fec0fd..a16f763abb7 100644
--- a/src/emu/bus/abckb/abc99.c
+++ b/src/emu/bus/abckb/abc99.c
@@ -4,9 +4,6 @@
 
     Luxor ABC-99 keyboard and mouse emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/abckb/abc99.h b/src/emu/bus/abckb/abc99.h
index e7b01331517..366d9fa23ce 100644
--- a/src/emu/bus/abckb/abc99.h
+++ b/src/emu/bus/abckb/abc99.h
@@ -4,9 +4,6 @@
 
     Luxor ABC-99 keyboard and mouse emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/abckb/abckb.c b/src/emu/bus/abckb/abckb.c
index 6cdf605aaf1..dc9edd10bed 100644
--- a/src/emu/bus/abckb/abckb.c
+++ b/src/emu/bus/abckb/abckb.c
@@ -4,9 +4,6 @@
 
     Luxor ABC 800/802/806/1600 keyboard port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "abckb.h"
diff --git a/src/emu/bus/abckb/abckb.h b/src/emu/bus/abckb/abckb.h
index 6f33da2ed3f..9b396f26983 100644
--- a/src/emu/bus/abckb/abckb.h
+++ b/src/emu/bus/abckb/abckb.h
@@ -4,9 +4,6 @@
 
     Luxor ABC 800/802/806/1600 keyboard port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adam/adamlink.c b/src/emu/bus/adam/adamlink.c
index a3fd6e1407b..1ae12b1156f 100644
--- a/src/emu/bus/adam/adamlink.c
+++ b/src/emu/bus/adam/adamlink.c
@@ -4,9 +4,6 @@
 
     Coleco AdamLink 300 Baud Modem emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "adamlink.h"
diff --git a/src/emu/bus/adam/adamlink.h b/src/emu/bus/adam/adamlink.h
index c06fcb82e57..acf1d2fa31a 100644
--- a/src/emu/bus/adam/adamlink.h
+++ b/src/emu/bus/adam/adamlink.h
@@ -4,9 +4,6 @@
 
     Coleco AdamLink 300 Baud Modem emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adam/exp.c b/src/emu/bus/adam/exp.c
index 6cfc04ad7fe..110a1299188 100644
--- a/src/emu/bus/adam/exp.c
+++ b/src/emu/bus/adam/exp.c
@@ -4,9 +4,6 @@
 
     Coleco Adam Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/adam/exp.h b/src/emu/bus/adam/exp.h
index c352eff6a77..7719c3f8d11 100644
--- a/src/emu/bus/adam/exp.h
+++ b/src/emu/bus/adam/exp.h
@@ -4,9 +4,6 @@
 
     Coleco Adam Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adam/ide.c b/src/emu/bus/adam/ide.c
index 0eb1dd087ea..7ea8a8b24a2 100644
--- a/src/emu/bus/adam/ide.c
+++ b/src/emu/bus/adam/ide.c
@@ -4,9 +4,6 @@
 
     Micro Innovations Powermate IDE Hard Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/adam/ide.h b/src/emu/bus/adam/ide.h
index 4117e670fe0..35e26681bcd 100644
--- a/src/emu/bus/adam/ide.h
+++ b/src/emu/bus/adam/ide.h
@@ -4,9 +4,6 @@
 
     Micro Innovations Powermate IDE Hard Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adam/ram.c b/src/emu/bus/adam/ram.c
index 3ddfdd7fca7..6852de8959a 100644
--- a/src/emu/bus/adam/ram.c
+++ b/src/emu/bus/adam/ram.c
@@ -4,9 +4,6 @@
 
     Coleco Adam Internal 64KB RAM Expansion emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ram.h"
diff --git a/src/emu/bus/adam/ram.h b/src/emu/bus/adam/ram.h
index 5d299ec326e..d6c5e470ee5 100644
--- a/src/emu/bus/adam/ram.h
+++ b/src/emu/bus/adam/ram.h
@@ -4,9 +4,6 @@
 
     Coleco Adam Internal 64KB RAM Expansion emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/adamnet.c b/src/emu/bus/adamnet/adamnet.c
index 132feaa2822..9407b7fbaf2 100644
--- a/src/emu/bus/adamnet/adamnet.c
+++ b/src/emu/bus/adamnet/adamnet.c
@@ -4,9 +4,6 @@
 
     Coleco ADAMnet bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "adamnet.h"
diff --git a/src/emu/bus/adamnet/adamnet.h b/src/emu/bus/adamnet/adamnet.h
index 8c99cd4d622..7bbf9105556 100644
--- a/src/emu/bus/adamnet/adamnet.h
+++ b/src/emu/bus/adamnet/adamnet.h
@@ -4,9 +4,6 @@
 
     Coleco ADAMnet bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/ddp.c b/src/emu/bus/adamnet/ddp.c
index ccd0fd1acdb..cca1617dd43 100644
--- a/src/emu/bus/adamnet/ddp.c
+++ b/src/emu/bus/adamnet/ddp.c
@@ -4,9 +4,6 @@
 
     Coleco Adam Digital Data Pack emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ddp.h"
diff --git a/src/emu/bus/adamnet/ddp.h b/src/emu/bus/adamnet/ddp.h
index 3afb4dbe614..07c2bf0c0c1 100644
--- a/src/emu/bus/adamnet/ddp.h
+++ b/src/emu/bus/adamnet/ddp.h
@@ -4,9 +4,6 @@
 
     Coleco Adam Digital Data Pack emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/fdc.c b/src/emu/bus/adamnet/fdc.c
index c221c6e91f0..f915c227f03 100644
--- a/src/emu/bus/adamnet/fdc.c
+++ b/src/emu/bus/adamnet/fdc.c
@@ -4,9 +4,6 @@
 
     Coleco Adam floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/adamnet/fdc.h b/src/emu/bus/adamnet/fdc.h
index 82883d1bdc5..fb519e1a5ba 100644
--- a/src/emu/bus/adamnet/fdc.h
+++ b/src/emu/bus/adamnet/fdc.h
@@ -4,9 +4,6 @@
 
     Coleco Adam floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/kb.c b/src/emu/bus/adamnet/kb.c
index 01feeea9e5b..a9cc31b8edf 100644
--- a/src/emu/bus/adamnet/kb.c
+++ b/src/emu/bus/adamnet/kb.c
@@ -4,9 +4,6 @@
 
     Coleco Adam keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "kb.h"
diff --git a/src/emu/bus/adamnet/kb.h b/src/emu/bus/adamnet/kb.h
index d917bc7ae07..58bf9f07bc5 100644
--- a/src/emu/bus/adamnet/kb.h
+++ b/src/emu/bus/adamnet/kb.h
@@ -4,9 +4,6 @@
 
     Coleco Adam keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/printer.c b/src/emu/bus/adamnet/printer.c
index 4016fca312f..7de2db87b2e 100644
--- a/src/emu/bus/adamnet/printer.c
+++ b/src/emu/bus/adamnet/printer.c
@@ -4,9 +4,6 @@
 
     Coleco Adam printer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "printer.h"
diff --git a/src/emu/bus/adamnet/printer.h b/src/emu/bus/adamnet/printer.h
index 68f31f31b94..0a2fae5fac5 100644
--- a/src/emu/bus/adamnet/printer.h
+++ b/src/emu/bus/adamnet/printer.h
@@ -4,9 +4,6 @@
 
     Coleco Adam printer controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/adamnet/spi.c b/src/emu/bus/adamnet/spi.c
index 8b0c5e15d52..7cfff9adfeb 100644
--- a/src/emu/bus/adamnet/spi.c
+++ b/src/emu/bus/adamnet/spi.c
@@ -4,9 +4,6 @@
 
     Coleco Adam Serial/Parallel Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "spi.h"
diff --git a/src/emu/bus/adamnet/spi.h b/src/emu/bus/adamnet/spi.h
index dde7a772918..19a1d5c9866 100644
--- a/src/emu/bus/adamnet/spi.h
+++ b/src/emu/bus/adamnet/spi.h
@@ -4,9 +4,6 @@
 
     Coleco Adam Serial/Parallel Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/amiga/zorro/a2052.c b/src/emu/bus/amiga/zorro/a2052.c
index e152e58ebd1..9f2cd78b7a2 100644
--- a/src/emu/bus/amiga/zorro/a2052.c
+++ b/src/emu/bus/amiga/zorro/a2052.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A2052
diff --git a/src/emu/bus/amiga/zorro/a2052.h b/src/emu/bus/amiga/zorro/a2052.h
index 939ed7e3bbc..42601cb3d4a 100644
--- a/src/emu/bus/amiga/zorro/a2052.h
+++ b/src/emu/bus/amiga/zorro/a2052.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A2052
diff --git a/src/emu/bus/amiga/zorro/a2232.c b/src/emu/bus/amiga/zorro/a2232.c
index b1542d60bae..79f4f0ca6c1 100644
--- a/src/emu/bus/amiga/zorro/a2232.c
+++ b/src/emu/bus/amiga/zorro/a2232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A2232
diff --git a/src/emu/bus/amiga/zorro/a2232.h b/src/emu/bus/amiga/zorro/a2232.h
index 29e1b685992..fcc8a6f262f 100644
--- a/src/emu/bus/amiga/zorro/a2232.h
+++ b/src/emu/bus/amiga/zorro/a2232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A2232
diff --git a/src/emu/bus/amiga/zorro/a590.c b/src/emu/bus/amiga/zorro/a590.c
index b929d93f9e7..06370b448c6 100644
--- a/src/emu/bus/amiga/zorro/a590.c
+++ b/src/emu/bus/amiga/zorro/a590.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A590 / A2091
diff --git a/src/emu/bus/amiga/zorro/a590.h b/src/emu/bus/amiga/zorro/a590.h
index 3665ff514c6..dccba098dbf 100644
--- a/src/emu/bus/amiga/zorro/a590.h
+++ b/src/emu/bus/amiga/zorro/a590.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore A590 / A2091
diff --git a/src/emu/bus/amiga/zorro/action_replay.c b/src/emu/bus/amiga/zorro/action_replay.c
index 3baee614d25..c8b9912383c 100644
--- a/src/emu/bus/amiga/zorro/action_replay.c
+++ b/src/emu/bus/amiga/zorro/action_replay.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Datel Action Replay
diff --git a/src/emu/bus/amiga/zorro/action_replay.h b/src/emu/bus/amiga/zorro/action_replay.h
index 5ae6844daa3..d7ca302f9ee 100644
--- a/src/emu/bus/amiga/zorro/action_replay.h
+++ b/src/emu/bus/amiga/zorro/action_replay.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Datel Action Replay
diff --git a/src/emu/bus/amiga/zorro/buddha.c b/src/emu/bus/amiga/zorro/buddha.c
index 22aa2bc819e..4b1a9985586 100644
--- a/src/emu/bus/amiga/zorro/buddha.c
+++ b/src/emu/bus/amiga/zorro/buddha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Buddha
diff --git a/src/emu/bus/amiga/zorro/buddha.h b/src/emu/bus/amiga/zorro/buddha.h
index 5c7b31f7ffc..68dcc6246cc 100644
--- a/src/emu/bus/amiga/zorro/buddha.h
+++ b/src/emu/bus/amiga/zorro/buddha.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Buddha
diff --git a/src/emu/bus/amiga/zorro/cards.c b/src/emu/bus/amiga/zorro/cards.c
index fc1334d606a..8bea6adc42c 100644
--- a/src/emu/bus/amiga/zorro/cards.c
+++ b/src/emu/bus/amiga/zorro/cards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Zorro Cards
diff --git a/src/emu/bus/amiga/zorro/cards.h b/src/emu/bus/amiga/zorro/cards.h
index fbbd2b17b29..bfea56926b2 100644
--- a/src/emu/bus/amiga/zorro/cards.h
+++ b/src/emu/bus/amiga/zorro/cards.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Zorro Cards
diff --git a/src/emu/bus/amiga/zorro/zorro.c b/src/emu/bus/amiga/zorro/zorro.c
index 052893bed8c..2a65f7a6de5 100644
--- a/src/emu/bus/amiga/zorro/zorro.c
+++ b/src/emu/bus/amiga/zorro/zorro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Zorro Slots
diff --git a/src/emu/bus/amiga/zorro/zorro.h b/src/emu/bus/amiga/zorro/zorro.h
index 3119221e7cb..b05d74fb15d 100644
--- a/src/emu/bus/amiga/zorro/zorro.h
+++ b/src/emu/bus/amiga/zorro/zorro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Zorro Slots
diff --git a/src/emu/bus/bml3/bml3bus.c b/src/emu/bus/bml3/bml3bus.c
index 164bdb8a470..edf82d301b2 100644
--- a/src/emu/bus/bml3/bml3bus.c
+++ b/src/emu/bus/bml3/bml3bus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   bml3bus.c - Hitachi MB-6890 slot bus and card emulation
diff --git a/src/emu/bus/bml3/bml3bus.h b/src/emu/bus/bml3/bml3bus.h
index cb6be92cf5a..bd9ce5b6abb 100644
--- a/src/emu/bus/bml3/bml3bus.h
+++ b/src/emu/bus/bml3/bml3bus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   bml3bus.h - Hitachi MB-6890 slot bus and card emulation
diff --git a/src/emu/bus/bml3/bml3kanji.c b/src/emu/bus/bml3/bml3kanji.c
index e13f07e28ff..71582cb73c4 100644
--- a/src/emu/bus/bml3/bml3kanji.c
+++ b/src/emu/bus/bml3/bml3kanji.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3kanji.c
diff --git a/src/emu/bus/bml3/bml3kanji.h b/src/emu/bus/bml3/bml3kanji.h
index 91353e001f9..2b10d13b078 100644
--- a/src/emu/bus/bml3/bml3kanji.h
+++ b/src/emu/bus/bml3/bml3kanji.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3kanji.h
diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/emu/bus/bml3/bml3mp1802.c
index c2320b868c5..f8b10c6aef5 100644
--- a/src/emu/bus/bml3/bml3mp1802.c
+++ b/src/emu/bus/bml3/bml3mp1802.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3mp1802.c
diff --git a/src/emu/bus/bml3/bml3mp1802.h b/src/emu/bus/bml3/bml3mp1802.h
index 81301c79661..42e252619f2 100644
--- a/src/emu/bus/bml3/bml3mp1802.h
+++ b/src/emu/bus/bml3/bml3mp1802.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3mp1802.h
diff --git a/src/emu/bus/bml3/bml3mp1805.c b/src/emu/bus/bml3/bml3mp1805.c
index 225a48d254f..8fd81575d9b 100644
--- a/src/emu/bus/bml3/bml3mp1805.c
+++ b/src/emu/bus/bml3/bml3mp1805.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3mp1805.c
diff --git a/src/emu/bus/bml3/bml3mp1805.h b/src/emu/bus/bml3/bml3mp1805.h
index be2a072ae7d..e7147bab378 100644
--- a/src/emu/bus/bml3/bml3mp1805.h
+++ b/src/emu/bus/bml3/bml3mp1805.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bml3mp1805.h
diff --git a/src/emu/bus/bw2/exp.c b/src/emu/bus/bw2/exp.c
index 2b1470d4c13..b094283a862 100644
--- a/src/emu/bus/bw2/exp.c
+++ b/src/emu/bus/bw2/exp.c
@@ -4,9 +4,6 @@
 
     Bondwell 2 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/bw2/exp.h b/src/emu/bus/bw2/exp.h
index eb664812987..4d87f1d3ea1 100644
--- a/src/emu/bus/bw2/exp.h
+++ b/src/emu/bus/bw2/exp.h
@@ -4,9 +4,6 @@
 
     Bondwell 2 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                      5V       1      26      12V
diff --git a/src/emu/bus/bw2/ramcard.c b/src/emu/bus/bw2/ramcard.c
index 94d53dc0dae..16f5da689cc 100644
--- a/src/emu/bus/bw2/ramcard.c
+++ b/src/emu/bus/bw2/ramcard.c
@@ -4,9 +4,6 @@
 
     Bondwell 2 RAMCARD emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ramcard.h"
diff --git a/src/emu/bus/bw2/ramcard.h b/src/emu/bus/bw2/ramcard.h
index 47c93403628..1d346370567 100644
--- a/src/emu/bus/bw2/ramcard.h
+++ b/src/emu/bus/bw2/ramcard.h
@@ -4,9 +4,6 @@
 
     Bondwell 2 RAMCARD emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/16kb.c b/src/emu/bus/c64/16kb.c
index 74a4830df6d..ff2ce6e3932 100644
--- a/src/emu/bus/c64/16kb.c
+++ b/src/emu/bus/c64/16kb.c
@@ -4,9 +4,6 @@
 
     Commodore 64 16KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "16kb.h"
diff --git a/src/emu/bus/c64/16kb.h b/src/emu/bus/c64/16kb.h
index 039521616e3..6ebec5dca7e 100644
--- a/src/emu/bus/c64/16kb.h
+++ b/src/emu/bus/c64/16kb.h
@@ -4,9 +4,6 @@
 
     Commodore 64 16KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/4dxh.c b/src/emu/bus/c64/4dxh.c
index 8bf79e7c8f9..2dd54543203 100644
--- a/src/emu/bus/c64/4dxh.c
+++ b/src/emu/bus/c64/4dxh.c
@@ -6,9 +6,6 @@
 
     http://hitmen.c02.at/html/hardware.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "4dxh.h"
diff --git a/src/emu/bus/c64/4dxh.h b/src/emu/bus/c64/4dxh.h
index 735c4271115..3e99406ab89 100644
--- a/src/emu/bus/c64/4dxh.h
+++ b/src/emu/bus/c64/4dxh.h
@@ -4,9 +4,6 @@
 
     The Digital Excess & Hitmen 4-Player Joystick adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/4ksa.c b/src/emu/bus/c64/4ksa.c
index 92c1ad0ae3d..749053fde32 100644
--- a/src/emu/bus/c64/4ksa.c
+++ b/src/emu/bus/c64/4ksa.c
@@ -6,9 +6,6 @@
 
     http://hitmen.c02.at/html/hardware.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "4ksa.h"
diff --git a/src/emu/bus/c64/4ksa.h b/src/emu/bus/c64/4ksa.h
index b976c2ef640..8177922fb1e 100644
--- a/src/emu/bus/c64/4ksa.h
+++ b/src/emu/bus/c64/4ksa.h
@@ -4,9 +4,6 @@
 
     Kingsoft 4-Player Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/4tba.c b/src/emu/bus/c64/4tba.c
index 6bea886fc33..56266f5d916 100644
--- a/src/emu/bus/c64/4tba.c
+++ b/src/emu/bus/c64/4tba.c
@@ -6,9 +6,6 @@
 
     http://hitmen.c02.at/html/hardware.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "4tba.h"
diff --git a/src/emu/bus/c64/4tba.h b/src/emu/bus/c64/4tba.h
index 00970549a88..5b4329b5463 100644
--- a/src/emu/bus/c64/4tba.h
+++ b/src/emu/bus/c64/4tba.h
@@ -4,9 +4,6 @@
 
     Starbyte Software Tie Break Adaptor emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/bn1541.c b/src/emu/bus/c64/bn1541.c
index cb475fb6d2f..41e37f17fdd 100644
--- a/src/emu/bus/c64/bn1541.c
+++ b/src/emu/bus/c64/bn1541.c
@@ -6,9 +6,6 @@
 
     http://sta.c64.org/cbmparc2.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "bn1541.h"
diff --git a/src/emu/bus/c64/bn1541.h b/src/emu/bus/c64/bn1541.h
index 48395596ba6..3ad7aee1c87 100644
--- a/src/emu/bus/c64/bn1541.h
+++ b/src/emu/bus/c64/bn1541.h
@@ -4,9 +4,6 @@
 
     SpeedDOS / Burst Nibbler 1541/1571 Parallel Cable emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/c128_comal80.c b/src/emu/bus/c64/c128_comal80.c
index 2b6caeb55ab..25accd52fa0 100644
--- a/src/emu/bus/c64/c128_comal80.c
+++ b/src/emu/bus/c64/c128_comal80.c
@@ -4,9 +4,6 @@
 
     Commodore 128 COMAL 80 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c128_comal80.h"
diff --git a/src/emu/bus/c64/c128_comal80.h b/src/emu/bus/c64/c128_comal80.h
index a206816554e..de7cfc862de 100644
--- a/src/emu/bus/c64/c128_comal80.h
+++ b/src/emu/bus/c64/c128_comal80.h
@@ -4,9 +4,6 @@
 
     Commodore 128 COMAL 80 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/comal80.c b/src/emu/bus/c64/comal80.c
index f21030420cc..ee8ffe0d6fd 100644
--- a/src/emu/bus/c64/comal80.c
+++ b/src/emu/bus/c64/comal80.c
@@ -4,9 +4,6 @@
 
     COMAL 80 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "comal80.h"
diff --git a/src/emu/bus/c64/comal80.h b/src/emu/bus/c64/comal80.h
index c2273ecdd73..766b6ed10d7 100644
--- a/src/emu/bus/c64/comal80.h
+++ b/src/emu/bus/c64/comal80.h
@@ -4,9 +4,6 @@
 
     COMAL 80 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/cpm.c b/src/emu/bus/c64/cpm.c
index 5336b55d11e..1533ab9f93b 100644
--- a/src/emu/bus/c64/cpm.c
+++ b/src/emu/bus/c64/cpm.c
@@ -6,9 +6,6 @@
 
     http://www.baltissen.org/newhtm/c64_cpm.htm
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/cpm.h b/src/emu/bus/c64/cpm.h
index c717a9c23cc..67e7495d027 100644
--- a/src/emu/bus/c64/cpm.h
+++ b/src/emu/bus/c64/cpm.h
@@ -4,9 +4,6 @@
 
     Commodore 64 CP/M cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/currah_speech.c b/src/emu/bus/c64/currah_speech.c
index 3739105fd9b..8e73f0801f1 100644
--- a/src/emu/bus/c64/currah_speech.c
+++ b/src/emu/bus/c64/currah_speech.c
@@ -4,9 +4,6 @@
 
     Currah Speech 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/currah_speech.h b/src/emu/bus/c64/currah_speech.h
index 4b115c5a92e..db687704252 100644
--- a/src/emu/bus/c64/currah_speech.h
+++ b/src/emu/bus/c64/currah_speech.h
@@ -4,9 +4,6 @@
 
     Currah Speech 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/dela_ep256.c b/src/emu/bus/c64/dela_ep256.c
index aa360b6c7b3..b4708e13856 100644
--- a/src/emu/bus/c64/dela_ep256.c
+++ b/src/emu/bus/c64/dela_ep256.c
@@ -4,9 +4,6 @@
 
     Dela 256KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "dela_ep256.h"
diff --git a/src/emu/bus/c64/dela_ep256.h b/src/emu/bus/c64/dela_ep256.h
index d5ac6fe9ff2..8cae8b25b25 100644
--- a/src/emu/bus/c64/dela_ep256.h
+++ b/src/emu/bus/c64/dela_ep256.h
@@ -4,9 +4,6 @@
 
     Dela 256KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/dela_ep64.c b/src/emu/bus/c64/dela_ep64.c
index e19010af95d..006b915908f 100644
--- a/src/emu/bus/c64/dela_ep64.c
+++ b/src/emu/bus/c64/dela_ep64.c
@@ -4,9 +4,6 @@
 
     Dela 64KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "dela_ep64.h"
diff --git a/src/emu/bus/c64/dela_ep64.h b/src/emu/bus/c64/dela_ep64.h
index 7f522f6ce23..9ee3455aeba 100644
--- a/src/emu/bus/c64/dela_ep64.h
+++ b/src/emu/bus/c64/dela_ep64.h
@@ -4,9 +4,6 @@
 
     Dela 64KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/dela_ep7x8.c b/src/emu/bus/c64/dela_ep7x8.c
index be11389a4d6..f79b3828fe5 100644
--- a/src/emu/bus/c64/dela_ep7x8.c
+++ b/src/emu/bus/c64/dela_ep7x8.c
@@ -4,9 +4,6 @@
 
     Dela 7x8K EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "dela_ep7x8.h"
diff --git a/src/emu/bus/c64/dela_ep7x8.h b/src/emu/bus/c64/dela_ep7x8.h
index ca4e019c9f4..cf236fadc07 100644
--- a/src/emu/bus/c64/dela_ep7x8.h
+++ b/src/emu/bus/c64/dela_ep7x8.h
@@ -4,9 +4,6 @@
 
     Dela 7x8K EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/dinamic.c b/src/emu/bus/c64/dinamic.c
index 1ad849f5861..812e0fcdc92 100644
--- a/src/emu/bus/c64/dinamic.c
+++ b/src/emu/bus/c64/dinamic.c
@@ -4,9 +4,6 @@
 
     Dinamic Software cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "dinamic.h"
diff --git a/src/emu/bus/c64/dinamic.h b/src/emu/bus/c64/dinamic.h
index 9c105b596db..2f3ecc07302 100644
--- a/src/emu/bus/c64/dinamic.h
+++ b/src/emu/bus/c64/dinamic.h
@@ -4,9 +4,6 @@
 
     Dinamic Software cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/dqbb.c b/src/emu/bus/c64/dqbb.c
index dbbdc5f1d8b..7e30cdd1545 100644
--- a/src/emu/bus/c64/dqbb.c
+++ b/src/emu/bus/c64/dqbb.c
@@ -4,9 +4,6 @@
 
     Brown Boxes Double Quick Brown Box emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/dqbb.h b/src/emu/bus/c64/dqbb.h
index 75a02e7d745..387be1f2203 100644
--- a/src/emu/bus/c64/dqbb.h
+++ b/src/emu/bus/c64/dqbb.h
@@ -4,9 +4,6 @@
 
     Brown Boxes Double Quick Brown Box emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/easy_calc_result.c b/src/emu/bus/c64/easy_calc_result.c
index 44722503067..d6a4a6b4cf9 100644
--- a/src/emu/bus/c64/easy_calc_result.c
+++ b/src/emu/bus/c64/easy_calc_result.c
@@ -4,9 +4,6 @@
 
     Easy Calc Result cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/easy_calc_result.h b/src/emu/bus/c64/easy_calc_result.h
index fc92fede243..e0fe1e34ac8 100644
--- a/src/emu/bus/c64/easy_calc_result.h
+++ b/src/emu/bus/c64/easy_calc_result.h
@@ -4,9 +4,6 @@
 
     Easy Calc Result cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/easyflash.c b/src/emu/bus/c64/easyflash.c
index aee84fed48f..0af06b0cc48 100644
--- a/src/emu/bus/c64/easyflash.c
+++ b/src/emu/bus/c64/easyflash.c
@@ -4,9 +4,6 @@
 
     EasyFlash cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "easyflash.h"
diff --git a/src/emu/bus/c64/easyflash.h b/src/emu/bus/c64/easyflash.h
index 4e7b1091abd..4dba6c1e5be 100644
--- a/src/emu/bus/c64/easyflash.h
+++ b/src/emu/bus/c64/easyflash.h
@@ -4,9 +4,6 @@
 
     EasyFlash cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/epyx_fast_load.c b/src/emu/bus/c64/epyx_fast_load.c
index 8fd22d77873..7b0dfeb5934 100644
--- a/src/emu/bus/c64/epyx_fast_load.c
+++ b/src/emu/bus/c64/epyx_fast_load.c
@@ -4,9 +4,6 @@
 
     Epyx Fast Load cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "epyx_fast_load.h"
diff --git a/src/emu/bus/c64/epyx_fast_load.h b/src/emu/bus/c64/epyx_fast_load.h
index 50a4304ec73..f0f30c5ccc6 100644
--- a/src/emu/bus/c64/epyx_fast_load.h
+++ b/src/emu/bus/c64/epyx_fast_load.h
@@ -4,9 +4,6 @@
 
     Epyx Fast Load cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/exos.c b/src/emu/bus/c64/exos.c
index 84cffac62a9..0b0ce6c8257 100644
--- a/src/emu/bus/c64/exos.c
+++ b/src/emu/bus/c64/exos.c
@@ -4,9 +4,6 @@
 
     Rex ExOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exos.h"
diff --git a/src/emu/bus/c64/exos.h b/src/emu/bus/c64/exos.h
index 124ff297da0..1fffb003c86 100644
--- a/src/emu/bus/c64/exos.h
+++ b/src/emu/bus/c64/exos.h
@@ -4,9 +4,6 @@
 
     Rex ExOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/exp.c b/src/emu/bus/c64/exp.c
index c48d899dbf5..16b3746e8c7 100644
--- a/src/emu/bus/c64/exp.c
+++ b/src/emu/bus/c64/exp.c
@@ -4,9 +4,6 @@
 
     Commodore 64 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/c64/exp.h b/src/emu/bus/c64/exp.h
index 2374c89abce..8ece3920e82 100644
--- a/src/emu/bus/c64/exp.h
+++ b/src/emu/bus/c64/exp.h
@@ -4,9 +4,6 @@
 
     Commodore 64 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/c64/fcc.c b/src/emu/bus/c64/fcc.c
index 1a22b9c22ba..0757ae94e76 100644
--- a/src/emu/bus/c64/fcc.c
+++ b/src/emu/bus/c64/fcc.c
@@ -4,9 +4,6 @@
 
     Tasc Final ChessCard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/fcc.h b/src/emu/bus/c64/fcc.h
index e41136cdb30..0727e3ebec4 100644
--- a/src/emu/bus/c64/fcc.h
+++ b/src/emu/bus/c64/fcc.h
@@ -4,9 +4,6 @@
 
     Tasc Final ChessCard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/final.c b/src/emu/bus/c64/final.c
index 1a7fbc40b68..8e29c886a16 100644
--- a/src/emu/bus/c64/final.c
+++ b/src/emu/bus/c64/final.c
@@ -4,9 +4,6 @@
 
     Final Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "final.h"
diff --git a/src/emu/bus/c64/final.h b/src/emu/bus/c64/final.h
index d9f193b8352..44ce29e3fee 100644
--- a/src/emu/bus/c64/final.h
+++ b/src/emu/bus/c64/final.h
@@ -4,9 +4,6 @@
 
     Final Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/final3.c b/src/emu/bus/c64/final3.c
index a48053ac7e6..20f969bcbe7 100644
--- a/src/emu/bus/c64/final3.c
+++ b/src/emu/bus/c64/final3.c
@@ -4,9 +4,6 @@
 
     Final Cartridge III emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "final3.h"
diff --git a/src/emu/bus/c64/final3.h b/src/emu/bus/c64/final3.h
index e411d26488f..766e40a942b 100644
--- a/src/emu/bus/c64/final3.h
+++ b/src/emu/bus/c64/final3.h
@@ -4,9 +4,6 @@
 
     Final Cartridge III emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/fun_play.c b/src/emu/bus/c64/fun_play.c
index a96de06d4e9..69aa80288bc 100644
--- a/src/emu/bus/c64/fun_play.c
+++ b/src/emu/bus/c64/fun_play.c
@@ -4,9 +4,6 @@
 
     Fun Play / Power Play cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "fun_play.h"
diff --git a/src/emu/bus/c64/fun_play.h b/src/emu/bus/c64/fun_play.h
index 945fff9c320..6ea38b0ac7f 100644
--- a/src/emu/bus/c64/fun_play.h
+++ b/src/emu/bus/c64/fun_play.h
@@ -4,9 +4,6 @@
 
     Fun Play / Power Play cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/geocable.c b/src/emu/bus/c64/geocable.c
index 98deb96f93e..3b6acc54d2a 100644
--- a/src/emu/bus/c64/geocable.c
+++ b/src/emu/bus/c64/geocable.c
@@ -4,9 +4,6 @@
 
     geoCable Centronics Cable emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "geocable.h"
diff --git a/src/emu/bus/c64/geocable.h b/src/emu/bus/c64/geocable.h
index 90bdfe72b90..16d7b831d7a 100644
--- a/src/emu/bus/c64/geocable.h
+++ b/src/emu/bus/c64/geocable.h
@@ -4,9 +4,6 @@
 
     geoCable Centronics Cable emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/georam.c b/src/emu/bus/c64/georam.c
index a778cfad1c1..d3c30bf029e 100644
--- a/src/emu/bus/c64/georam.c
+++ b/src/emu/bus/c64/georam.c
@@ -4,9 +4,6 @@
 
     Berkeley Softworks GeoRAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "georam.h"
diff --git a/src/emu/bus/c64/georam.h b/src/emu/bus/c64/georam.h
index feb158d1d6f..7415b911dc2 100644
--- a/src/emu/bus/c64/georam.h
+++ b/src/emu/bus/c64/georam.h
@@ -4,9 +4,6 @@
 
     Berkeley Softworks GeoRAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/ide64.c b/src/emu/bus/c64/ide64.c
index 94f804a831b..c327b694fd5 100644
--- a/src/emu/bus/c64/ide64.c
+++ b/src/emu/bus/c64/ide64.c
@@ -4,9 +4,6 @@
 
     IDE64 v4.1 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/ide64.h b/src/emu/bus/c64/ide64.h
index 037f561fdf0..c87cbf41479 100644
--- a/src/emu/bus/c64/ide64.h
+++ b/src/emu/bus/c64/ide64.h
@@ -4,9 +4,6 @@
 
     IDE64 v4.1 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/ieee488.c b/src/emu/bus/c64/ieee488.c
index e5f1213a069..4b41417b42d 100644
--- a/src/emu/bus/c64/ieee488.c
+++ b/src/emu/bus/c64/ieee488.c
@@ -4,9 +4,6 @@
 
     Commodore IEEE-488 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ieee488.h"
diff --git a/src/emu/bus/c64/ieee488.h b/src/emu/bus/c64/ieee488.h
index 15e64ab8be8..9e8b2ee8e4d 100644
--- a/src/emu/bus/c64/ieee488.h
+++ b/src/emu/bus/c64/ieee488.h
@@ -4,9 +4,6 @@
 
     Commodore IEEE-488 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/kingsoft.c b/src/emu/bus/c64/kingsoft.c
index dd262dca553..215670ae78e 100644
--- a/src/emu/bus/c64/kingsoft.c
+++ b/src/emu/bus/c64/kingsoft.c
@@ -4,9 +4,6 @@
 
     Kingsoft cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "kingsoft.h"
diff --git a/src/emu/bus/c64/kingsoft.h b/src/emu/bus/c64/kingsoft.h
index 5d76e1007cb..d6ca889b5fa 100644
--- a/src/emu/bus/c64/kingsoft.h
+++ b/src/emu/bus/c64/kingsoft.h
@@ -4,9 +4,6 @@
 
     Kingsoft cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/mach5.c b/src/emu/bus/c64/mach5.c
index 55fa918d694..dea893ca627 100644
--- a/src/emu/bus/c64/mach5.c
+++ b/src/emu/bus/c64/mach5.c
@@ -4,9 +4,6 @@
 
     Access Software MACH 5 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mach5.h"
diff --git a/src/emu/bus/c64/mach5.h b/src/emu/bus/c64/mach5.h
index 2316735e725..b3e448e77b4 100644
--- a/src/emu/bus/c64/mach5.h
+++ b/src/emu/bus/c64/mach5.h
@@ -4,9 +4,6 @@
 
     Access Software MACH 5 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/magic_desk.c b/src/emu/bus/c64/magic_desk.c
index c47a23b5ea8..7c050abb315 100644
--- a/src/emu/bus/c64/magic_desk.c
+++ b/src/emu/bus/c64/magic_desk.c
@@ -4,9 +4,6 @@
 
     Magic Desk cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "magic_desk.h"
diff --git a/src/emu/bus/c64/magic_desk.h b/src/emu/bus/c64/magic_desk.h
index def4f53eb14..a1db772cb2c 100644
--- a/src/emu/bus/c64/magic_desk.h
+++ b/src/emu/bus/c64/magic_desk.h
@@ -4,9 +4,6 @@
 
     Magic Desk cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/magic_formel.c b/src/emu/bus/c64/magic_formel.c
index d645baf34d5..22faa6cbc9b 100644
--- a/src/emu/bus/c64/magic_formel.c
+++ b/src/emu/bus/c64/magic_formel.c
@@ -4,9 +4,6 @@
 
     Magic Formel cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/magic_formel.h b/src/emu/bus/c64/magic_formel.h
index 58efc616b5c..251fbbb0c90 100644
--- a/src/emu/bus/c64/magic_formel.h
+++ b/src/emu/bus/c64/magic_formel.h
@@ -4,9 +4,6 @@
 
     Magic Formel cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/magic_voice.c b/src/emu/bus/c64/magic_voice.c
index a1758bf3c00..c23c87052e4 100644
--- a/src/emu/bus/c64/magic_voice.c
+++ b/src/emu/bus/c64/magic_voice.c
@@ -4,9 +4,6 @@
 
     Commodore Magic Voice cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/magic_voice.h b/src/emu/bus/c64/magic_voice.h
index 1985cf11fdb..ef385a5a502 100644
--- a/src/emu/bus/c64/magic_voice.h
+++ b/src/emu/bus/c64/magic_voice.h
@@ -4,9 +4,6 @@
 
     Commodore Magic Voice cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/midi_maplin.c b/src/emu/bus/c64/midi_maplin.c
index 8df26140619..7a143391129 100644
--- a/src/emu/bus/c64/midi_maplin.c
+++ b/src/emu/bus/c64/midi_maplin.c
@@ -4,9 +4,6 @@
 
     Maplin MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "midi_maplin.h"
diff --git a/src/emu/bus/c64/midi_maplin.h b/src/emu/bus/c64/midi_maplin.h
index 27f7720e08e..95f447f122e 100644
--- a/src/emu/bus/c64/midi_maplin.h
+++ b/src/emu/bus/c64/midi_maplin.h
@@ -4,9 +4,6 @@
 
     Maplin MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/midi_namesoft.c b/src/emu/bus/c64/midi_namesoft.c
index 1d862953448..cd1553b6187 100644
--- a/src/emu/bus/c64/midi_namesoft.c
+++ b/src/emu/bus/c64/midi_namesoft.c
@@ -4,9 +4,6 @@
 
     Namesoft MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "midi_namesoft.h"
diff --git a/src/emu/bus/c64/midi_namesoft.h b/src/emu/bus/c64/midi_namesoft.h
index 65c42385b9a..bc91dbd8f86 100644
--- a/src/emu/bus/c64/midi_namesoft.h
+++ b/src/emu/bus/c64/midi_namesoft.h
@@ -4,9 +4,6 @@
 
     Namesoft MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/midi_passport.c b/src/emu/bus/c64/midi_passport.c
index c20a96643b3..2948503f675 100644
--- a/src/emu/bus/c64/midi_passport.c
+++ b/src/emu/bus/c64/midi_passport.c
@@ -4,9 +4,6 @@
 
     Passport/Syntech MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "midi_passport.h"
diff --git a/src/emu/bus/c64/midi_passport.h b/src/emu/bus/c64/midi_passport.h
index 80dcc48d493..e60331cd727 100644
--- a/src/emu/bus/c64/midi_passport.h
+++ b/src/emu/bus/c64/midi_passport.h
@@ -4,9 +4,6 @@
 
     Passport/Syntech MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/midi_sci.c b/src/emu/bus/c64/midi_sci.c
index dd0a48c5d5a..40e2c56cbfc 100644
--- a/src/emu/bus/c64/midi_sci.c
+++ b/src/emu/bus/c64/midi_sci.c
@@ -4,9 +4,6 @@
 
     Sequential Circuits MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "midi_sci.h"
diff --git a/src/emu/bus/c64/midi_sci.h b/src/emu/bus/c64/midi_sci.h
index e284cf61097..0401f3a82a1 100644
--- a/src/emu/bus/c64/midi_sci.h
+++ b/src/emu/bus/c64/midi_sci.h
@@ -4,9 +4,6 @@
 
     Sequential Circuits MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/midi_siel.c b/src/emu/bus/c64/midi_siel.c
index ceb0c945e4d..cce956a1427 100644
--- a/src/emu/bus/c64/midi_siel.c
+++ b/src/emu/bus/c64/midi_siel.c
@@ -4,9 +4,6 @@
 
     Siel/JMS/DATEL MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "midi_siel.h"
diff --git a/src/emu/bus/c64/midi_siel.h b/src/emu/bus/c64/midi_siel.h
index fde6c048afd..f566489259e 100644
--- a/src/emu/bus/c64/midi_siel.h
+++ b/src/emu/bus/c64/midi_siel.h
@@ -4,9 +4,6 @@
 
     Siel/JMS/DATEL MIDI Interface cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/mikro_assembler.c b/src/emu/bus/c64/mikro_assembler.c
index c6bcd4530f1..2578d4ae5b4 100644
--- a/src/emu/bus/c64/mikro_assembler.c
+++ b/src/emu/bus/c64/mikro_assembler.c
@@ -4,9 +4,6 @@
 
     Mikro Assembler cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mikro_assembler.h"
diff --git a/src/emu/bus/c64/mikro_assembler.h b/src/emu/bus/c64/mikro_assembler.h
index 5f08ac3c09e..15c4e06279d 100644
--- a/src/emu/bus/c64/mikro_assembler.h
+++ b/src/emu/bus/c64/mikro_assembler.h
@@ -4,9 +4,6 @@
 
     Mikro Assembler cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/multiscreen.c b/src/emu/bus/c64/multiscreen.c
index 0aecddb9c36..0edb8b90c1c 100644
--- a/src/emu/bus/c64/multiscreen.c
+++ b/src/emu/bus/c64/multiscreen.c
@@ -4,9 +4,6 @@
 
     Multiscreen cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/multiscreen.h b/src/emu/bus/c64/multiscreen.h
index edd9bce4fdb..08d570f8308 100644
--- a/src/emu/bus/c64/multiscreen.h
+++ b/src/emu/bus/c64/multiscreen.h
@@ -4,9 +4,6 @@
 
     Multiscreen cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/music64.c b/src/emu/bus/c64/music64.c
index c071e6a9e96..723acad7fa7 100644
--- a/src/emu/bus/c64/music64.c
+++ b/src/emu/bus/c64/music64.c
@@ -4,9 +4,6 @@
 
     Wersi Wersiboard Music 64 / Siel CMK 49 Keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/music64.h b/src/emu/bus/c64/music64.h
index cee59d9e590..bd1cfe2774b 100644
--- a/src/emu/bus/c64/music64.h
+++ b/src/emu/bus/c64/music64.h
@@ -4,9 +4,6 @@
 
     Wersi Wersiboard Music 64 / Siel CMK 49 Keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/neoram.c b/src/emu/bus/c64/neoram.c
index f1142774a51..2b885c86f55 100644
--- a/src/emu/bus/c64/neoram.c
+++ b/src/emu/bus/c64/neoram.c
@@ -4,9 +4,6 @@
 
     NeoRAM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "neoram.h"
diff --git a/src/emu/bus/c64/neoram.h b/src/emu/bus/c64/neoram.h
index aa173423ce5..0011e942a53 100644
--- a/src/emu/bus/c64/neoram.h
+++ b/src/emu/bus/c64/neoram.h
@@ -4,9 +4,6 @@
 
     NeoRAM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/ocean.c b/src/emu/bus/c64/ocean.c
index df68b111423..496651a1b25 100644
--- a/src/emu/bus/c64/ocean.c
+++ b/src/emu/bus/c64/ocean.c
@@ -4,9 +4,6 @@
 
     Ocean Software cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/ocean.h b/src/emu/bus/c64/ocean.h
index e3d7605d7a4..6a44f6a4ace 100644
--- a/src/emu/bus/c64/ocean.h
+++ b/src/emu/bus/c64/ocean.h
@@ -4,9 +4,6 @@
 
     Ocean Software cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/pagefox.c b/src/emu/bus/c64/pagefox.c
index 16c46f12742..8f163f41692 100644
--- a/src/emu/bus/c64/pagefox.c
+++ b/src/emu/bus/c64/pagefox.c
@@ -4,9 +4,6 @@
 
     Scanntronik Pagefox cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/pagefox.h b/src/emu/bus/c64/pagefox.h
index 5437510b3c1..d9c71206e10 100644
--- a/src/emu/bus/c64/pagefox.h
+++ b/src/emu/bus/c64/pagefox.h
@@ -4,9 +4,6 @@
 
     Scanntronik Pagefox cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/partner.c b/src/emu/bus/c64/partner.c
index a81dc50c1da..4feb8022b08 100644
--- a/src/emu/bus/c64/partner.c
+++ b/src/emu/bus/c64/partner.c
@@ -4,9 +4,6 @@
 
     Timeworks PARTNER 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/partner.h b/src/emu/bus/c64/partner.h
index bf383f2fa31..bfa2abb314b 100644
--- a/src/emu/bus/c64/partner.h
+++ b/src/emu/bus/c64/partner.h
@@ -4,9 +4,6 @@
 
     Timeworks PARTNER 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/prophet64.c b/src/emu/bus/c64/prophet64.c
index c42a6ab3e3d..bd61247eed3 100644
--- a/src/emu/bus/c64/prophet64.c
+++ b/src/emu/bus/c64/prophet64.c
@@ -4,9 +4,6 @@
 
     PROPHET64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "prophet64.h"
diff --git a/src/emu/bus/c64/prophet64.h b/src/emu/bus/c64/prophet64.h
index c7dda625c6b..d9ee926de3c 100644
--- a/src/emu/bus/c64/prophet64.h
+++ b/src/emu/bus/c64/prophet64.h
@@ -4,9 +4,6 @@
 
     PROPHET64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/ps64.c b/src/emu/bus/c64/ps64.c
index 48bdbd28add..af9ea9d2402 100644
--- a/src/emu/bus/c64/ps64.c
+++ b/src/emu/bus/c64/ps64.c
@@ -4,9 +4,6 @@
 
     PS-64 speech cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/ps64.h b/src/emu/bus/c64/ps64.h
index ce81078286f..6c7a183c487 100644
--- a/src/emu/bus/c64/ps64.h
+++ b/src/emu/bus/c64/ps64.h
@@ -4,9 +4,6 @@
 
     PS-64 speech cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/reu.c b/src/emu/bus/c64/reu.c
index 3d2f412bf92..bc83c9554d2 100644
--- a/src/emu/bus/c64/reu.c
+++ b/src/emu/bus/c64/reu.c
@@ -4,9 +4,6 @@
 
     Commodore 1700/1750/1764 RAM Expansion Unit emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "reu.h"
diff --git a/src/emu/bus/c64/reu.h b/src/emu/bus/c64/reu.h
index 4d8454d40d5..d3df7f4d1d9 100644
--- a/src/emu/bus/c64/reu.h
+++ b/src/emu/bus/c64/reu.h
@@ -4,9 +4,6 @@
 
     Commodore 1700/1750/1764 RAM Expansion Unit emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/rex.c b/src/emu/bus/c64/rex.c
index ad9e9de45ea..5a4a0abaf78 100644
--- a/src/emu/bus/c64/rex.c
+++ b/src/emu/bus/c64/rex.c
@@ -4,9 +4,6 @@
 
     REX Datentechnik cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "rex.h"
diff --git a/src/emu/bus/c64/rex.h b/src/emu/bus/c64/rex.h
index 393463fc24c..d94b720f22d 100644
--- a/src/emu/bus/c64/rex.h
+++ b/src/emu/bus/c64/rex.h
@@ -4,9 +4,6 @@
 
     REX Datentechnik cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/rex_ep256.c b/src/emu/bus/c64/rex_ep256.c
index d190713de97..ef87cf9dc6f 100644
--- a/src/emu/bus/c64/rex_ep256.c
+++ b/src/emu/bus/c64/rex_ep256.c
@@ -4,9 +4,6 @@
 
     Rex Datentechnik 256KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "rex_ep256.h"
diff --git a/src/emu/bus/c64/rex_ep256.h b/src/emu/bus/c64/rex_ep256.h
index 8e791966ac9..140e8402ce3 100644
--- a/src/emu/bus/c64/rex_ep256.h
+++ b/src/emu/bus/c64/rex_ep256.h
@@ -4,9 +4,6 @@
 
     Rex Datentechnik 256KB EPROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/ross.c b/src/emu/bus/c64/ross.c
index b380f22e5ea..a610d8c987c 100644
--- a/src/emu/bus/c64/ross.c
+++ b/src/emu/bus/c64/ross.c
@@ -4,9 +4,6 @@
 
     Ross cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ross.h"
diff --git a/src/emu/bus/c64/ross.h b/src/emu/bus/c64/ross.h
index 1697fad4885..0cb4d1f36b5 100644
--- a/src/emu/bus/c64/ross.h
+++ b/src/emu/bus/c64/ross.h
@@ -4,9 +4,6 @@
 
     Ross cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/sfx_sound_expander.c b/src/emu/bus/c64/sfx_sound_expander.c
index c9671f32c1b..8c3f7291620 100644
--- a/src/emu/bus/c64/sfx_sound_expander.c
+++ b/src/emu/bus/c64/sfx_sound_expander.c
@@ -4,9 +4,6 @@
 
     Commodore SFX Sound Expander cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "sfx_sound_expander.h"
diff --git a/src/emu/bus/c64/sfx_sound_expander.h b/src/emu/bus/c64/sfx_sound_expander.h
index af685523905..d7a0d229b45 100644
--- a/src/emu/bus/c64/sfx_sound_expander.h
+++ b/src/emu/bus/c64/sfx_sound_expander.h
@@ -4,9 +4,6 @@
 
     Commodore SFX Sound Expander cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/silverrock.c b/src/emu/bus/c64/silverrock.c
index 36585ca41b4..9e9ce421a6c 100644
--- a/src/emu/bus/c64/silverrock.c
+++ b/src/emu/bus/c64/silverrock.c
@@ -4,9 +4,6 @@
 
     SilverRock Productions cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/silverrock.h b/src/emu/bus/c64/silverrock.h
index f597a4223b2..65e20f1ccf6 100644
--- a/src/emu/bus/c64/silverrock.h
+++ b/src/emu/bus/c64/silverrock.h
@@ -4,9 +4,6 @@
 
     SilverRock Productions cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/simons_basic.c b/src/emu/bus/c64/simons_basic.c
index 571a408bf16..01baf228189 100644
--- a/src/emu/bus/c64/simons_basic.c
+++ b/src/emu/bus/c64/simons_basic.c
@@ -4,9 +4,6 @@
 
     VizaWrite 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "simons_basic.h"
diff --git a/src/emu/bus/c64/simons_basic.h b/src/emu/bus/c64/simons_basic.h
index 9cec90878e1..3ebff2b672a 100644
--- a/src/emu/bus/c64/simons_basic.h
+++ b/src/emu/bus/c64/simons_basic.h
@@ -4,9 +4,6 @@
 
     Simons' BASIC cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/stardos.c b/src/emu/bus/c64/stardos.c
index ac4f9b850ce..4c92982c695 100644
--- a/src/emu/bus/c64/stardos.c
+++ b/src/emu/bus/c64/stardos.c
@@ -4,9 +4,6 @@
 
     StarPoint Software StarDOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/stardos.h b/src/emu/bus/c64/stardos.h
index 3222e3c6899..a1cbe520afb 100644
--- a/src/emu/bus/c64/stardos.h
+++ b/src/emu/bus/c64/stardos.h
@@ -4,9 +4,6 @@
 
     StarPoint Software StarDOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/std.c b/src/emu/bus/c64/std.c
index 954854af5ed..6fa3abfef1d 100644
--- a/src/emu/bus/c64/std.c
+++ b/src/emu/bus/c64/std.c
@@ -4,9 +4,6 @@
 
     Commodore 64 Standard 8K/16K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/c64/std.h b/src/emu/bus/c64/std.h
index 7abb8e2ea6e..c726e901025 100644
--- a/src/emu/bus/c64/std.h
+++ b/src/emu/bus/c64/std.h
@@ -4,9 +4,6 @@
 
     Commodore 64 Standard 8K/16K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/structured_basic.c b/src/emu/bus/c64/structured_basic.c
index 829a2481643..404d1b9d753 100644
--- a/src/emu/bus/c64/structured_basic.c
+++ b/src/emu/bus/c64/structured_basic.c
@@ -4,9 +4,6 @@
 
     Structured Basic cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "structured_basic.h"
diff --git a/src/emu/bus/c64/structured_basic.h b/src/emu/bus/c64/structured_basic.h
index e6b419dd596..18465113d94 100644
--- a/src/emu/bus/c64/structured_basic.h
+++ b/src/emu/bus/c64/structured_basic.h
@@ -4,9 +4,6 @@
 
     Structured Basic cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/super_explode.c b/src/emu/bus/c64/super_explode.c
index 9822b3d6eaf..d58923fa97e 100644
--- a/src/emu/bus/c64/super_explode.c
+++ b/src/emu/bus/c64/super_explode.c
@@ -4,9 +4,6 @@
 
     Super Explode! cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "super_explode.h"
diff --git a/src/emu/bus/c64/super_explode.h b/src/emu/bus/c64/super_explode.h
index 681aeae409a..d33b4047725 100644
--- a/src/emu/bus/c64/super_explode.h
+++ b/src/emu/bus/c64/super_explode.h
@@ -4,9 +4,6 @@
 
     Super Explode! cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/super_games.c b/src/emu/bus/c64/super_games.c
index 050b6398515..0e15485993b 100644
--- a/src/emu/bus/c64/super_games.c
+++ b/src/emu/bus/c64/super_games.c
@@ -4,9 +4,6 @@
 
     Commodore Super Games cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "super_games.h"
diff --git a/src/emu/bus/c64/super_games.h b/src/emu/bus/c64/super_games.h
index faca7f0be60..689fe7c79b9 100644
--- a/src/emu/bus/c64/super_games.h
+++ b/src/emu/bus/c64/super_games.h
@@ -4,9 +4,6 @@
 
     Commodore Super Games cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/supercpu.c b/src/emu/bus/c64/supercpu.c
index dbd38f64afd..cb8a28e2198 100644
--- a/src/emu/bus/c64/supercpu.c
+++ b/src/emu/bus/c64/supercpu.c
@@ -4,9 +4,6 @@
 
     CMD SuperCPU v2 + SuperRAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "supercpu.h"
diff --git a/src/emu/bus/c64/supercpu.h b/src/emu/bus/c64/supercpu.h
index c2ad8f4dd40..857f6feb47f 100644
--- a/src/emu/bus/c64/supercpu.h
+++ b/src/emu/bus/c64/supercpu.h
@@ -4,9 +4,6 @@
 
     CMD SuperCPU v2 + SuperRAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/sw8k.c b/src/emu/bus/c64/sw8k.c
index 13d8e8364fa..9b0cce8c55d 100644
--- a/src/emu/bus/c64/sw8k.c
+++ b/src/emu/bus/c64/sw8k.c
@@ -4,9 +4,6 @@
 
     C64 switchable 8K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/sw8k.h b/src/emu/bus/c64/sw8k.h
index 9ae1be357b6..0838baf68a7 100644
--- a/src/emu/bus/c64/sw8k.h
+++ b/src/emu/bus/c64/sw8k.h
@@ -4,9 +4,6 @@
 
     C64 switchable 8K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/swiftlink.c b/src/emu/bus/c64/swiftlink.c
index e47e2444ae9..19e4ea5161a 100644
--- a/src/emu/bus/c64/swiftlink.c
+++ b/src/emu/bus/c64/swiftlink.c
@@ -4,9 +4,6 @@
 
     CMD SwiftLink RS-232 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/swiftlink.h b/src/emu/bus/c64/swiftlink.h
index f9b615dd56b..713bafbb289 100644
--- a/src/emu/bus/c64/swiftlink.h
+++ b/src/emu/bus/c64/swiftlink.h
@@ -4,9 +4,6 @@
 
     CMD SwiftLink RS-232 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/system3.c b/src/emu/bus/c64/system3.c
index 4aeb6c8b459..b14ca7ecc87 100644
--- a/src/emu/bus/c64/system3.c
+++ b/src/emu/bus/c64/system3.c
@@ -4,9 +4,6 @@
 
     System 3 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "system3.h"
diff --git a/src/emu/bus/c64/system3.h b/src/emu/bus/c64/system3.h
index f11ff7e44ae..c6adc33c880 100644
--- a/src/emu/bus/c64/system3.h
+++ b/src/emu/bus/c64/system3.h
@@ -4,9 +4,6 @@
 
     Dinamic Software cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/tdos.c b/src/emu/bus/c64/tdos.c
index 27753f8db98..e472ab7e1db 100644
--- a/src/emu/bus/c64/tdos.c
+++ b/src/emu/bus/c64/tdos.c
@@ -4,9 +4,6 @@
 
     Triton QD TDOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/tdos.h b/src/emu/bus/c64/tdos.h
index 0619c085d66..93e3823d180 100644
--- a/src/emu/bus/c64/tdos.h
+++ b/src/emu/bus/c64/tdos.h
@@ -4,9 +4,6 @@
 
     Triton QD TDOS cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/turbo232.c b/src/emu/bus/c64/turbo232.c
index 6bdb85ab57f..8fe00f65fd1 100644
--- a/src/emu/bus/c64/turbo232.c
+++ b/src/emu/bus/c64/turbo232.c
@@ -4,9 +4,6 @@
 
     CMD Turbo232 RS-232 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/turbo232.h b/src/emu/bus/c64/turbo232.h
index 308c7455b26..b8ff5a17c8c 100644
--- a/src/emu/bus/c64/turbo232.h
+++ b/src/emu/bus/c64/turbo232.h
@@ -4,9 +4,6 @@
 
     CMD Turbo232 RS-232 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/user.c b/src/emu/bus/c64/user.c
index dc8332afb32..54e8bc560d2 100644
--- a/src/emu/bus/c64/user.c
+++ b/src/emu/bus/c64/user.c
@@ -4,9 +4,6 @@
 
     Commodore 64 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "user.h"
diff --git a/src/emu/bus/c64/user.h b/src/emu/bus/c64/user.h
index ee418949dcb..52aed6eb972 100644
--- a/src/emu/bus/c64/user.h
+++ b/src/emu/bus/c64/user.h
@@ -4,9 +4,6 @@
 
     Commodore 64 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/c64/vizastar.c b/src/emu/bus/c64/vizastar.c
index c4175aaecc9..d635ffec656 100644
--- a/src/emu/bus/c64/vizastar.c
+++ b/src/emu/bus/c64/vizastar.c
@@ -4,9 +4,6 @@
 
     VizaStar 64 XL4 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/vizastar.h b/src/emu/bus/c64/vizastar.h
index ce4630f9788..0b01f4424a7 100644
--- a/src/emu/bus/c64/vizastar.h
+++ b/src/emu/bus/c64/vizastar.h
@@ -4,9 +4,6 @@
 
     VizaStar 64 XL4 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/vw64.c b/src/emu/bus/c64/vw64.c
index c613c2908f9..fdc21ff4a05 100644
--- a/src/emu/bus/c64/vw64.c
+++ b/src/emu/bus/c64/vw64.c
@@ -4,9 +4,6 @@
 
     VizaWrite 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/vw64.h b/src/emu/bus/c64/vw64.h
index 2e0b24e7aaa..fac67142a1a 100644
--- a/src/emu/bus/c64/vw64.h
+++ b/src/emu/bus/c64/vw64.h
@@ -4,9 +4,6 @@
 
     VizaWrite 64 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/warp_speed.c b/src/emu/bus/c64/warp_speed.c
index 690629dceea..d625fa5ea7d 100644
--- a/src/emu/bus/c64/warp_speed.c
+++ b/src/emu/bus/c64/warp_speed.c
@@ -4,9 +4,6 @@
 
     Cinemaware Warp Speed cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/c64/warp_speed.h b/src/emu/bus/c64/warp_speed.h
index 1f80c30509f..e115c7be256 100644
--- a/src/emu/bus/c64/warp_speed.h
+++ b/src/emu/bus/c64/warp_speed.h
@@ -4,9 +4,6 @@
 
     Cinemaware Warp Speed cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/westermann.c b/src/emu/bus/c64/westermann.c
index 4e76c0b1618..6a758428a1f 100644
--- a/src/emu/bus/c64/westermann.c
+++ b/src/emu/bus/c64/westermann.c
@@ -4,9 +4,6 @@
 
     Westermann Learning cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "westermann.h"
diff --git a/src/emu/bus/c64/westermann.h b/src/emu/bus/c64/westermann.h
index 9a9ee7dc4ae..9ea1d0d605c 100644
--- a/src/emu/bus/c64/westermann.h
+++ b/src/emu/bus/c64/westermann.h
@@ -4,9 +4,6 @@
 
     Westermann Learning cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/xl80.h b/src/emu/bus/c64/xl80.h
index 711926b19ee..38a90baf6b1 100644
--- a/src/emu/bus/c64/xl80.h
+++ b/src/emu/bus/c64/xl80.h
@@ -4,9 +4,6 @@
 
     XL 80 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/c64/zaxxon.c b/src/emu/bus/c64/zaxxon.c
index c4540bfb530..22ce1f35ce9 100644
--- a/src/emu/bus/c64/zaxxon.c
+++ b/src/emu/bus/c64/zaxxon.c
@@ -4,9 +4,6 @@
 
     Zaxxon/Super Zaxxon cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "zaxxon.h"
diff --git a/src/emu/bus/c64/zaxxon.h b/src/emu/bus/c64/zaxxon.h
index 9c7d9bf354a..b5740605ef0 100644
--- a/src/emu/bus/c64/zaxxon.h
+++ b/src/emu/bus/c64/zaxxon.h
@@ -4,9 +4,6 @@
 
     Zaxxon/Super Zaxxon cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbm2/24k.c b/src/emu/bus/cbm2/24k.c
index b1dd15e8f0a..a31c58a7aaf 100644
--- a/src/emu/bus/cbm2/24k.c
+++ b/src/emu/bus/cbm2/24k.c
@@ -4,9 +4,6 @@
 
     GLA 24K RAM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "24k.h"
diff --git a/src/emu/bus/cbm2/24k.h b/src/emu/bus/cbm2/24k.h
index 6aa28a33c22..80dbc52046b 100644
--- a/src/emu/bus/cbm2/24k.h
+++ b/src/emu/bus/cbm2/24k.h
@@ -4,9 +4,6 @@
 
     GLA 24K RAM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbm2/exp.c b/src/emu/bus/cbm2/exp.c
index 44ffd8ba2d2..f45dbc2caca 100644
--- a/src/emu/bus/cbm2/exp.c
+++ b/src/emu/bus/cbm2/exp.c
@@ -4,9 +4,6 @@
 
     Commodore CBM-II Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/cbm2/exp.h b/src/emu/bus/cbm2/exp.h
index cbdb79941bc..338e4ad1cda 100644
--- a/src/emu/bus/cbm2/exp.h
+++ b/src/emu/bus/cbm2/exp.h
@@ -4,9 +4,6 @@
 
     Commodore CBM-II Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                      A0       1      A       BD0
diff --git a/src/emu/bus/cbm2/hrg.c b/src/emu/bus/cbm2/hrg.c
index 893b237bc5f..cb489ec359f 100644
--- a/src/emu/bus/cbm2/hrg.c
+++ b/src/emu/bus/cbm2/hrg.c
@@ -4,9 +4,6 @@
 
     CBM 500/600/700 High Resolution Graphics cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbm2/hrg.h b/src/emu/bus/cbm2/hrg.h
index 78097da80e2..91892274fc1 100644
--- a/src/emu/bus/cbm2/hrg.h
+++ b/src/emu/bus/cbm2/hrg.h
@@ -4,9 +4,6 @@
 
     CBM 500/600/700 High Resolution Graphics cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbm2/std.c b/src/emu/bus/cbm2/std.c
index a8198c8085b..e6e697927dc 100644
--- a/src/emu/bus/cbm2/std.c
+++ b/src/emu/bus/cbm2/std.c
@@ -4,9 +4,6 @@
 
     Commodore CBM-II Standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/cbm2/std.h b/src/emu/bus/cbm2/std.h
index 8c2106fd8b1..8dee67b9c11 100644
--- a/src/emu/bus/cbm2/std.h
+++ b/src/emu/bus/cbm2/std.h
@@ -4,9 +4,6 @@
 
     Commodore CBM-II Standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbm2/user.c b/src/emu/bus/cbm2/user.c
index 428650472bf..6383f39b061 100644
--- a/src/emu/bus/cbm2/user.c
+++ b/src/emu/bus/cbm2/user.c
@@ -4,9 +4,6 @@
 
     Commodore CBM-II User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "user.h"
diff --git a/src/emu/bus/cbm2/user.h b/src/emu/bus/cbm2/user.h
index 5000bec678b..7952517ed05 100644
--- a/src/emu/bus/cbm2/user.h
+++ b/src/emu/bus/cbm2/user.h
@@ -4,9 +4,6 @@
 
     Commodore CBM-II User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      14      2D0
diff --git a/src/emu/bus/cbmiec/c1541.c b/src/emu/bus/cbmiec/c1541.c
index 94e594752f2..ea7ec412f7d 100644
--- a/src/emu/bus/cbmiec/c1541.c
+++ b/src/emu/bus/cbmiec/c1541.c
@@ -4,9 +4,6 @@
 
     Commodore 1540/1541/1541C/1541-II Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/c1541.h b/src/emu/bus/cbmiec/c1541.h
index 26c739d07e3..9fa827f1b69 100644
--- a/src/emu/bus/cbmiec/c1541.h
+++ b/src/emu/bus/cbmiec/c1541.h
@@ -4,9 +4,6 @@
 
     Commodore 1540/1541/1541C/1541-II Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/c1571.c b/src/emu/bus/cbmiec/c1571.c
index 4f0d9da6efd..5f762ff68c3 100644
--- a/src/emu/bus/cbmiec/c1571.c
+++ b/src/emu/bus/cbmiec/c1571.c
@@ -4,9 +4,6 @@
 
     Commodore 1570/1571/1571CR Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/c1571.h b/src/emu/bus/cbmiec/c1571.h
index 4bcd01d5c2b..ea8ec74fb6a 100644
--- a/src/emu/bus/cbmiec/c1571.h
+++ b/src/emu/bus/cbmiec/c1571.h
@@ -4,9 +4,6 @@
 
     Commodore 1570/1571/1571CR Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/c1581.c b/src/emu/bus/cbmiec/c1581.c
index e48b93d21bf..c0f9dae2cf0 100644
--- a/src/emu/bus/cbmiec/c1581.c
+++ b/src/emu/bus/cbmiec/c1581.c
@@ -4,9 +4,6 @@
 
     Commodore 1581/1563 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/c1581.h b/src/emu/bus/cbmiec/c1581.h
index 52062e36909..878aae4b920 100644
--- a/src/emu/bus/cbmiec/c1581.h
+++ b/src/emu/bus/cbmiec/c1581.h
@@ -4,9 +4,6 @@
 
     Commodore 1581/1563 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/c64_nl10.c b/src/emu/bus/cbmiec/c64_nl10.c
index ea3fcc1a634..970baa2f941 100644
--- a/src/emu/bus/cbmiec/c64_nl10.c
+++ b/src/emu/bus/cbmiec/c64_nl10.c
@@ -4,9 +4,6 @@
 
     Star NL-10 Printer Interface Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c64_nl10.h"
diff --git a/src/emu/bus/cbmiec/c64_nl10.h b/src/emu/bus/cbmiec/c64_nl10.h
index 22e32ca98ce..f0ceafd3f2d 100644
--- a/src/emu/bus/cbmiec/c64_nl10.h
+++ b/src/emu/bus/cbmiec/c64_nl10.h
@@ -4,9 +4,6 @@
 
     Star NL-10 Printer Interface Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/cbmiec.c b/src/emu/bus/cbmiec/cbmiec.c
index 76cc1a70152..f7b89521fa0 100644
--- a/src/emu/bus/cbmiec/cbmiec.c
+++ b/src/emu/bus/cbmiec/cbmiec.c
@@ -4,9 +4,6 @@
 
     Commodore IEC Serial Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/cbmiec.h b/src/emu/bus/cbmiec/cbmiec.h
index 685a01ad7bd..627e3dc203f 100644
--- a/src/emu/bus/cbmiec/cbmiec.h
+++ b/src/emu/bus/cbmiec/cbmiec.h
@@ -4,9 +4,6 @@
 
     Commodore IEC Serial Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/cmdhd.c b/src/emu/bus/cbmiec/cmdhd.c
index ba794889b77..d3025700fa7 100644
--- a/src/emu/bus/cbmiec/cmdhd.c
+++ b/src/emu/bus/cbmiec/cmdhd.c
@@ -4,9 +4,6 @@
 
     CMD HD hard drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cmdhd.h"
diff --git a/src/emu/bus/cbmiec/cmdhd.h b/src/emu/bus/cbmiec/cmdhd.h
index bbd7f09b25c..f71c0ad2741 100644
--- a/src/emu/bus/cbmiec/cmdhd.h
+++ b/src/emu/bus/cbmiec/cmdhd.h
@@ -4,9 +4,6 @@
 
     CMD HD disk drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/diag264_lb_iec.c b/src/emu/bus/cbmiec/diag264_lb_iec.c
index 47c9a2ed94c..d9c2e5ed303 100644
--- a/src/emu/bus/cbmiec/diag264_lb_iec.c
+++ b/src/emu/bus/cbmiec/diag264_lb_iec.c
@@ -4,9 +4,6 @@
 
     Diag264 Serial Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "diag264_lb_iec.h"
diff --git a/src/emu/bus/cbmiec/diag264_lb_iec.h b/src/emu/bus/cbmiec/diag264_lb_iec.h
index ac3a5410e0b..ac963ec231e 100644
--- a/src/emu/bus/cbmiec/diag264_lb_iec.h
+++ b/src/emu/bus/cbmiec/diag264_lb_iec.h
@@ -4,9 +4,6 @@
 
     Diag264 Serial Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/fd2000.c b/src/emu/bus/cbmiec/fd2000.c
index fc277d1f4d0..d31b9d97507 100644
--- a/src/emu/bus/cbmiec/fd2000.c
+++ b/src/emu/bus/cbmiec/fd2000.c
@@ -4,9 +4,6 @@
 
     CMD FD-2000/FD-4000 disk drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/fd2000.h b/src/emu/bus/cbmiec/fd2000.h
index 5a0bc0b8e8d..00ff81a038d 100644
--- a/src/emu/bus/cbmiec/fd2000.h
+++ b/src/emu/bus/cbmiec/fd2000.h
@@ -4,9 +4,6 @@
 
     CMD FD-2000/FD-4000 disk drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/interpod.c b/src/emu/bus/cbmiec/interpod.c
index a5cdb5a3dc4..3354022508e 100644
--- a/src/emu/bus/cbmiec/interpod.c
+++ b/src/emu/bus/cbmiec/interpod.c
@@ -4,9 +4,6 @@
 
     Oxford Computer Systems Interpod IEC to IEEE interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/cbmiec/interpod.h b/src/emu/bus/cbmiec/interpod.h
index 758bd2f9cca..d2fee65fb3a 100644
--- a/src/emu/bus/cbmiec/interpod.h
+++ b/src/emu/bus/cbmiec/interpod.h
@@ -4,9 +4,6 @@
 
     Oxford Computer Systems Interpod IEC to IEEE interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cbmiec/serialbox.c b/src/emu/bus/cbmiec/serialbox.c
index 25ec2da40fc..c3b653cb030 100644
--- a/src/emu/bus/cbmiec/serialbox.c
+++ b/src/emu/bus/cbmiec/serialbox.c
@@ -4,9 +4,6 @@
 
     Serial Box 64K Serial Port Buffer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "serialbox.h"
diff --git a/src/emu/bus/cbmiec/serialbox.h b/src/emu/bus/cbmiec/serialbox.h
index 3cabb6edca6..f045fd05dfb 100644
--- a/src/emu/bus/cbmiec/serialbox.h
+++ b/src/emu/bus/cbmiec/serialbox.h
@@ -4,9 +4,6 @@
 
     Serial Box 64K Serial Port Buffer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/centronics/comxpl80.c b/src/emu/bus/centronics/comxpl80.c
index 6f77a8c26a5..6c3fa83a8d7 100644
--- a/src/emu/bus/centronics/comxpl80.c
+++ b/src/emu/bus/centronics/comxpl80.c
@@ -4,9 +4,6 @@
 
     COMX PL-80 plotter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/centronics/comxpl80.h b/src/emu/bus/centronics/comxpl80.h
index b169e5741b1..4a943459c09 100644
--- a/src/emu/bus/centronics/comxpl80.h
+++ b/src/emu/bus/centronics/comxpl80.h
@@ -4,9 +4,6 @@
 
     COMX PL-80 plotter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/centronics/ctronics.c b/src/emu/bus/centronics/ctronics.c
index 58329364b0a..c27affa41ea 100644
--- a/src/emu/bus/centronics/ctronics.c
+++ b/src/emu/bus/centronics/ctronics.c
@@ -4,9 +4,6 @@
 
     Centronics printer interface
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "ctronics.h"
diff --git a/src/emu/bus/centronics/ctronics.h b/src/emu/bus/centronics/ctronics.h
index 5f7d5df0048..79c27ec9467 100644
--- a/src/emu/bus/centronics/ctronics.h
+++ b/src/emu/bus/centronics/ctronics.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Centronics printer interface
diff --git a/src/emu/bus/centronics/digiblst.c b/src/emu/bus/centronics/digiblst.c
index b03189d0206..736f2a5ff94 100644
--- a/src/emu/bus/centronics/digiblst.c
+++ b/src/emu/bus/centronics/digiblst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * digiblst.c
  *
diff --git a/src/emu/bus/centronics/digiblst.h b/src/emu/bus/centronics/digiblst.h
index 3e66942961b..4baeb297c6f 100644
--- a/src/emu/bus/centronics/digiblst.h
+++ b/src/emu/bus/centronics/digiblst.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * digiblst.h
  *
diff --git a/src/emu/bus/centronics/epson_ex800.h b/src/emu/bus/centronics/epson_ex800.h
index c64ca3b2e6e..5be05d7cb4f 100644
--- a/src/emu/bus/centronics/epson_ex800.h
+++ b/src/emu/bus/centronics/epson_ex800.h
@@ -4,9 +4,6 @@
 
     Epson EX-800 dot matrix printer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/centronics/epson_lx800.h b/src/emu/bus/centronics/epson_lx800.h
index 1507b34b4d5..9af1ff3538d 100644
--- a/src/emu/bus/centronics/epson_lx800.h
+++ b/src/emu/bus/centronics/epson_lx800.h
@@ -4,9 +4,6 @@
 
     Epson LX-800 dot matrix printer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/centronics/epson_lx810l.c b/src/emu/bus/centronics/epson_lx810l.c
index 933eef5cee4..eb54b1b23a3 100644
--- a/src/emu/bus/centronics/epson_lx810l.c
+++ b/src/emu/bus/centronics/epson_lx810l.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Epson LX-810L dot matrix printer emulation
  *
diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/emu/bus/centronics/epson_lx810l.h
index 5e35378ce2e..3f6a05ec7af 100644
--- a/src/emu/bus/centronics/epson_lx810l.h
+++ b/src/emu/bus/centronics/epson_lx810l.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Epson LX-810L dot matrix printer emulation
  *
diff --git a/src/emu/bus/centronics/printer.c b/src/emu/bus/centronics/printer.c
index 72d5e506479..d070a75fa2f 100644
--- a/src/emu/bus/centronics/printer.c
+++ b/src/emu/bus/centronics/printer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "printer.h"
 
diff --git a/src/emu/bus/centronics/printer.h b/src/emu/bus/centronics/printer.h
index 4b0ae50cd1e..2a1a15985c6 100644
--- a/src/emu/bus/centronics/printer.h
+++ b/src/emu/bus/centronics/printer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CENTRONICS_PRINTER_H__
diff --git a/src/emu/bus/coco/coco_232.c b/src/emu/bus/coco/coco_232.c
index 14cc989f9cd..06cc4291af8 100644
--- a/src/emu/bus/coco/coco_232.c
+++ b/src/emu/bus/coco/coco_232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_232.c
diff --git a/src/emu/bus/coco/coco_232.h b/src/emu/bus/coco/coco_232.h
index 80d986a010c..089e1691a7a 100644
--- a/src/emu/bus/coco/coco_232.h
+++ b/src/emu/bus/coco/coco_232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COCO_232_H__
diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/emu/bus/coco/coco_dwsock.c
index 4487af80034..23b89836814 100644
--- a/src/emu/bus/coco/coco_dwsock.c
+++ b/src/emu/bus/coco/coco_dwsock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef __GNUC__
diff --git a/src/emu/bus/coco/coco_dwsock.h b/src/emu/bus/coco/coco_dwsock.h
index 0006a091cdc..6b6f06fabb4 100644
--- a/src/emu/bus/coco/coco_dwsock.h
+++ b/src/emu/bus/coco/coco_dwsock.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _DWSOCK_H_
 #define _DWSOCK_H_
 
diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c
index 241a798470a..f8b1f7afdf4 100644
--- a/src/emu/bus/coco/coco_fdc.c
+++ b/src/emu/bus/coco/coco_fdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     coco_fdc.c
diff --git a/src/emu/bus/coco/coco_fdc.h b/src/emu/bus/coco/coco_fdc.h
index a9d1dac8eab..38430016bdd 100644
--- a/src/emu/bus/coco/coco_fdc.h
+++ b/src/emu/bus/coco/coco_fdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COCO_FDC_H__
diff --git a/src/emu/bus/coco/coco_multi.c b/src/emu/bus/coco/coco_multi.c
index 57d86d45ce6..4c93eb7a817 100644
--- a/src/emu/bus/coco/coco_multi.c
+++ b/src/emu/bus/coco/coco_multi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_multi.c
diff --git a/src/emu/bus/coco/coco_multi.h b/src/emu/bus/coco/coco_multi.h
index f16ebe7cc5d..e912c3882ff 100644
--- a/src/emu/bus/coco/coco_multi.h
+++ b/src/emu/bus/coco/coco_multi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_multi.h
diff --git a/src/emu/bus/coco/coco_orch90.c b/src/emu/bus/coco/coco_orch90.c
index ba1aa29cf69..5249d277cfe 100644
--- a/src/emu/bus/coco/coco_orch90.c
+++ b/src/emu/bus/coco/coco_orch90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     orch90.c
diff --git a/src/emu/bus/coco/coco_orch90.h b/src/emu/bus/coco/coco_orch90.h
index b7e27f43f32..13ef3906820 100644
--- a/src/emu/bus/coco/coco_orch90.h
+++ b/src/emu/bus/coco/coco_orch90.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COCO_ORCH90_H__
diff --git a/src/emu/bus/coco/coco_pak.c b/src/emu/bus/coco/coco_pak.c
index 6a381568322..a132e50a32d 100644
--- a/src/emu/bus/coco/coco_pak.c
+++ b/src/emu/bus/coco/coco_pak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_pak.c
diff --git a/src/emu/bus/coco/coco_pak.h b/src/emu/bus/coco/coco_pak.h
index 67f580f6daf..79f6ca4d6e1 100644
--- a/src/emu/bus/coco/coco_pak.h
+++ b/src/emu/bus/coco/coco_pak.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COCO_PAK_H__
diff --git a/src/emu/bus/coco/cococart.c b/src/emu/bus/coco/cococart.c
index 626382b283b..4ee0080fa0d 100644
--- a/src/emu/bus/coco/cococart.c
+++ b/src/emu/bus/coco/cococart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cococart.c
diff --git a/src/emu/bus/coco/cococart.h b/src/emu/bus/coco/cococart.h
index 05f50ff135c..d0eab78fa9b 100644
--- a/src/emu/bus/coco/cococart.h
+++ b/src/emu/bus/coco/cococart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cococart.h
diff --git a/src/emu/bus/coleco/ctrl.c b/src/emu/bus/coleco/ctrl.c
index 4b7a0264b40..575276ee231 100644
--- a/src/emu/bus/coleco/ctrl.c
+++ b/src/emu/bus/coleco/ctrl.c
@@ -4,9 +4,6 @@
 
     ColecoVision controller port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ctrl.h"
diff --git a/src/emu/bus/coleco/ctrl.h b/src/emu/bus/coleco/ctrl.h
index bbbf3217428..dc45d18c1aa 100644
--- a/src/emu/bus/coleco/ctrl.h
+++ b/src/emu/bus/coleco/ctrl.h
@@ -4,9 +4,6 @@
 
     ColecoVision controller port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
 
diff --git a/src/emu/bus/coleco/exp.c b/src/emu/bus/coleco/exp.c
index 68834faf4b1..e8be5dfe15d 100644
--- a/src/emu/bus/coleco/exp.c
+++ b/src/emu/bus/coleco/exp.c
@@ -4,9 +4,6 @@
 
     ColecoVision cartridge port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/coleco/exp.h b/src/emu/bus/coleco/exp.h
index 8e5e7774cac..882bb04b659 100644
--- a/src/emu/bus/coleco/exp.h
+++ b/src/emu/bus/coleco/exp.h
@@ -4,9 +4,6 @@
 
     ColecoVision cartridge port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                      D2       1      2       /C000
diff --git a/src/emu/bus/coleco/hand.c b/src/emu/bus/coleco/hand.c
index ea91bb092c2..058f06a3711 100644
--- a/src/emu/bus/coleco/hand.c
+++ b/src/emu/bus/coleco/hand.c
@@ -4,9 +4,6 @@
 
     ColecoVision Hand Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "hand.h"
diff --git a/src/emu/bus/coleco/hand.h b/src/emu/bus/coleco/hand.h
index aeab7d65683..d57ea3ea212 100644
--- a/src/emu/bus/coleco/hand.h
+++ b/src/emu/bus/coleco/hand.h
@@ -4,9 +4,6 @@
 
     ColecoVision Hand Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/coleco/sac.c b/src/emu/bus/coleco/sac.c
index b91341bfcf1..42ef14ca909 100644
--- a/src/emu/bus/coleco/sac.c
+++ b/src/emu/bus/coleco/sac.c
@@ -4,9 +4,6 @@
 
     ColecoVision Super Action Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "sac.h"
diff --git a/src/emu/bus/coleco/sac.h b/src/emu/bus/coleco/sac.h
index 18c6ec2eb3c..b4bf3b09111 100644
--- a/src/emu/bus/coleco/sac.h
+++ b/src/emu/bus/coleco/sac.h
@@ -4,9 +4,6 @@
 
     ColecoVision Super Action Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/coleco/std.c b/src/emu/bus/coleco/std.c
index 790a3987374..f66a0463eae 100644
--- a/src/emu/bus/coleco/std.c
+++ b/src/emu/bus/coleco/std.c
@@ -4,9 +4,6 @@
 
     ColecoVision standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/coleco/std.h b/src/emu/bus/coleco/std.h
index 46b8c8b3521..ee0a6e24e9a 100644
--- a/src/emu/bus/coleco/std.h
+++ b/src/emu/bus/coleco/std.h
@@ -4,9 +4,6 @@
 
     ColecoVision standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/compucolor/floppy.c b/src/emu/bus/compucolor/floppy.c
index a2c840af357..7fa7e678dc2 100644
--- a/src/emu/bus/compucolor/floppy.c
+++ b/src/emu/bus/compucolor/floppy.c
@@ -4,9 +4,6 @@
 
     Compucolor Floppy Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "floppy.h"
diff --git a/src/emu/bus/compucolor/floppy.h b/src/emu/bus/compucolor/floppy.h
index 4d75e3ca923..f229e96c3a9 100644
--- a/src/emu/bus/compucolor/floppy.h
+++ b/src/emu/bus/compucolor/floppy.h
@@ -4,9 +4,6 @@
 
     Compucolor Floppy Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/clm.c b/src/emu/bus/comx35/clm.c
index a29fecd698d..b9cc57b836f 100644
--- a/src/emu/bus/comx35/clm.c
+++ b/src/emu/bus/comx35/clm.c
@@ -4,9 +4,6 @@
 
     COMX-35 80-Column Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/comx35/clm.h b/src/emu/bus/comx35/clm.h
index a79ef6ac043..c64e57956bd 100644
--- a/src/emu/bus/comx35/clm.h
+++ b/src/emu/bus/comx35/clm.h
@@ -4,9 +4,6 @@
 
     COMX-35 80-Column Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/eprom.c b/src/emu/bus/comx35/eprom.c
index 1ef8305f78d..56be84b4902 100644
--- a/src/emu/bus/comx35/eprom.c
+++ b/src/emu/bus/comx35/eprom.c
@@ -4,9 +4,6 @@
 
     COMX-35 F&M EPROM Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "eprom.h"
diff --git a/src/emu/bus/comx35/eprom.h b/src/emu/bus/comx35/eprom.h
index d854446bb50..f3b03f42367 100644
--- a/src/emu/bus/comx35/eprom.h
+++ b/src/emu/bus/comx35/eprom.h
@@ -4,9 +4,6 @@
 
     COMX-35 F&M EPROM Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/exp.c b/src/emu/bus/comx35/exp.c
index 27cdf41ee99..b0ff7aa77c3 100644
--- a/src/emu/bus/comx35/exp.c
+++ b/src/emu/bus/comx35/exp.c
@@ -4,9 +4,6 @@
 
     COMX-35 Expansion Slot emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/comx35/exp.h b/src/emu/bus/comx35/exp.h
index 9afffd9ff98..df4f7fffb68 100644
--- a/src/emu/bus/comx35/exp.h
+++ b/src/emu/bus/comx35/exp.h
@@ -4,9 +4,6 @@
 
     COMX-35 Expansion Slot emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/comx35/expbox.c b/src/emu/bus/comx35/expbox.c
index 6b5acf04d40..7e4e9799e29 100644
--- a/src/emu/bus/comx35/expbox.c
+++ b/src/emu/bus/comx35/expbox.c
@@ -4,9 +4,6 @@
 
     COMX-35E Expansion Box emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/comx35/expbox.h b/src/emu/bus/comx35/expbox.h
index fac6f043500..6863f2c1339 100644
--- a/src/emu/bus/comx35/expbox.h
+++ b/src/emu/bus/comx35/expbox.h
@@ -4,9 +4,6 @@
 
     COMX-35E Expansion Box emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/fdc.c b/src/emu/bus/comx35/fdc.c
index f1aaed1c904..0c50673cc0f 100644
--- a/src/emu/bus/comx35/fdc.c
+++ b/src/emu/bus/comx35/fdc.c
@@ -4,9 +4,6 @@
 
     COMX-35 Disk Controller Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/comx35/fdc.h b/src/emu/bus/comx35/fdc.h
index 8fb755eec1c..ce1a71c46a2 100644
--- a/src/emu/bus/comx35/fdc.h
+++ b/src/emu/bus/comx35/fdc.h
@@ -4,9 +4,6 @@
 
     COMX-35 Disk Controller Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/joycard.c b/src/emu/bus/comx35/joycard.c
index e001d986481..2408693f1b8 100644
--- a/src/emu/bus/comx35/joycard.c
+++ b/src/emu/bus/comx35/joycard.c
@@ -4,9 +4,6 @@
 
     COMX-35 F&M Joycard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "joycard.h"
diff --git a/src/emu/bus/comx35/joycard.h b/src/emu/bus/comx35/joycard.h
index 869df01eb58..be7bd63e528 100644
--- a/src/emu/bus/comx35/joycard.h
+++ b/src/emu/bus/comx35/joycard.h
@@ -4,9 +4,6 @@
 
     COMX-35 F&M Joycard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/printer.c b/src/emu/bus/comx35/printer.c
index 1851865b73f..2f36fffd9bd 100644
--- a/src/emu/bus/comx35/printer.c
+++ b/src/emu/bus/comx35/printer.c
@@ -4,9 +4,6 @@
 
     COMX-35 Serial/Parallel Printer Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "printer.h"
diff --git a/src/emu/bus/comx35/printer.h b/src/emu/bus/comx35/printer.h
index 85797d6cbd2..f67997b19ea 100644
--- a/src/emu/bus/comx35/printer.h
+++ b/src/emu/bus/comx35/printer.h
@@ -4,9 +4,6 @@
 
     COMX-35 Serial/Parallel Printer Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/ram.c b/src/emu/bus/comx35/ram.c
index 1bec0a5343b..0a2caafa1da 100644
--- a/src/emu/bus/comx35/ram.c
+++ b/src/emu/bus/comx35/ram.c
@@ -4,9 +4,6 @@
 
     COMX-35 RAM Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ram.h"
diff --git a/src/emu/bus/comx35/ram.h b/src/emu/bus/comx35/ram.h
index 532adf95c58..3618d6e2b4b 100644
--- a/src/emu/bus/comx35/ram.h
+++ b/src/emu/bus/comx35/ram.h
@@ -4,9 +4,6 @@
 
     COMX-35 RAM Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/comx35/thermal.c b/src/emu/bus/comx35/thermal.c
index 9746f294a6a..e74b62978d6 100644
--- a/src/emu/bus/comx35/thermal.c
+++ b/src/emu/bus/comx35/thermal.c
@@ -4,9 +4,6 @@
 
     COMX-35 Thermal Printer Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "thermal.h"
diff --git a/src/emu/bus/comx35/thermal.h b/src/emu/bus/comx35/thermal.h
index 3a4c39ada97..8314039301c 100644
--- a/src/emu/bus/comx35/thermal.h
+++ b/src/emu/bus/comx35/thermal.h
@@ -4,9 +4,6 @@
 
     COMX-35 Thermal Printer Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/cpc/amdrum.c b/src/emu/bus/cpc/amdrum.c
index 83ce8d21b9b..0a879596081 100644
--- a/src/emu/bus/cpc/amdrum.c
+++ b/src/emu/bus/cpc/amdrum.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * amdrum.c
  *
diff --git a/src/emu/bus/cpc/amdrum.h b/src/emu/bus/cpc/amdrum.h
index 5439855943c..3548b992e92 100644
--- a/src/emu/bus/cpc/amdrum.h
+++ b/src/emu/bus/cpc/amdrum.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * amdrum.h
  *
diff --git a/src/emu/bus/cpc/cpc_pds.c b/src/emu/bus/cpc/cpc_pds.c
index 5cf78675728..65b24e02864 100644
--- a/src/emu/bus/cpc/cpc_pds.c
+++ b/src/emu/bus/cpc/cpc_pds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_pds.c  --  CPC interface hardware for the Programmers Development System
  *
diff --git a/src/emu/bus/cpc/cpc_pds.h b/src/emu/bus/cpc/cpc_pds.h
index 74f79add041..1aa4f458052 100644
--- a/src/emu/bus/cpc/cpc_pds.h
+++ b/src/emu/bus/cpc/cpc_pds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_pds.h  --  CPC interface hardware for the Programmers Development System
  *
diff --git a/src/emu/bus/cpc/cpc_rom.c b/src/emu/bus/cpc/cpc_rom.c
index f1b0ee3470a..0bb3516381a 100644
--- a/src/emu/bus/cpc/cpc_rom.c
+++ b/src/emu/bus/cpc/cpc_rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_rom.c
  * Amstrad CPC mountable ROM image device
diff --git a/src/emu/bus/cpc/cpc_rom.h b/src/emu/bus/cpc/cpc_rom.h
index 2f3866b2b11..e470c40d5c5 100644
--- a/src/emu/bus/cpc/cpc_rom.h
+++ b/src/emu/bus/cpc/cpc_rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_rom.h
  * Amstrad CPC mountable ROM image device
diff --git a/src/emu/bus/cpc/cpc_rs232.c b/src/emu/bus/cpc/cpc_rs232.c
index c82b770cb9c..440222d7b30 100644
--- a/src/emu/bus/cpc/cpc_rs232.c
+++ b/src/emu/bus/cpc/cpc_rs232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_rs232.c
  *
diff --git a/src/emu/bus/cpc/cpc_rs232.h b/src/emu/bus/cpc/cpc_rs232.h
index fe1a716a1fb..9d4007835de 100644
--- a/src/emu/bus/cpc/cpc_rs232.h
+++ b/src/emu/bus/cpc/cpc_rs232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_rs232.h
  *
diff --git a/src/emu/bus/cpc/cpc_ssa1.c b/src/emu/bus/cpc/cpc_ssa1.c
index ab8cf2a0092..92047d1de4e 100644
--- a/src/emu/bus/cpc/cpc_ssa1.c
+++ b/src/emu/bus/cpc/cpc_ssa1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_ssa1.c  --  Amstrad SSA-1 Speech Synthesiser, dk'Tronics Speech Synthesiser
  *
diff --git a/src/emu/bus/cpc/cpc_ssa1.h b/src/emu/bus/cpc/cpc_ssa1.h
index e3d1dd7a26a..980eb232996 100644
--- a/src/emu/bus/cpc/cpc_ssa1.h
+++ b/src/emu/bus/cpc/cpc_ssa1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpc_ssa1.h  --  Amstrad SSA-1 Speech Synthesiser, dk'Tronics Speech Synthesiser
  *
diff --git a/src/emu/bus/cpc/cpcexp.c b/src/emu/bus/cpc/cpcexp.c
index 3afc3784aab..c30f747ec44 100644
--- a/src/emu/bus/cpc/cpcexp.c
+++ b/src/emu/bus/cpc/cpcexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpcexp.c  --  Amstrad CPC Expansion port
  *
diff --git a/src/emu/bus/cpc/cpcexp.h b/src/emu/bus/cpc/cpcexp.h
index 06cf61e1e70..cef14a26ac1 100644
--- a/src/emu/bus/cpc/cpcexp.h
+++ b/src/emu/bus/cpc/cpcexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * cpcexp.h  --  Amstrad CPC Expansion port
  *
diff --git a/src/emu/bus/cpc/mface2.c b/src/emu/bus/cpc/mface2.c
index 48232fd5830..dadf24e4706 100644
--- a/src/emu/bus/cpc/mface2.c
+++ b/src/emu/bus/cpc/mface2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mface2.c  --  Romantic Robot Multiface II expansion device for the Amstrad CPC/CPC+
  *
diff --git a/src/emu/bus/cpc/mface2.h b/src/emu/bus/cpc/mface2.h
index 917ddeeaeea..c8c8c9e4339 100644
--- a/src/emu/bus/cpc/mface2.h
+++ b/src/emu/bus/cpc/mface2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mface2.h  --  Romantic Robot Multiface II expansion device for the Amstrad CPC/CPC+
  *
diff --git a/src/emu/bus/cpc/playcity.c b/src/emu/bus/cpc/playcity.c
index 161213b1582..a1d1c363c2b 100644
--- a/src/emu/bus/cpc/playcity.c
+++ b/src/emu/bus/cpc/playcity.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    PlayCity expansion device
 
diff --git a/src/emu/bus/cpc/playcity.h b/src/emu/bus/cpc/playcity.h
index 0c35887e345..fed0e055765 100644
--- a/src/emu/bus/cpc/playcity.h
+++ b/src/emu/bus/cpc/playcity.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    PlayCity expansion device
 
diff --git a/src/emu/bus/cpc/smartwatch.c b/src/emu/bus/cpc/smartwatch.c
index 85a559bc0d0..74df2ec853b 100644
--- a/src/emu/bus/cpc/smartwatch.c
+++ b/src/emu/bus/cpc/smartwatch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Dobbertin Smartwatch
 
diff --git a/src/emu/bus/cpc/smartwatch.h b/src/emu/bus/cpc/smartwatch.h
index 8e2007f8a28..1001ce4b34b 100644
--- a/src/emu/bus/cpc/smartwatch.h
+++ b/src/emu/bus/cpc/smartwatch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Dobbertin Smartwatch
 
diff --git a/src/emu/bus/cpc/symbfac2.c b/src/emu/bus/cpc/symbfac2.c
index 2a671684500..6f9e5875161 100644
--- a/src/emu/bus/cpc/symbfac2.c
+++ b/src/emu/bus/cpc/symbfac2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * symbfac2.c
  *   SYMBiFACE II expansion device
diff --git a/src/emu/bus/cpc/symbfac2.h b/src/emu/bus/cpc/symbfac2.h
index bcc8f0eedba..6f66eb43bd2 100644
--- a/src/emu/bus/cpc/symbfac2.h
+++ b/src/emu/bus/cpc/symbfac2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * symbfac2.h
  *
diff --git a/src/emu/bus/ecbbus/ecbbus.c b/src/emu/bus/ecbbus/ecbbus.c
index 812a7854f55..b3c5fa54ab1 100644
--- a/src/emu/bus/ecbbus/ecbbus.c
+++ b/src/emu/bus/ecbbus/ecbbus.c
@@ -4,9 +4,6 @@
 
     Kontron Europe Card Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ecbbus.h"
diff --git a/src/emu/bus/ecbbus/ecbbus.h b/src/emu/bus/ecbbus/ecbbus.h
index 3a0217e2462..c04a0245596 100644
--- a/src/emu/bus/ecbbus/ecbbus.h
+++ b/src/emu/bus/ecbbus/ecbbus.h
@@ -4,9 +4,6 @@
 
     Kontron Europe Card Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                               A  B  C
diff --git a/src/emu/bus/ecbbus/grip.c b/src/emu/bus/ecbbus/grip.c
index 1a1b333d4b8..4bf0bdefca4 100644
--- a/src/emu/bus/ecbbus/grip.c
+++ b/src/emu/bus/ecbbus/grip.c
@@ -4,9 +4,6 @@
 
     Conitec Datensysteme GRIP graphics card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "grip.h"
diff --git a/src/emu/bus/ecbbus/grip.h b/src/emu/bus/ecbbus/grip.h
index 71eff97c8d2..9c4f098d2b9 100644
--- a/src/emu/bus/ecbbus/grip.h
+++ b/src/emu/bus/ecbbus/grip.h
@@ -4,9 +4,6 @@
 
     Conitec Datensysteme GRIP graphics card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/econet/e01.c b/src/emu/bus/econet/e01.c
index 45f17d72b21..41b2483c068 100644
--- a/src/emu/bus/econet/e01.c
+++ b/src/emu/bus/econet/e01.c
@@ -4,9 +4,6 @@
 
     Acorn FileStore E01/E01S network hard disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
     http://acorn.chriswhy.co.uk/Network/Econet.html
     http://acorn.chriswhy.co.uk/Network/Pics/Acorn_FileStoreE01.html
     http://acorn.chriswhy.co.uk/8bit_Upgrades/Acorn_FileStoreE01S.html
diff --git a/src/emu/bus/econet/e01.h b/src/emu/bus/econet/e01.h
index 7d968b06408..dc8708ef78d 100644
--- a/src/emu/bus/econet/e01.h
+++ b/src/emu/bus/econet/e01.h
@@ -4,9 +4,6 @@
 
     Acorn FileStore E01/E01S network hard disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/econet/econet.c b/src/emu/bus/econet/econet.c
index 03016e6afc0..94b0bb77786 100644
--- a/src/emu/bus/econet/econet.c
+++ b/src/emu/bus/econet/econet.c
@@ -4,9 +4,6 @@
 
     Acorn Computers Econet local area network emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "econet.h"
diff --git a/src/emu/bus/econet/econet.h b/src/emu/bus/econet/econet.h
index 144b55b5cb3..e072c7bb43b 100644
--- a/src/emu/bus/econet/econet.h
+++ b/src/emu/bus/econet/econet.h
@@ -4,9 +4,6 @@
 
     Acorn Computers Econet local area network emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ep64/exdos.c b/src/emu/bus/ep64/exdos.c
index 893e46fc71b..4cc31ed30b1 100644
--- a/src/emu/bus/ep64/exdos.c
+++ b/src/emu/bus/ep64/exdos.c
@@ -4,9 +4,6 @@
 
     Intelligent Software EXDOS Disk Controller Module emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ep64/exdos.h b/src/emu/bus/ep64/exdos.h
index c7fa267710b..2ac9f5bca85 100644
--- a/src/emu/bus/ep64/exdos.h
+++ b/src/emu/bus/ep64/exdos.h
@@ -4,9 +4,6 @@
 
     Intelligent Software EXDOS Disk Controller Module emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ep64/exp.c b/src/emu/bus/ep64/exp.c
index 4fa75ac94aa..55747d8b0ea 100644
--- a/src/emu/bus/ep64/exp.c
+++ b/src/emu/bus/ep64/exp.c
@@ -4,9 +4,6 @@
 
     Enterprise Sixty Four / One Two Eight Expansion Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/ep64/exp.h b/src/emu/bus/ep64/exp.h
index 48ca248817b..cbd7b4394a1 100644
--- a/src/emu/bus/ep64/exp.h
+++ b/src/emu/bus/ep64/exp.h
@@ -4,9 +4,6 @@
 
     Enterprise Sixty Four / One Two Eight Expansion Bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
              LH SOUND IN    B1      A1      RH SOUND IN
diff --git a/src/emu/bus/epson_sio/epson_sio.c b/src/emu/bus/epson_sio/epson_sio.c
index 442e6351208..6ec080834aa 100644
--- a/src/emu/bus/epson_sio/epson_sio.c
+++ b/src/emu/bus/epson_sio/epson_sio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON SIO port emulation
diff --git a/src/emu/bus/epson_sio/epson_sio.h b/src/emu/bus/epson_sio/epson_sio.h
index 1d171239826..8e96b21a56a 100644
--- a/src/emu/bus/epson_sio/epson_sio.h
+++ b/src/emu/bus/epson_sio/epson_sio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON SIO port emulation
diff --git a/src/emu/bus/epson_sio/pf10.c b/src/emu/bus/epson_sio/pf10.c
index 1faf656637d..ad48843de71 100644
--- a/src/emu/bus/epson_sio/pf10.c
+++ b/src/emu/bus/epson_sio/pf10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON PF-10
diff --git a/src/emu/bus/epson_sio/pf10.h b/src/emu/bus/epson_sio/pf10.h
index df0bdc56cfa..444eb9c5599 100644
--- a/src/emu/bus/epson_sio/pf10.h
+++ b/src/emu/bus/epson_sio/pf10.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON PF-10
diff --git a/src/emu/bus/epson_sio/tf20.c b/src/emu/bus/epson_sio/tf20.c
index c90fccc8490..c76a2c666e0 100644
--- a/src/emu/bus/epson_sio/tf20.c
+++ b/src/emu/bus/epson_sio/tf20.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON TF-20
diff --git a/src/emu/bus/epson_sio/tf20.h b/src/emu/bus/epson_sio/tf20.h
index 9aa5f2c47cb..65b52b0c776 100644
--- a/src/emu/bus/epson_sio/tf20.h
+++ b/src/emu/bus/epson_sio/tf20.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EPSON TF-20
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c
index e959234b7d7..0914551a380 100644
--- a/src/emu/bus/gameboy/gb_slot.c
+++ b/src/emu/bus/gameboy/gb_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/gameboy/gb_slot.h b/src/emu/bus/gameboy/gb_slot.h
index 61a7a7d8350..42f23fb00ca 100644
--- a/src/emu/bus/gameboy/gb_slot.h
+++ b/src/emu/bus/gameboy/gb_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GB_SLOT_H
 #define __GB_SLOT_H
 
diff --git a/src/emu/bus/gameboy/mbc.c b/src/emu/bus/gameboy/mbc.c
index 9d1e5aef40e..b2bbec70f48 100644
--- a/src/emu/bus/gameboy/mbc.c
+++ b/src/emu/bus/gameboy/mbc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Game Boy carts with MBC (Memory Bank Controller)
diff --git a/src/emu/bus/gameboy/mbc.h b/src/emu/bus/gameboy/mbc.h
index 1d9e35c7ba9..fd7d3d3b8e7 100644
--- a/src/emu/bus/gameboy/mbc.h
+++ b/src/emu/bus/gameboy/mbc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GB_MBC_H
 #define __GB_MBC_H
 
diff --git a/src/emu/bus/gameboy/rom.c b/src/emu/bus/gameboy/rom.c
index bb5a10039b7..b2fd04394e4 100644
--- a/src/emu/bus/gameboy/rom.c
+++ b/src/emu/bus/gameboy/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Game Boy cart emulation
diff --git a/src/emu/bus/gameboy/rom.h b/src/emu/bus/gameboy/rom.h
index 0e9f4a57974..54711278120 100644
--- a/src/emu/bus/gameboy/rom.h
+++ b/src/emu/bus/gameboy/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GB_ROM_H
 #define __GB_ROM_H
 
diff --git a/src/emu/bus/gamegear/ggext.c b/src/emu/bus/gamegear/ggext.c
index 7b6f51c59dd..d641a29a786 100644
--- a/src/emu/bus/gamegear/ggext.c
+++ b/src/emu/bus/gamegear/ggext.c
@@ -1,11 +1,10 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Game Gear EXT port emulation
     Also known as Gear-to-Gear (or VS, in Japan) cable connector
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ggext.h"
diff --git a/src/emu/bus/gamegear/ggext.h b/src/emu/bus/gamegear/ggext.h
index 333b802cde9..608a9bc182b 100644
--- a/src/emu/bus/gamegear/ggext.h
+++ b/src/emu/bus/gamegear/ggext.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Game Gear EXT port emulation
diff --git a/src/emu/bus/gamegear/smsctrladp.c b/src/emu/bus/gamegear/smsctrladp.c
index a988dc1082b..a9a86db7397 100644
--- a/src/emu/bus/gamegear/smsctrladp.c
+++ b/src/emu/bus/gamegear/smsctrladp.c
@@ -1,11 +1,10 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Game Gear "SMS Controller Adaptor" emulation
     Also known as "Master Link" cable.
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "smsctrladp.h"
diff --git a/src/emu/bus/gamegear/smsctrladp.h b/src/emu/bus/gamegear/smsctrladp.h
index 64925ca21fb..2b400586b9a 100644
--- a/src/emu/bus/gamegear/smsctrladp.h
+++ b/src/emu/bus/gamegear/smsctrladp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Game Gear "SMS Controller Adaptor" emulation
diff --git a/src/emu/bus/gba/gba_slot.c b/src/emu/bus/gba/gba_slot.c
index bb0e1abfa31..d15e2efca3f 100644
--- a/src/emu/bus/gba/gba_slot.c
+++ b/src/emu/bus/gba/gba_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/gba/gba_slot.h b/src/emu/bus/gba/gba_slot.h
index 384101f76dd..2a127e4a45f 100644
--- a/src/emu/bus/gba/gba_slot.h
+++ b/src/emu/bus/gba/gba_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GBA_SLOT_H
 #define __GBA_SLOT_H
 
diff --git a/src/emu/bus/gba/rom.c b/src/emu/bus/gba/rom.c
index 556d55a63b1..da7bb6aadde 100644
--- a/src/emu/bus/gba/rom.c
+++ b/src/emu/bus/gba/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/gba/rom.h b/src/emu/bus/gba/rom.h
index 525938e4fd0..3bc38e8b4b3 100644
--- a/src/emu/bus/gba/rom.h
+++ b/src/emu/bus/gba/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GBA_ROM_H
 #define __GBA_ROM_H
 
diff --git a/src/emu/bus/ieee488/c2031.c b/src/emu/bus/ieee488/c2031.c
index 2f88f16556a..b26c27c2ff6 100644
--- a/src/emu/bus/ieee488/c2031.c
+++ b/src/emu/bus/ieee488/c2031.c
@@ -4,9 +4,6 @@
 
     Commodore 2031 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c2031.h"
diff --git a/src/emu/bus/ieee488/c2031.h b/src/emu/bus/ieee488/c2031.h
index 15b964139d7..8423a8c1c95 100644
--- a/src/emu/bus/ieee488/c2031.h
+++ b/src/emu/bus/ieee488/c2031.h
@@ -4,9 +4,6 @@
 
     Commodore 2031 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/c2040.c b/src/emu/bus/ieee488/c2040.c
index 273756742a5..7350af4a377 100644
--- a/src/emu/bus/ieee488/c2040.c
+++ b/src/emu/bus/ieee488/c2040.c
@@ -4,9 +4,6 @@
 
     Commodore 2040/3040/4040 Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/c2040.h b/src/emu/bus/ieee488/c2040.h
index 2664a2ffdd8..45f0d6d443c 100644
--- a/src/emu/bus/ieee488/c2040.h
+++ b/src/emu/bus/ieee488/c2040.h
@@ -4,9 +4,6 @@
 
     Commodore 2040/3040/4040 Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/c2040fdc.c b/src/emu/bus/ieee488/c2040fdc.c
index 3881ff643f6..44baae86260 100644
--- a/src/emu/bus/ieee488/c2040fdc.c
+++ b/src/emu/bus/ieee488/c2040fdc.c
@@ -4,9 +4,6 @@
 
     Commodore 2040 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/c2040fdc.h b/src/emu/bus/ieee488/c2040fdc.h
index 382c540d4e4..5e09f9843e7 100644
--- a/src/emu/bus/ieee488/c2040fdc.h
+++ b/src/emu/bus/ieee488/c2040fdc.h
@@ -4,9 +4,6 @@
 
     Commodore 2040 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/c8050.c b/src/emu/bus/ieee488/c8050.c
index c8e314336bd..7211a834bdc 100644
--- a/src/emu/bus/ieee488/c8050.c
+++ b/src/emu/bus/ieee488/c8050.c
@@ -4,9 +4,6 @@
 
     Commodore 8050/8250/SFD-1001 Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/c8050.h b/src/emu/bus/ieee488/c8050.h
index db87bffeab3..594c577b831 100644
--- a/src/emu/bus/ieee488/c8050.h
+++ b/src/emu/bus/ieee488/c8050.h
@@ -4,9 +4,6 @@
 
     Commodore 8050/8250/SFD-1001 Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/c8050fdc.c b/src/emu/bus/ieee488/c8050fdc.c
index 86aea2522fc..8b0a853c6d0 100644
--- a/src/emu/bus/ieee488/c8050fdc.c
+++ b/src/emu/bus/ieee488/c8050fdc.c
@@ -4,9 +4,6 @@
 
     Commodore 8050 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/c8050fdc.h b/src/emu/bus/ieee488/c8050fdc.h
index 9c4f9d665f1..8228c9660d0 100644
--- a/src/emu/bus/ieee488/c8050fdc.h
+++ b/src/emu/bus/ieee488/c8050fdc.h
@@ -4,9 +4,6 @@
 
     Commodore 8050 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/c8280.c b/src/emu/bus/ieee488/c8280.c
index 0265f0983d1..444989c8242 100644
--- a/src/emu/bus/ieee488/c8280.c
+++ b/src/emu/bus/ieee488/c8280.c
@@ -4,9 +4,6 @@
 
     Commodore 8280 Dual 8" Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c8280.h"
diff --git a/src/emu/bus/ieee488/c8280.h b/src/emu/bus/ieee488/c8280.h
index ecb519ace7d..a17a3371aa4 100644
--- a/src/emu/bus/ieee488/c8280.h
+++ b/src/emu/bus/ieee488/c8280.h
@@ -4,9 +4,6 @@
 
     Commodore 8280 Dual 8" Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/d9060.c b/src/emu/bus/ieee488/d9060.c
index 055c8a1a81c..5e06142ddf9 100644
--- a/src/emu/bus/ieee488/d9060.c
+++ b/src/emu/bus/ieee488/d9060.c
@@ -4,9 +4,6 @@
 
     Commodore 9060/9090 Hard Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/d9060.h b/src/emu/bus/ieee488/d9060.h
index 67eb8c195ba..20d16e159a1 100644
--- a/src/emu/bus/ieee488/d9060.h
+++ b/src/emu/bus/ieee488/d9060.h
@@ -4,9 +4,6 @@
 
     Commodore D9060/D9090 Hard Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/hardbox.c b/src/emu/bus/ieee488/hardbox.c
index d3abf202031..4a2a0c16dae 100644
--- a/src/emu/bus/ieee488/hardbox.c
+++ b/src/emu/bus/ieee488/hardbox.c
@@ -4,9 +4,6 @@
 
     SSE HardBox emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/hardbox.h b/src/emu/bus/ieee488/hardbox.h
index 6aeff4d2f9c..77cbd23fb07 100644
--- a/src/emu/bus/ieee488/hardbox.h
+++ b/src/emu/bus/ieee488/hardbox.h
@@ -4,9 +4,6 @@
 
     SSE HardBox emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/ieee488.c b/src/emu/bus/ieee488/ieee488.c
index d2ebcee6a1a..16b8dda4f98 100644
--- a/src/emu/bus/ieee488/ieee488.c
+++ b/src/emu/bus/ieee488/ieee488.c
@@ -5,9 +5,6 @@
     IEEE-488.1 General Purpose Interface Bus emulation
     (aka HP-IB, GPIB, CBM IEEE)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ieee488.h"
diff --git a/src/emu/bus/ieee488/ieee488.h b/src/emu/bus/ieee488/ieee488.h
index 7014e625c2f..3a6c53966f1 100644
--- a/src/emu/bus/ieee488/ieee488.h
+++ b/src/emu/bus/ieee488/ieee488.h
@@ -5,9 +5,6 @@
     IEEE-488.1 General Purpose Interface Bus emulation
     (aka HP-IB, GPIB, CBM IEEE)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/shark.c b/src/emu/bus/ieee488/shark.c
index 16c66fda0c0..47582aa42b8 100644
--- a/src/emu/bus/ieee488/shark.c
+++ b/src/emu/bus/ieee488/shark.c
@@ -4,9 +4,6 @@
 
     Mator Systems SHARK Intelligent Winchester Disc Subsystem emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "shark.h"
diff --git a/src/emu/bus/ieee488/shark.h b/src/emu/bus/ieee488/shark.h
index 8306e5210d9..d5e2f1fe1f8 100644
--- a/src/emu/bus/ieee488/shark.h
+++ b/src/emu/bus/ieee488/shark.h
@@ -6,9 +6,6 @@
 
     35MB PRIAM DISKOS 3450 8" Winchester Hard Disk (-chs 525,5,? -ss ?)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ieee488/softbox.c b/src/emu/bus/ieee488/softbox.c
index 6b7c558b727..7f1dfe64b9d 100644
--- a/src/emu/bus/ieee488/softbox.c
+++ b/src/emu/bus/ieee488/softbox.c
@@ -4,9 +4,6 @@
 
     SSE SoftBox emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ieee488/softbox.h b/src/emu/bus/ieee488/softbox.h
index a292b898f7b..97e729fcc8d 100644
--- a/src/emu/bus/ieee488/softbox.h
+++ b/src/emu/bus/ieee488/softbox.h
@@ -4,9 +4,6 @@
 
     SSE SoftBox emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/imi7000/imi5000h.c b/src/emu/bus/imi7000/imi5000h.c
index 8cd1665b894..ff57b942f17 100644
--- a/src/emu/bus/imi7000/imi5000h.c
+++ b/src/emu/bus/imi7000/imi5000h.c
@@ -6,9 +6,6 @@
 
     Used in Corvus Systems H-Series drives (Model 6/11/20)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "imi5000h.h"
diff --git a/src/emu/bus/imi7000/imi5000h.h b/src/emu/bus/imi7000/imi5000h.h
index 74405dcc2a2..2577293ae20 100644
--- a/src/emu/bus/imi7000/imi5000h.h
+++ b/src/emu/bus/imi7000/imi5000h.h
@@ -6,9 +6,6 @@
 
     Used in Corvus Systems H-Series drives (Model 6/11/20)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/imi7000/imi7000.c b/src/emu/bus/imi7000/imi7000.c
index b974dd9a29e..b67c980c466 100644
--- a/src/emu/bus/imi7000/imi7000.c
+++ b/src/emu/bus/imi7000/imi7000.c
@@ -4,9 +4,6 @@
 
     International Memories Incorporated IMI 7000 Series bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "imi7000.h"
diff --git a/src/emu/bus/imi7000/imi7000.h b/src/emu/bus/imi7000/imi7000.h
index e360ae99feb..257ad0c562c 100644
--- a/src/emu/bus/imi7000/imi7000.h
+++ b/src/emu/bus/imi7000/imi7000.h
@@ -4,9 +4,6 @@
 
     International Memories Incorporated IMI 7000 Series bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      2       GND
diff --git a/src/emu/bus/intv/ecs.c b/src/emu/bus/intv/ecs.c
index 67da5066caa..99378721296 100644
--- a/src/emu/bus/intv/ecs.c
+++ b/src/emu/bus/intv/ecs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/intv/ecs.h b/src/emu/bus/intv/ecs.h
index 7f92230064f..40beb815867 100644
--- a/src/emu/bus/intv/ecs.h
+++ b/src/emu/bus/intv/ecs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __INTV_ECS_H
 #define __INTV_ECS_H
 
diff --git a/src/emu/bus/intv/rom.c b/src/emu/bus/intv/rom.c
index 6ff9cbd58d7..3c6fde2238b 100644
--- a/src/emu/bus/intv/rom.c
+++ b/src/emu/bus/intv/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/intv/rom.h b/src/emu/bus/intv/rom.h
index b78663bb47b..d86efba7009 100644
--- a/src/emu/bus/intv/rom.h
+++ b/src/emu/bus/intv/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __INTV_ROM_H
 #define __INTV_ROM_H
 
diff --git a/src/emu/bus/intv/slot.c b/src/emu/bus/intv/slot.c
index 834935bae68..fdefca9be3e 100644
--- a/src/emu/bus/intv/slot.c
+++ b/src/emu/bus/intv/slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
     Mattel Intellivision cart emulation
diff --git a/src/emu/bus/intv/slot.h b/src/emu/bus/intv/slot.h
index 44a50ce28b7..cfdb8f0ab81 100644
--- a/src/emu/bus/intv/slot.h
+++ b/src/emu/bus/intv/slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __INTV_SLOT_H
 #define __INTV_SLOT_H
 
diff --git a/src/emu/bus/intv/voice.c b/src/emu/bus/intv/voice.c
index ac5bc8cdc5b..36ef7e962e7 100644
--- a/src/emu/bus/intv/voice.c
+++ b/src/emu/bus/intv/voice.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/intv/voice.h b/src/emu/bus/intv/voice.h
index 96e92bbf44c..123dcc019c8 100644
--- a/src/emu/bus/intv/voice.h
+++ b/src/emu/bus/intv/voice.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __INTV_VOICE_H
 #define __INTV_VOICE_H
 
diff --git a/src/emu/bus/isa/3c503.c b/src/emu/bus/isa/3c503.c
index 738b95ea7e3..930b838b657 100644
--- a/src/emu/bus/isa/3c503.c
+++ b/src/emu/bus/isa/3c503.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "3c503.h"
 
diff --git a/src/emu/bus/isa/3c503.h b/src/emu/bus/isa/3c503.h
index a8e4bc8722d..1d33901ca72 100644
--- a/src/emu/bus/isa/3c503.h
+++ b/src/emu/bus/isa/3c503.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 3com Etherlink II 3c503 */
 
 #ifndef __3C503_H__
diff --git a/src/emu/bus/isa/3c505.c b/src/emu/bus/isa/3c505.c
index 83e25f3643c..22bddb519b9 100644
--- a/src/emu/bus/isa/3c505.c
+++ b/src/emu/bus/isa/3c505.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * 3c505.c - 3COM 3C505 ethernet controller (for Apollo DN3x00)
  *
diff --git a/src/emu/bus/isa/3c505.h b/src/emu/bus/isa/3c505.h
index d37ad051ea2..fcfa495baeb 100644
--- a/src/emu/bus/isa/3c505.h
+++ b/src/emu/bus/isa/3c505.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * threecom3c505.h - 3COM 3C505 ethernet controller
  *
diff --git a/src/emu/bus/isa/adlib.c b/src/emu/bus/isa/adlib.c
index 1368bf302c1..2cce297b57a 100644
--- a/src/emu/bus/isa/adlib.c
+++ b/src/emu/bus/isa/adlib.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8 bit Adlib Sound Card
diff --git a/src/emu/bus/isa/adlib.h b/src/emu/bus/isa/adlib.h
index 78ad2afdfaa..52eec5c4da2 100644
--- a/src/emu/bus/isa/adlib.h
+++ b/src/emu/bus/isa/adlib.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_ADLIB_H__
diff --git a/src/emu/bus/isa/aga.c b/src/emu/bus/isa/aga.c
index 8f1dae3527b..0c5611196dd 100644
--- a/src/emu/bus/isa/aga.c
+++ b/src/emu/bus/isa/aga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * aga.c
diff --git a/src/emu/bus/isa/aga.h b/src/emu/bus/isa/aga.h
index cfe867ec258..04309b86a29 100644
--- a/src/emu/bus/isa/aga.h
+++ b/src/emu/bus/isa/aga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   pc cga/mda combi adapters
 
diff --git a/src/emu/bus/isa/aha1542.c b/src/emu/bus/isa/aha1542.c
index 7188e49bb84..026e1278682 100644
--- a/src/emu/bus/isa/aha1542.c
+++ b/src/emu/bus/isa/aha1542.c
@@ -4,9 +4,6 @@
  *
  *    Adaptec AHA-1542{,C,CF} SCSI Controller
  *
- *    Copyright MESS Team.
- *    Visit http://mamedev.org for licensing and usage restrictions.
- *
  **********************************************************************/
 
 /*
diff --git a/src/emu/bus/isa/aha1542.h b/src/emu/bus/isa/aha1542.h
index 1a6122c8d74..98d890ee3fc 100644
--- a/src/emu/bus/isa/aha1542.h
+++ b/src/emu/bus/isa/aha1542.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
  *
  *    Adaptec AHA-1542{,C,CF} SCSI Controller
diff --git a/src/emu/bus/isa/cga.c b/src/emu/bus/isa/cga.c
index c18a4c38940..1a30c51671d 100644
--- a/src/emu/bus/isa/cga.c
+++ b/src/emu/bus/isa/cga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Color Graphics Adapter (CGA) section
diff --git a/src/emu/bus/isa/cga.h b/src/emu/bus/isa/cga.h
index 9f5c9227676..bc963ae5f15 100644
--- a/src/emu/bus/isa/cga.h
+++ b/src/emu/bus/isa/cga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_CGA_H__
diff --git a/src/emu/bus/isa/com.c b/src/emu/bus/isa/com.c
index f2b5a175233..6bda40c89eb 100644
--- a/src/emu/bus/isa/com.c
+++ b/src/emu/bus/isa/com.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8 bit Generic Communication Card
diff --git a/src/emu/bus/isa/com.h b/src/emu/bus/isa/com.h
index baf390e4166..44d2e2611fd 100644
--- a/src/emu/bus/isa/com.h
+++ b/src/emu/bus/isa/com.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_COM_H__
diff --git a/src/emu/bus/isa/dectalk.c b/src/emu/bus/isa/dectalk.c
index d4df9b4e212..de2b019bd3c 100644
--- a/src/emu/bus/isa/dectalk.c
+++ b/src/emu/bus/isa/dectalk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "dectalk.h"
 
 const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>;
diff --git a/src/emu/bus/isa/dectalk.h b/src/emu/bus/isa/dectalk.h
index 66168980a89..1d7d054ed88 100644
--- a/src/emu/bus/isa/dectalk.h
+++ b/src/emu/bus/isa/dectalk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef ISA_DECTALK_H_
 #define ISA_DECTALK_H_
 
diff --git a/src/emu/bus/isa/ega.c b/src/emu/bus/isa/ega.c
index 0be504cdb0d..1a693540eea 100644
--- a/src/emu/bus/isa/ega.c
+++ b/src/emu/bus/isa/ega.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Enhanced Graphics Adapter (EGA) section
diff --git a/src/emu/bus/isa/ega.h b/src/emu/bus/isa/ega.h
index 0102c099be1..7246a6c4cba 100644
--- a/src/emu/bus/isa/ega.h
+++ b/src/emu/bus/isa/ega.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_EGA_H__
diff --git a/src/emu/bus/isa/fdc.c b/src/emu/bus/isa/fdc.c
index 09ce9c42fd2..7d8e6812168 100644
--- a/src/emu/bus/isa/fdc.c
+++ b/src/emu/bus/isa/fdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA 8 bit Floppy Disk Controller
diff --git a/src/emu/bus/isa/fdc.h b/src/emu/bus/isa/fdc.h
index 645635e8f1e..f0660ef65b1 100644
--- a/src/emu/bus/isa/fdc.h
+++ b/src/emu/bus/isa/fdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA 8 bit Floppy Disk Controller
diff --git a/src/emu/bus/isa/finalchs.c b/src/emu/bus/isa/finalchs.c
index f3acb8cadcd..75e950a5854 100644
--- a/src/emu/bus/isa/finalchs.c
+++ b/src/emu/bus/isa/finalchs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Final Chess Card by TASC
diff --git a/src/emu/bus/isa/finalchs.h b/src/emu/bus/isa/finalchs.h
index 3016095fd6c..577f425cc16 100644
--- a/src/emu/bus/isa/finalchs.h
+++ b/src/emu/bus/isa/finalchs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_FINALCHS_H__
diff --git a/src/emu/bus/isa/gblaster.c b/src/emu/bus/isa/gblaster.c
index 20b406391eb..12b868e7b30 100644
--- a/src/emu/bus/isa/gblaster.c
+++ b/src/emu/bus/isa/gblaster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8 bit Creative Labs Game Blaster Sound Card
diff --git a/src/emu/bus/isa/gblaster.h b/src/emu/bus/isa/gblaster.h
index 8bcde87342e..034408e57d2 100644
--- a/src/emu/bus/isa/gblaster.h
+++ b/src/emu/bus/isa/gblaster.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_GAME_BLASTER_H__
diff --git a/src/emu/bus/isa/gus.c b/src/emu/bus/isa/gus.c
index ede6f8fccd7..f4f2a501caa 100644
--- a/src/emu/bus/isa/gus.c
+++ b/src/emu/bus/isa/gus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Gravis Ultrasound ISA card
  *
diff --git a/src/emu/bus/isa/gus.h b/src/emu/bus/isa/gus.h
index 969643d427a..3c056cfe459 100644
--- a/src/emu/bus/isa/gus.h
+++ b/src/emu/bus/isa/gus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Gravis Ultrasound ISA card
  *
diff --git a/src/emu/bus/isa/hdc.c b/src/emu/bus/isa/hdc.c
index b12303a20b5..840f8aa0ead 100644
--- a/src/emu/bus/isa/hdc.c
+++ b/src/emu/bus/isa/hdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA 8 bit XT Hard Disk Controller
diff --git a/src/emu/bus/isa/hdc.h b/src/emu/bus/isa/hdc.h
index 7fdf067bc96..74c58d89c9a 100644
--- a/src/emu/bus/isa/hdc.h
+++ b/src/emu/bus/isa/hdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA 8 bit XT Hard Disk Controller
diff --git a/src/emu/bus/isa/ibm_mfc.c b/src/emu/bus/isa/ibm_mfc.c
index 85543cba1d3..074edabece6 100644
--- a/src/emu/bus/isa/ibm_mfc.c
+++ b/src/emu/bus/isa/ibm_mfc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8 bit IBM PC Music Feature Card
diff --git a/src/emu/bus/isa/ibm_mfc.h b/src/emu/bus/isa/ibm_mfc.h
index 5eb4b4331da..cd43f0ce7a4 100644
--- a/src/emu/bus/isa/ibm_mfc.h
+++ b/src/emu/bus/isa/ibm_mfc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8 bit IBM PC Music Feature Card
diff --git a/src/emu/bus/isa/ide.c b/src/emu/bus/isa/ide.c
index a45721b1a76..45f4c95dd6a 100644
--- a/src/emu/bus/isa/ide.c
+++ b/src/emu/bus/isa/ide.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 16 bit IDE controller
diff --git a/src/emu/bus/isa/ide.h b/src/emu/bus/isa/ide.h
index cc38fd1c868..c34ff108f62 100644
--- a/src/emu/bus/isa/ide.h
+++ b/src/emu/bus/isa/ide.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_IDE_H__
diff --git a/src/emu/bus/isa/isa.c b/src/emu/bus/isa/isa.c
index 06e504d5b63..01fb974bfc2 100644
--- a/src/emu/bus/isa/isa.c
+++ b/src/emu/bus/isa/isa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         ISA bus device
diff --git a/src/emu/bus/isa/isa.h b/src/emu/bus/isa/isa.h
index 83953700d59..ed5affa3d29 100644
--- a/src/emu/bus/isa/isa.h
+++ b/src/emu/bus/isa/isa.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         ISA bus device
diff --git a/src/emu/bus/isa/isa_cards.c b/src/emu/bus/isa/isa_cards.c
index 4f1d133644b..57ff332dbde 100644
--- a/src/emu/bus/isa/isa_cards.c
+++ b/src/emu/bus/isa/isa_cards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA cards
diff --git a/src/emu/bus/isa/isa_cards.h b/src/emu/bus/isa/isa_cards.h
index d7762ab4bcf..a4cf18d1387 100644
--- a/src/emu/bus/isa/isa_cards.h
+++ b/src/emu/bus/isa/isa_cards.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA cards
diff --git a/src/emu/bus/isa/lpt.c b/src/emu/bus/isa/lpt.c
index 491f7abe1e6..992724cd8f5 100644
--- a/src/emu/bus/isa/lpt.c
+++ b/src/emu/bus/isa/lpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM-PC printer interface
diff --git a/src/emu/bus/isa/lpt.h b/src/emu/bus/isa/lpt.h
index 28d239e208b..d09c30fd3cb 100644
--- a/src/emu/bus/isa/lpt.h
+++ b/src/emu/bus/isa/lpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM-PC printer interface
diff --git a/src/emu/bus/isa/mach32.c b/src/emu/bus/isa/mach32.c
index 237e61c39aa..29ce9426baf 100644
--- a/src/emu/bus/isa/mach32.c
+++ b/src/emu/bus/isa/mach32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mach32.c
  *
diff --git a/src/emu/bus/isa/mach32.h b/src/emu/bus/isa/mach32.h
index d5b447d8c74..d4edbc4310d 100644
--- a/src/emu/bus/isa/mach32.h
+++ b/src/emu/bus/isa/mach32.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mach32.h
  *
diff --git a/src/emu/bus/isa/mc1502_fdc.c b/src/emu/bus/isa/mc1502_fdc.c
index 9ced2603479..b94360733c6 100644
--- a/src/emu/bus/isa/mc1502_fdc.c
+++ b/src/emu/bus/isa/mc1502_fdc.c
@@ -4,9 +4,6 @@
 
     Electronika MC 1502 FDC device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mc1502_fdc.h"
diff --git a/src/emu/bus/isa/mc1502_fdc.h b/src/emu/bus/isa/mc1502_fdc.h
index 856181292a0..3cfc3ced3c3 100644
--- a/src/emu/bus/isa/mc1502_fdc.h
+++ b/src/emu/bus/isa/mc1502_fdc.h
@@ -4,9 +4,6 @@
 
     Electronika MC 1502 FDC device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/mc1502_rom.c b/src/emu/bus/isa/mc1502_rom.c
index 6dfc16f7799..2dd85f50898 100644
--- a/src/emu/bus/isa/mc1502_rom.c
+++ b/src/emu/bus/isa/mc1502_rom.c
@@ -4,9 +4,6 @@
 
     MC-1502 ROM cartridge device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mc1502_rom.h"
diff --git a/src/emu/bus/isa/mc1502_rom.h b/src/emu/bus/isa/mc1502_rom.h
index dbf00713c76..9d5bd584ac0 100644
--- a/src/emu/bus/isa/mc1502_rom.h
+++ b/src/emu/bus/isa/mc1502_rom.h
@@ -4,9 +4,6 @@
 
     MC-1502 ROM cartridge device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index 5dd154919ec..046c671b95b 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Monochrome Display Adapter (MDA) section
diff --git a/src/emu/bus/isa/mda.h b/src/emu/bus/isa/mda.h
index 1c7a1fb37bc..dc0e71870df 100644
--- a/src/emu/bus/isa/mda.h
+++ b/src/emu/bus/isa/mda.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_MDA_H__
diff --git a/src/emu/bus/isa/mpu401.c b/src/emu/bus/isa/mpu401.c
index d52cfc3d6c5..3933c1c8a8f 100644
--- a/src/emu/bus/isa/mpu401.c
+++ b/src/emu/bus/isa/mpu401.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MPU-401 MIDI device interface
diff --git a/src/emu/bus/isa/mpu401.h b/src/emu/bus/isa/mpu401.h
index 1b521931ff4..163ae36e5d4 100644
--- a/src/emu/bus/isa/mpu401.h
+++ b/src/emu/bus/isa/mpu401.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_MPU401_H__
diff --git a/src/emu/bus/isa/mufdc.c b/src/emu/bus/isa/mufdc.c
index 1a720ebc1b7..6adb1fe9083 100644
--- a/src/emu/bus/isa/mufdc.c
+++ b/src/emu/bus/isa/mufdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Multi Unique FDC
diff --git a/src/emu/bus/isa/mufdc.h b/src/emu/bus/isa/mufdc.h
index da6ff090217..abb27efb608 100644
--- a/src/emu/bus/isa/mufdc.h
+++ b/src/emu/bus/isa/mufdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Multi Unique FDC
diff --git a/src/emu/bus/isa/ne1000.c b/src/emu/bus/isa/ne1000.c
index a84cbf5f415..9b6043c7bb3 100644
--- a/src/emu/bus/isa/ne1000.c
+++ b/src/emu/bus/isa/ne1000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "ne1000.h"
 
diff --git a/src/emu/bus/isa/ne1000.h b/src/emu/bus/isa/ne1000.h
index b92f561f958..76f1cda964d 100644
--- a/src/emu/bus/isa/ne1000.h
+++ b/src/emu/bus/isa/ne1000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NE1000_H__
 #define __NE1000_H__
 
diff --git a/src/emu/bus/isa/ne2000.c b/src/emu/bus/isa/ne2000.c
index 4f3f5e5cd45..94e83aefc6a 100644
--- a/src/emu/bus/isa/ne2000.c
+++ b/src/emu/bus/isa/ne2000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "ne2000.h"
 
diff --git a/src/emu/bus/isa/ne2000.h b/src/emu/bus/isa/ne2000.h
index 855400ad6e6..90a8d5e4792 100644
--- a/src/emu/bus/isa/ne2000.h
+++ b/src/emu/bus/isa/ne2000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NE2000_H__
 #define __NE2000_H__
 
diff --git a/src/emu/bus/isa/num9rev.c b/src/emu/bus/isa/num9rev.c
index 3fe6e7469f3..377c9167af4 100644
--- a/src/emu/bus/isa/num9rev.c
+++ b/src/emu/bus/isa/num9rev.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // license:BSD-3-Clause
 // Number Nine Revolution 512x32/1024x8
 // TODO: for 1024x768 mode the 7220 is programmed for 512x768, how does that work?
diff --git a/src/emu/bus/isa/num9rev.h b/src/emu/bus/isa/num9rev.h
index 5bace1297f5..d85d54e7df9 100644
--- a/src/emu/bus/isa/num9rev.h
+++ b/src/emu/bus/isa/num9rev.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUM9REV_H__
diff --git a/src/emu/bus/isa/omti8621.c b/src/emu/bus/isa/omti8621.c
index 8f9b126d053..a008d15a34d 100644
--- a/src/emu/bus/isa/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * omti8621.c - SMS OMTI 8621 disk controller (for Apollo DN3x00)
  *
diff --git a/src/emu/bus/isa/omti8621.h b/src/emu/bus/isa/omti8621.h
index 819107a9a28..20fdd587a16 100644
--- a/src/emu/bus/isa/omti8621.h
+++ b/src/emu/bus/isa/omti8621.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * omti8621.h - SMS OMTI 8621 disk controller
  *
diff --git a/src/emu/bus/isa/p1_fdc.c b/src/emu/bus/isa/p1_fdc.c
index ff45e283a2c..c2b10375cb8 100644
--- a/src/emu/bus/isa/p1_fdc.c
+++ b/src/emu/bus/isa/p1_fdc.c
@@ -4,9 +4,6 @@
 
     Poisk-1 FDC device (model B504)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "p1_fdc.h"
diff --git a/src/emu/bus/isa/p1_fdc.h b/src/emu/bus/isa/p1_fdc.h
index 36572d5ab86..c6d7a416ce1 100644
--- a/src/emu/bus/isa/p1_fdc.h
+++ b/src/emu/bus/isa/p1_fdc.h
@@ -4,9 +4,6 @@
 
     Poisk-1 FDC device (model B504)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/p1_hdc.c b/src/emu/bus/isa/p1_hdc.c
index bc3d8fdf7a5..3cbf1f11039 100644
--- a/src/emu/bus/isa/p1_hdc.c
+++ b/src/emu/bus/isa/p1_hdc.c
@@ -4,9 +4,6 @@
 
     Poisk-1 HDC device (model B942)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "p1_hdc.h"
diff --git a/src/emu/bus/isa/p1_hdc.h b/src/emu/bus/isa/p1_hdc.h
index 0d27af123ec..ca5c9f3de0c 100644
--- a/src/emu/bus/isa/p1_hdc.h
+++ b/src/emu/bus/isa/p1_hdc.h
@@ -4,9 +4,6 @@
 
     Poisk-1 HDC device (model B942)
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/p1_rom.c b/src/emu/bus/isa/p1_rom.c
index 4da8ca0f89d..bebbcd53011 100644
--- a/src/emu/bus/isa/p1_rom.c
+++ b/src/emu/bus/isa/p1_rom.c
@@ -4,9 +4,6 @@
 
     Poisk-1 ROM cartridge device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "p1_rom.h"
diff --git a/src/emu/bus/isa/p1_rom.h b/src/emu/bus/isa/p1_rom.h
index 8228c8df052..8ec16c4bc7b 100644
--- a/src/emu/bus/isa/p1_rom.h
+++ b/src/emu/bus/isa/p1_rom.h
@@ -4,9 +4,6 @@
 
     Poisk-1 ROM cartridge device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/pc1640_iga.c b/src/emu/bus/isa/pc1640_iga.c
index 9b052a47f64..127d90560b5 100644
--- a/src/emu/bus/isa/pc1640_iga.c
+++ b/src/emu/bus/isa/pc1640_iga.c
@@ -4,9 +4,6 @@
 
     Amstrad PC1640 Integrated Graphics Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
     This display controller is integrated on the PC1640 motherboard
diff --git a/src/emu/bus/isa/pc1640_iga.h b/src/emu/bus/isa/pc1640_iga.h
index 6ec42730150..3bb632528d4 100644
--- a/src/emu/bus/isa/pc1640_iga.h
+++ b/src/emu/bus/isa/pc1640_iga.h
@@ -4,9 +4,6 @@
 
     Amstrad PC1640 Integrated Graphics Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/pds.c b/src/emu/bus/isa/pds.c
index 2ea08c44231..5ec9ffa2cc2 100644
--- a/src/emu/bus/isa/pds.c
+++ b/src/emu/bus/isa/pds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * isa_pds.c - Programmers Development System 8-bit ISA card
  *
diff --git a/src/emu/bus/isa/pds.h b/src/emu/bus/isa/pds.h
index c0d111f296a..a05363de399 100644
--- a/src/emu/bus/isa/pds.h
+++ b/src/emu/bus/isa/pds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * isa_pds.h
  *
diff --git a/src/emu/bus/isa/s3virge.c b/src/emu/bus/isa/s3virge.c
index ffc9bdaa935..90d69268ad0 100644
--- a/src/emu/bus/isa/s3virge.c
+++ b/src/emu/bus/isa/s3virge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * s3virge.c
  *
diff --git a/src/emu/bus/isa/s3virge.h b/src/emu/bus/isa/s3virge.h
index d12757f7869..6e1e22e658a 100644
--- a/src/emu/bus/isa/s3virge.h
+++ b/src/emu/bus/isa/s3virge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * s3virge.h
  *
diff --git a/src/emu/bus/isa/sb16.c b/src/emu/bus/isa/sb16.c
index cff27627c2c..bb874aae516 100644
--- a/src/emu/bus/isa/sb16.c
+++ b/src/emu/bus/isa/sb16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // License: BSD-3-Clause
 
 // Soundblaster 16 - LLE
diff --git a/src/emu/bus/isa/sb16.h b/src/emu/bus/isa/sb16.h
index 7487343abc8..a7ae952ab1b 100644
--- a/src/emu/bus/isa/sb16.h
+++ b/src/emu/bus/isa/sb16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SB16__
 #define __SB16__
 
diff --git a/src/emu/bus/isa/sblaster.c b/src/emu/bus/isa/sblaster.c
index 398ff4615c6..d608df9f321 100644
--- a/src/emu/bus/isa/sblaster.c
+++ b/src/emu/bus/isa/sblaster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA 8/16 bit Creative Labs Sound Blaster Sound Card
diff --git a/src/emu/bus/isa/sblaster.h b/src/emu/bus/isa/sblaster.h
index 938ffe59889..ca2871a2bbf 100644
--- a/src/emu/bus/isa/sblaster.h
+++ b/src/emu/bus/isa/sblaster.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_SOUND_BLASTER_H__
diff --git a/src/emu/bus/isa/sc499.c b/src/emu/bus/isa/sc499.c
index ec5ea575dc6..f39ac1a036e 100644
--- a/src/emu/bus/isa/sc499.c
+++ b/src/emu/bus/isa/sc499.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * sc499.c - ARCHIVE SC-499 cartridge tape controller (for Apollo DN3x00)
  *  Created on: April 17, 2011
diff --git a/src/emu/bus/isa/sc499.h b/src/emu/bus/isa/sc499.h
index dce05873fce..e8a3faf71fa 100644
--- a/src/emu/bus/isa/sc499.h
+++ b/src/emu/bus/isa/sc499.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * sc499.h - Archive Cartridge tape controller SC-499
  *
diff --git a/src/emu/bus/isa/side116.c b/src/emu/bus/isa/side116.c
index 6036f3faa2e..8bd1baaed66 100644
--- a/src/emu/bus/isa/side116.c
+++ b/src/emu/bus/isa/side116.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Acculogic sIDE-1/16
diff --git a/src/emu/bus/isa/side116.h b/src/emu/bus/isa/side116.h
index 8e452a5b99e..f0dd0a89cd5 100644
--- a/src/emu/bus/isa/side116.h
+++ b/src/emu/bus/isa/side116.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Acculogic sIDE-1/16
diff --git a/src/emu/bus/isa/ssi2001.c b/src/emu/bus/isa/ssi2001.c
index 172f4f0be65..955798762f2 100644
--- a/src/emu/bus/isa/ssi2001.c
+++ b/src/emu/bus/isa/ssi2001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Innovation SSI-2001
 
 #include "ssi2001.h"
diff --git a/src/emu/bus/isa/ssi2001.h b/src/emu/bus/isa/ssi2001.h
index 8454d63fd5b..f149c445f72 100644
--- a/src/emu/bus/isa/ssi2001.h
+++ b/src/emu/bus/isa/ssi2001.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SSI2001__
 #define __SSI2001__
 
diff --git a/src/emu/bus/isa/stereo_fx.c b/src/emu/bus/isa/stereo_fx.c
index 9b96dc18563..05916ac7266 100644
--- a/src/emu/bus/isa/stereo_fx.c
+++ b/src/emu/bus/isa/stereo_fx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // ATI Stereo F/X
 //
 // TODO: UART is connected to MIDI port
diff --git a/src/emu/bus/isa/stereo_fx.h b/src/emu/bus/isa/stereo_fx.h
index 4910979463c..b5278bfe9dd 100644
--- a/src/emu/bus/isa/stereo_fx.h
+++ b/src/emu/bus/isa/stereo_fx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __STEREO_FX__
 #define __STEREO_FX__
 
diff --git a/src/emu/bus/isa/svga_cirrus.c b/src/emu/bus/isa/svga_cirrus.c
index 03e2413e984..285d8c02d83 100644
--- a/src/emu/bus/isa/svga_cirrus.c
+++ b/src/emu/bus/isa/svga_cirrus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA SVGA Cirrus Logic wrapper
diff --git a/src/emu/bus/isa/svga_cirrus.h b/src/emu/bus/isa/svga_cirrus.h
index 17b39f1e98e..c3e7f296d80 100644
--- a/src/emu/bus/isa/svga_cirrus.h
+++ b/src/emu/bus/isa/svga_cirrus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_SVGA_CIRRUS_H__
diff --git a/src/emu/bus/isa/svga_s3.c b/src/emu/bus/isa/svga_s3.c
index d022e2e914d..ee3a7fb237f 100644
--- a/src/emu/bus/isa/svga_s3.c
+++ b/src/emu/bus/isa/svga_s3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA SVGA S3 wrapper
diff --git a/src/emu/bus/isa/svga_s3.h b/src/emu/bus/isa/svga_s3.h
index 5b86a9e4959..4e2c0eb8b1b 100644
--- a/src/emu/bus/isa/svga_s3.h
+++ b/src/emu/bus/isa/svga_s3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_SVGA_S3_H__
diff --git a/src/emu/bus/isa/svga_trident.c b/src/emu/bus/isa/svga_trident.c
index e198d7ddf77..83090ebb5ca 100644
--- a/src/emu/bus/isa/svga_trident.c
+++ b/src/emu/bus/isa/svga_trident.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * svga_trident.c
  *
diff --git a/src/emu/bus/isa/svga_trident.h b/src/emu/bus/isa/svga_trident.h
index 703fdeed040..062f989914e 100644
--- a/src/emu/bus/isa/svga_trident.h
+++ b/src/emu/bus/isa/svga_trident.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * svga_trident.h
  *
diff --git a/src/emu/bus/isa/svga_tseng.c b/src/emu/bus/isa/svga_tseng.c
index 58bdf6fff8d..52597550b71 100644
--- a/src/emu/bus/isa/svga_tseng.c
+++ b/src/emu/bus/isa/svga_tseng.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA SVGA Tseng wrapper
diff --git a/src/emu/bus/isa/svga_tseng.h b/src/emu/bus/isa/svga_tseng.h
index ecaf8982e55..9e990706e48 100644
--- a/src/emu/bus/isa/svga_tseng.h
+++ b/src/emu/bus/isa/svga_tseng.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_SVGA_ET4K_H__
diff --git a/src/emu/bus/isa/trident.c b/src/emu/bus/isa/trident.c
index 63d70492c5d..3b9105eefc1 100644
--- a/src/emu/bus/isa/trident.c
+++ b/src/emu/bus/isa/trident.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * trident.c
  *
diff --git a/src/emu/bus/isa/trident.h b/src/emu/bus/isa/trident.h
index 51a227494d4..301ab5f628f 100644
--- a/src/emu/bus/isa/trident.h
+++ b/src/emu/bus/isa/trident.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * trident.h
  *
diff --git a/src/emu/bus/isa/vga.c b/src/emu/bus/isa/vga.c
index 4f04d6bc166..2e52b9f3336 100644
--- a/src/emu/bus/isa/vga.c
+++ b/src/emu/bus/isa/vga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ISA VGA wrapper
diff --git a/src/emu/bus/isa/vga.h b/src/emu/bus/isa/vga.h
index 7614bbdb0ff..0bce2cf4062 100644
--- a/src/emu/bus/isa/vga.h
+++ b/src/emu/bus/isa/vga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ISA_VGA_H__
diff --git a/src/emu/bus/isa/vga_ati.c b/src/emu/bus/isa/vga_ati.c
index a3c47d86897..71d856e4e6e 100644
--- a/src/emu/bus/isa/vga_ati.c
+++ b/src/emu/bus/isa/vga_ati.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * isa_vga_ati.c
  *
diff --git a/src/emu/bus/isa/vga_ati.h b/src/emu/bus/isa/vga_ati.h
index a71a651609e..5c207f5c77d 100644
--- a/src/emu/bus/isa/vga_ati.h
+++ b/src/emu/bus/isa/vga_ati.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * isa_vga_ati.h
  *
diff --git a/src/emu/bus/isa/wd1002a_wx1.c b/src/emu/bus/isa/wd1002a_wx1.c
index 449ab6ce5c6..29df9cec729 100644
--- a/src/emu/bus/isa/wd1002a_wx1.c
+++ b/src/emu/bus/isa/wd1002a_wx1.c
@@ -4,9 +4,6 @@
 
     Western Digital WD1002A-WX1 Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "wd1002a_wx1.h"
diff --git a/src/emu/bus/isa/wd1002a_wx1.h b/src/emu/bus/isa/wd1002a_wx1.h
index e0cb75f18b6..d328fb0f16b 100644
--- a/src/emu/bus/isa/wd1002a_wx1.h
+++ b/src/emu/bus/isa/wd1002a_wx1.h
@@ -4,9 +4,6 @@
 
     Western Digital WD1002A-WX1 Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isa/wdxt_gen.c b/src/emu/bus/isa/wdxt_gen.c
index f3a17ea173a..abd262cd918 100644
--- a/src/emu/bus/isa/wdxt_gen.c
+++ b/src/emu/bus/isa/wdxt_gen.c
@@ -4,9 +4,6 @@
 
     Western Digital WDXT-GEN ISA XT MFM Hard Disk Controller
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/isa/wdxt_gen.h b/src/emu/bus/isa/wdxt_gen.h
index b5019cd8800..dae157cba89 100644
--- a/src/emu/bus/isa/wdxt_gen.h
+++ b/src/emu/bus/isa/wdxt_gen.h
@@ -4,9 +4,6 @@
 
     Western Digital WDXT-GEN ISA XT MFM Hard Disk Controller
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
     Emulated here is the variant supplied with Amstrad PC1512/1640,
diff --git a/src/emu/bus/isa/xsu_cards.c b/src/emu/bus/isa/xsu_cards.c
index d6b9a607d1d..2d0203f25c9 100644
--- a/src/emu/bus/isa/xsu_cards.c
+++ b/src/emu/bus/isa/xsu_cards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA bus cards for ex-USSR PC clones
diff --git a/src/emu/bus/isa/xsu_cards.h b/src/emu/bus/isa/xsu_cards.h
index b6e474cd5fa..7b842982967 100644
--- a/src/emu/bus/isa/xsu_cards.h
+++ b/src/emu/bus/isa/xsu_cards.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     ISA bus cards for ex-USSR PC clones
diff --git a/src/emu/bus/isa/xtide.c b/src/emu/bus/isa/xtide.c
index 137fd00f631..ce8c2fd23a8 100644
--- a/src/emu/bus/isa/xtide.c
+++ b/src/emu/bus/isa/xtide.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The XT-IDE project is a Vintage Computer forum driven project to develop and manufacturer an 8-bit ISA IDE controller.
diff --git a/src/emu/bus/isa/xtide.h b/src/emu/bus/isa/xtide.h
index 6c17dc8bc14..ca4c4cbb10f 100644
--- a/src/emu/bus/isa/xtide.h
+++ b/src/emu/bus/isa/xtide.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __XTIDE_H__
diff --git a/src/emu/bus/isbx/compis_fdc.c b/src/emu/bus/isbx/compis_fdc.c
index d46c1c8bec2..2718f57c78f 100644
--- a/src/emu/bus/isbx/compis_fdc.c
+++ b/src/emu/bus/isbx/compis_fdc.c
@@ -4,9 +4,6 @@
 
     TeleNova Compis Floppy Disk Controller (119 106/1) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "compis_fdc.h"
diff --git a/src/emu/bus/isbx/compis_fdc.h b/src/emu/bus/isbx/compis_fdc.h
index 9bb76e7a07b..3ccd294a9f8 100644
--- a/src/emu/bus/isbx/compis_fdc.h
+++ b/src/emu/bus/isbx/compis_fdc.h
@@ -4,9 +4,6 @@
 
     TeleNova Compis Floppy Disk Controller (119 106/1) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isbx/isbc_218a.c b/src/emu/bus/isbx/isbc_218a.c
index 8e2b6997644..319fb66a38a 100644
--- a/src/emu/bus/isbx/isbc_218a.c
+++ b/src/emu/bus/isbx/isbc_218a.c
@@ -4,9 +4,6 @@
 
     ISBX 218a with ISBC configuration
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "isbc_218a.h"
diff --git a/src/emu/bus/isbx/isbc_218a.h b/src/emu/bus/isbx/isbc_218a.h
index 7b3820604d1..8718c012696 100644
--- a/src/emu/bus/isbx/isbc_218a.h
+++ b/src/emu/bus/isbx/isbc_218a.h
@@ -4,9 +4,6 @@
 
     ISBX 218a with ISBC configuration
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/isbx/isbx.c b/src/emu/bus/isbx/isbx.c
index 7a8a172b060..09b7d84b6fd 100644
--- a/src/emu/bus/isbx/isbx.c
+++ b/src/emu/bus/isbx/isbx.c
@@ -4,9 +4,6 @@
 
     Intel Multibus I/O Expansion Bus IEEE-P959 (iSBX) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "isbx.h"
diff --git a/src/emu/bus/isbx/isbx.h b/src/emu/bus/isbx/isbx.h
index c2ae0ee07d3..d3f15098ee7 100644
--- a/src/emu/bus/isbx/isbx.h
+++ b/src/emu/bus/isbx/isbx.h
@@ -4,9 +4,6 @@
 
     Intel Multibus I/O Expansion Bus IEEE-P959 (iSBX) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                    +12V       1      2       -12V
diff --git a/src/emu/bus/lpci/cirrus.c b/src/emu/bus/lpci/cirrus.c
index ac001b09b74..da93fd74f5b 100644
--- a/src/emu/bus/lpci/cirrus.c
+++ b/src/emu/bus/lpci/cirrus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/cirrus.c
diff --git a/src/emu/bus/lpci/cirrus.h b/src/emu/bus/lpci/cirrus.h
index 9027f6827e4..8d4671f6100 100644
--- a/src/emu/bus/lpci/cirrus.h
+++ b/src/emu/bus/lpci/cirrus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/cirrus.h
diff --git a/src/emu/bus/lpci/i82371ab.c b/src/emu/bus/lpci/i82371ab.c
index 649d1ed3b78..3532199f0fb 100644
--- a/src/emu/bus/lpci/i82371ab.c
+++ b/src/emu/bus/lpci/i82371ab.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82371AB PCI IDE ISA Xcelerator (PIIX4)
diff --git a/src/emu/bus/lpci/i82371ab.h b/src/emu/bus/lpci/i82371ab.h
index c90468e0481..d327e98da4e 100644
--- a/src/emu/bus/lpci/i82371ab.h
+++ b/src/emu/bus/lpci/i82371ab.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82371AB PCI IDE ISA Xcelerator (PIIX4)
diff --git a/src/emu/bus/lpci/i82371sb.c b/src/emu/bus/lpci/i82371sb.c
index 7d173663596..8f766d91852 100644
--- a/src/emu/bus/lpci/i82371sb.c
+++ b/src/emu/bus/lpci/i82371sb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82371SB PCI IDE ISA Xcelerator (PIIX3)
diff --git a/src/emu/bus/lpci/i82371sb.h b/src/emu/bus/lpci/i82371sb.h
index c9ccbff9a8c..851ef600409 100644
--- a/src/emu/bus/lpci/i82371sb.h
+++ b/src/emu/bus/lpci/i82371sb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82371SB PCI IDE ISA Xcelerator (PIIX3)
diff --git a/src/emu/bus/lpci/i82439tx.c b/src/emu/bus/lpci/i82439tx.c
index daa612c70ac..b66165f789a 100644
--- a/src/emu/bus/lpci/i82439tx.c
+++ b/src/emu/bus/lpci/i82439tx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82439TX System Controller (MTXC)
diff --git a/src/emu/bus/lpci/i82439tx.h b/src/emu/bus/lpci/i82439tx.h
index 3e8d1514e49..360a540abf4 100644
--- a/src/emu/bus/lpci/i82439tx.h
+++ b/src/emu/bus/lpci/i82439tx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 82439TX System Controller (MTXC)
diff --git a/src/emu/bus/lpci/mpc105.c b/src/emu/bus/lpci/mpc105.c
index 57b448bd49d..56dab17999a 100644
--- a/src/emu/bus/lpci/mpc105.c
+++ b/src/emu/bus/lpci/mpc105.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mpc105.h
diff --git a/src/emu/bus/lpci/mpc105.h b/src/emu/bus/lpci/mpc105.h
index ae3f4f2b1cc..7fccfaa6a3b 100644
--- a/src/emu/bus/lpci/mpc105.h
+++ b/src/emu/bus/lpci/mpc105.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mpc105.h
diff --git a/src/emu/bus/lpci/northbridge.c b/src/emu/bus/lpci/northbridge.c
index 83db12613b9..41eb3c79254 100644
--- a/src/emu/bus/lpci/northbridge.c
+++ b/src/emu/bus/lpci/northbridge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Northbridge implementation
diff --git a/src/emu/bus/lpci/northbridge.h b/src/emu/bus/lpci/northbridge.h
index 1f0600deaaf..9a4c09da2a0 100644
--- a/src/emu/bus/lpci/northbridge.h
+++ b/src/emu/bus/lpci/northbridge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NORTHBRIDGE_H__
diff --git a/src/emu/bus/lpci/pci.c b/src/emu/bus/lpci/pci.c
index 1f13b78dfe4..c148768bfbb 100644
--- a/src/emu/bus/lpci/pci.c
+++ b/src/emu/bus/lpci/pci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     pci.c
diff --git a/src/emu/bus/lpci/pci.h b/src/emu/bus/lpci/pci.h
index 97d7b45d988..f0290153d3a 100644
--- a/src/emu/bus/lpci/pci.h
+++ b/src/emu/bus/lpci/pci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     pci.h
diff --git a/src/emu/bus/lpci/southbridge.c b/src/emu/bus/lpci/southbridge.c
index bb1a8cf629b..b39c26bcd3c 100644
--- a/src/emu/bus/lpci/southbridge.c
+++ b/src/emu/bus/lpci/southbridge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Southbridge implementation
diff --git a/src/emu/bus/lpci/southbridge.h b/src/emu/bus/lpci/southbridge.h
index 1fde011f414..83bf6541374 100644
--- a/src/emu/bus/lpci/southbridge.h
+++ b/src/emu/bus/lpci/southbridge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SOUTHBRIDGE_H__
diff --git a/src/emu/bus/macpds/macpds.c b/src/emu/bus/macpds/macpds.c
index 0a0f07eb3a1..aae6633c7b8 100644
--- a/src/emu/bus/macpds/macpds.c
+++ b/src/emu/bus/macpds/macpds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   macpds.c - Mac 68000 PDS implementation (SE, Portable)
diff --git a/src/emu/bus/macpds/macpds.h b/src/emu/bus/macpds/macpds.h
index 22b746f1db5..1cce8ae38e7 100644
--- a/src/emu/bus/macpds/macpds.h
+++ b/src/emu/bus/macpds/macpds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   macpds.h - Mac 68000 PDS implementation (SE, Portable)
diff --git a/src/emu/bus/macpds/pds_tpdfpd.c b/src/emu/bus/macpds/pds_tpdfpd.c
index fb46126eb62..2e33e483ff3 100644
--- a/src/emu/bus/macpds/pds_tpdfpd.c
+++ b/src/emu/bus/macpds/pds_tpdfpd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Radius Full Page Display card for the Mac SE, assy # 632-0022-A1
diff --git a/src/emu/bus/macpds/pds_tpdfpd.h b/src/emu/bus/macpds/pds_tpdfpd.h
index e62a9d74dff..ce0c074934f 100644
--- a/src/emu/bus/macpds/pds_tpdfpd.h
+++ b/src/emu/bus/macpds/pds_tpdfpd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __PDS_SEDISPLAY_H__
diff --git a/src/emu/bus/megadrive/eeprom.c b/src/emu/bus/megadrive/eeprom.c
index 95bc78c716b..13dca9cf2f1 100644
--- a/src/emu/bus/megadrive/eeprom.c
+++ b/src/emu/bus/megadrive/eeprom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/eeprom.h b/src/emu/bus/megadrive/eeprom.h
index c0c4266cc97..7b86f20aa4e 100644
--- a/src/emu/bus/megadrive/eeprom.h
+++ b/src/emu/bus/megadrive/eeprom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_EEPROM_H
 #define __MD_EEPROM_H
 
diff --git a/src/emu/bus/megadrive/ggenie.c b/src/emu/bus/megadrive/ggenie.c
index 62ebfbb55aa..21a8d373543 100644
--- a/src/emu/bus/megadrive/ggenie.c
+++ b/src/emu/bus/megadrive/ggenie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/ggenie.h b/src/emu/bus/megadrive/ggenie.h
index 0e7e90ec0a4..6b062462cdc 100644
--- a/src/emu/bus/megadrive/ggenie.h
+++ b/src/emu/bus/megadrive/ggenie.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_GGENIE_H
 #define __MD_GGENIE_H
 
diff --git a/src/emu/bus/megadrive/jcart.c b/src/emu/bus/megadrive/jcart.c
index 3ae90264e7f..bdf357ed85c 100644
--- a/src/emu/bus/megadrive/jcart.c
+++ b/src/emu/bus/megadrive/jcart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/jcart.h b/src/emu/bus/megadrive/jcart.h
index a618f682d57..77fb5afb4cf 100644
--- a/src/emu/bus/megadrive/jcart.h
+++ b/src/emu/bus/megadrive/jcart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_JCART_H
 #define __MD_JCART_H
 
diff --git a/src/emu/bus/megadrive/md_carts.c b/src/emu/bus/megadrive/md_carts.c
index afcfea5b3dd..8179038ac78 100644
--- a/src/emu/bus/megadrive/md_carts.c
+++ b/src/emu/bus/megadrive/md_carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**********************************************************************
 
 	Megadrive carts
diff --git a/src/emu/bus/megadrive/md_carts.h b/src/emu/bus/megadrive/md_carts.h
index 511b8a52b51..df239e53c80 100644
--- a/src/emu/bus/megadrive/md_carts.h
+++ b/src/emu/bus/megadrive/md_carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Megadrive carts
diff --git a/src/emu/bus/megadrive/md_slot.c b/src/emu/bus/megadrive/md_slot.c
index 7fe2780440c..c221e711bd3 100644
--- a/src/emu/bus/megadrive/md_slot.c
+++ b/src/emu/bus/megadrive/md_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/md_slot.h b/src/emu/bus/megadrive/md_slot.h
index de7074537fd..dcbc4eed266 100644
--- a/src/emu/bus/megadrive/md_slot.h
+++ b/src/emu/bus/megadrive/md_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_SLOT_H
 #define __MD_SLOT_H
 
diff --git a/src/emu/bus/megadrive/rom.c b/src/emu/bus/megadrive/rom.c
index a2c08860134..d980514ebc1 100644
--- a/src/emu/bus/megadrive/rom.c
+++ b/src/emu/bus/megadrive/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/rom.h b/src/emu/bus/megadrive/rom.h
index 53eae8fc39a..2976b892eec 100644
--- a/src/emu/bus/megadrive/rom.h
+++ b/src/emu/bus/megadrive/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_ROM_H
 #define __MD_ROM_H
 
diff --git a/src/emu/bus/megadrive/sk.c b/src/emu/bus/megadrive/sk.c
index a86e055b6bb..71b9f87ab9c 100644
--- a/src/emu/bus/megadrive/sk.c
+++ b/src/emu/bus/megadrive/sk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/sk.h b/src/emu/bus/megadrive/sk.h
index 45671bdef34..f3baa25285c 100644
--- a/src/emu/bus/megadrive/sk.h
+++ b/src/emu/bus/megadrive/sk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_SK_H
 #define __MD_SK_H
 
diff --git a/src/emu/bus/megadrive/stm95.c b/src/emu/bus/megadrive/stm95.c
index 9fc24c1532b..e3221d9093d 100644
--- a/src/emu/bus/megadrive/stm95.c
+++ b/src/emu/bus/megadrive/stm95.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 
diff --git a/src/emu/bus/megadrive/stm95.h b/src/emu/bus/megadrive/stm95.h
index a64a0b1b26b..3de62839fef 100644
--- a/src/emu/bus/megadrive/stm95.h
+++ b/src/emu/bus/megadrive/stm95.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_STM95_H
 #define __MD_STM95_H
 
diff --git a/src/emu/bus/megadrive/svp.c b/src/emu/bus/megadrive/svp.c
index a80f49ddbbc..e7d4fe10601 100644
--- a/src/emu/bus/megadrive/svp.c
+++ b/src/emu/bus/megadrive/svp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************** SVP related *****************************************/
 
 /*
diff --git a/src/emu/bus/megadrive/svp.h b/src/emu/bus/megadrive/svp.h
index 3e694fe6c7b..56e354e452b 100644
--- a/src/emu/bus/megadrive/svp.h
+++ b/src/emu/bus/megadrive/svp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MD_SVP_H
 #define __MD_SVP_H
 
diff --git a/src/emu/bus/midi/midi.c b/src/emu/bus/midi/midi.c
index f000989ecc1..e4064623bfa 100644
--- a/src/emu/bus/midi/midi.c
+++ b/src/emu/bus/midi/midi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "midi.h"
 
 const device_type MIDI_PORT = &device_creator<midi_port_device>;
diff --git a/src/emu/bus/midi/midi.h b/src/emu/bus/midi/midi.h
index 9b2eb850668..608667b2268 100644
--- a/src/emu/bus/midi/midi.h
+++ b/src/emu/bus/midi/midi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __BUS_MIDI_H__
 #define __BUS_MIDI_H__
 
diff --git a/src/emu/bus/midi/midiinport.c b/src/emu/bus/midi/midiinport.c
index 525736f1969..e6eaee2e54f 100644
--- a/src/emu/bus/midi/midiinport.c
+++ b/src/emu/bus/midi/midiinport.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiinport.c
diff --git a/src/emu/bus/midi/midiinport.h b/src/emu/bus/midi/midiinport.h
index fd2bce7f86b..bc73472a790 100644
--- a/src/emu/bus/midi/midiinport.h
+++ b/src/emu/bus/midi/midiinport.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiinport.h
diff --git a/src/emu/bus/midi/midioutport.c b/src/emu/bus/midi/midioutport.c
index 1d4f9e4b408..d9684a18eae 100644
--- a/src/emu/bus/midi/midioutport.c
+++ b/src/emu/bus/midi/midioutport.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midioutport.c
diff --git a/src/emu/bus/midi/midioutport.h b/src/emu/bus/midi/midioutport.h
index 175f9778b1b..e436aa9d1b4 100644
--- a/src/emu/bus/midi/midioutport.h
+++ b/src/emu/bus/midi/midioutport.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midioutport.h
diff --git a/src/emu/bus/msx_cart/arc.c b/src/emu/bus/msx_cart/arc.c
index fae904f7f04..91c59ce7a97 100644
--- a/src/emu/bus/msx_cart/arc.c
+++ b/src/emu/bus/msx_cart/arc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "arc.h"
 
diff --git a/src/emu/bus/msx_cart/arc.h b/src/emu/bus/msx_cart/arc.h
index 664dc4fe38c..131f79715ad 100644
--- a/src/emu/bus/msx_cart/arc.h
+++ b/src/emu/bus/msx_cart/arc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_ARC_H
 #define __MSX_CART_ARC_H
 
diff --git a/src/emu/bus/msx_cart/ascii.c b/src/emu/bus/msx_cart/ascii.c
index 202c9add301..ed2a226223d 100644
--- a/src/emu/bus/msx_cart/ascii.c
+++ b/src/emu/bus/msx_cart/ascii.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "ascii.h"
 
diff --git a/src/emu/bus/msx_cart/ascii.h b/src/emu/bus/msx_cart/ascii.h
index 39a01074af6..2dc095ef9e7 100644
--- a/src/emu/bus/msx_cart/ascii.h
+++ b/src/emu/bus/msx_cart/ascii.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_ASCII_H
 #define __MSX_CART_ASCII_H
 
diff --git a/src/emu/bus/msx_cart/bm_012.c b/src/emu/bus/msx_cart/bm_012.c
index 4e6a39a2de6..b0870ae0344 100644
--- a/src/emu/bus/msx_cart/bm_012.c
+++ b/src/emu/bus/msx_cart/bm_012.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************
 
 Emulation for the MSX BM-012 Midi cartridge that was sold together with Midisaurus.
diff --git a/src/emu/bus/msx_cart/bm_012.h b/src/emu/bus/msx_cart/bm_012.h
index 07fb43ffda8..82b0153d150 100644
--- a/src/emu/bus/msx_cart/bm_012.h
+++ b/src/emu/bus/msx_cart/bm_012.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_BM_012_H
 #define __MSX_CART_BM_012_H
 
diff --git a/src/emu/bus/msx_cart/cartridge.c b/src/emu/bus/msx_cart/cartridge.c
index ae962d41d7b..4b6e4a230bf 100644
--- a/src/emu/bus/msx_cart/cartridge.c
+++ b/src/emu/bus/msx_cart/cartridge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cartridge.h"
diff --git a/src/emu/bus/msx_cart/cartridge.h b/src/emu/bus/msx_cart/cartridge.h
index f256299159b..cf4d3ac32f1 100644
--- a/src/emu/bus/msx_cart/cartridge.h
+++ b/src/emu/bus/msx_cart/cartridge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_CARTRIDGE_H
 #define __MSX_CART_CARTRIDGE_H
 
diff --git a/src/emu/bus/msx_cart/crossblaim.c b/src/emu/bus/msx_cart/crossblaim.c
index 8ff864b8cf3..a45bf818447 100644
--- a/src/emu/bus/msx_cart/crossblaim.c
+++ b/src/emu/bus/msx_cart/crossblaim.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "crossblaim.h"
 
diff --git a/src/emu/bus/msx_cart/crossblaim.h b/src/emu/bus/msx_cart/crossblaim.h
index 36251bdb937..d727ec03aff 100644
--- a/src/emu/bus/msx_cart/crossblaim.h
+++ b/src/emu/bus/msx_cart/crossblaim.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_CROSSBLAIM_H
 #define __MSX_CART_CROSSBLAIM_H
 
diff --git a/src/emu/bus/msx_cart/disk.c b/src/emu/bus/msx_cart/disk.c
index 93def4a5adf..3325bbdf7e4 100644
--- a/src/emu/bus/msx_cart/disk.c
+++ b/src/emu/bus/msx_cart/disk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * MSX Floopy drive interface add-on cartridges
diff --git a/src/emu/bus/msx_cart/disk.h b/src/emu/bus/msx_cart/disk.h
index 10d9999b09b..8da4be89b9e 100644
--- a/src/emu/bus/msx_cart/disk.h
+++ b/src/emu/bus/msx_cart/disk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_DISK_H
 #define __MSX_CART_DISK_H
 
diff --git a/src/emu/bus/msx_cart/dooly.c b/src/emu/bus/msx_cart/dooly.c
index b75a72856db..bec47b3664d 100644
--- a/src/emu/bus/msx_cart/dooly.c
+++ b/src/emu/bus/msx_cart/dooly.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "dooly.h"
 
diff --git a/src/emu/bus/msx_cart/dooly.h b/src/emu/bus/msx_cart/dooly.h
index b0e4ab749cb..8a4b98c2558 100644
--- a/src/emu/bus/msx_cart/dooly.h
+++ b/src/emu/bus/msx_cart/dooly.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_DOOLY_H
 #define __MSX_CART_DOOLY_H
 
diff --git a/src/emu/bus/msx_cart/fmpac.c b/src/emu/bus/msx_cart/fmpac.c
index 6e135642fef..a2c955d2263 100644
--- a/src/emu/bus/msx_cart/fmpac.c
+++ b/src/emu/bus/msx_cart/fmpac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
 When backing up the SRAM from an FM-PAC the file seems to be prefixed
diff --git a/src/emu/bus/msx_cart/fmpac.h b/src/emu/bus/msx_cart/fmpac.h
index d6d44d091d8..670ef6b6b0e 100644
--- a/src/emu/bus/msx_cart/fmpac.h
+++ b/src/emu/bus/msx_cart/fmpac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_FMPAC_H
 #define __MSX_CART_FMPAC_H
 
diff --git a/src/emu/bus/msx_cart/halnote.c b/src/emu/bus/msx_cart/halnote.c
index 570d4dae7c5..72bf6d1bec4 100644
--- a/src/emu/bus/msx_cart/halnote.c
+++ b/src/emu/bus/msx_cart/halnote.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "halnote.h"
 
diff --git a/src/emu/bus/msx_cart/halnote.h b/src/emu/bus/msx_cart/halnote.h
index 9d8caf1d66a..d018794de25 100644
--- a/src/emu/bus/msx_cart/halnote.h
+++ b/src/emu/bus/msx_cart/halnote.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_HALNOTE_H
 #define __MSX_CART_HALNOTE_H
 
diff --git a/src/emu/bus/msx_cart/hfox.c b/src/emu/bus/msx_cart/hfox.c
index 1ed6194f7d8..a4625d1dcc6 100644
--- a/src/emu/bus/msx_cart/hfox.c
+++ b/src/emu/bus/msx_cart/hfox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "hfox.h"
 
diff --git a/src/emu/bus/msx_cart/hfox.h b/src/emu/bus/msx_cart/hfox.h
index ce36492be36..991e1be2724 100644
--- a/src/emu/bus/msx_cart/hfox.h
+++ b/src/emu/bus/msx_cart/hfox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_HFOX_H
 #define __MSX_CART_HFOX_H
 
diff --git a/src/emu/bus/msx_cart/holy_quran.c b/src/emu/bus/msx_cart/holy_quran.c
index 77c64c67ad8..506bff6fa36 100644
--- a/src/emu/bus/msx_cart/holy_quran.c
+++ b/src/emu/bus/msx_cart/holy_quran.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "holy_quran.h"
 
diff --git a/src/emu/bus/msx_cart/holy_quran.h b/src/emu/bus/msx_cart/holy_quran.h
index 2a7fb0204d1..2dd34dc2e17 100644
--- a/src/emu/bus/msx_cart/holy_quran.h
+++ b/src/emu/bus/msx_cart/holy_quran.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_HOLY_QURAN_H
 #define __MSX_CART_HOLY_QURAN_H
 
diff --git a/src/emu/bus/msx_cart/konami.c b/src/emu/bus/msx_cart/konami.c
index e09f04768c1..0e66bc91cfb 100644
--- a/src/emu/bus/msx_cart/konami.c
+++ b/src/emu/bus/msx_cart/konami.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "konami.h"
 
diff --git a/src/emu/bus/msx_cart/konami.h b/src/emu/bus/msx_cart/konami.h
index c85fcd5fbe6..a480bc93cb6 100644
--- a/src/emu/bus/msx_cart/konami.h
+++ b/src/emu/bus/msx_cart/konami.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_KONAMI_H
 #define __MSX_CART_KONAMI_H
 
diff --git a/src/emu/bus/msx_cart/korean.c b/src/emu/bus/msx_cart/korean.c
index 228030ffc99..d4c03362370 100644
--- a/src/emu/bus/msx_cart/korean.c
+++ b/src/emu/bus/msx_cart/korean.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "korean.h"
 
diff --git a/src/emu/bus/msx_cart/korean.h b/src/emu/bus/msx_cart/korean.h
index 76062632923..4d2100a44bc 100644
--- a/src/emu/bus/msx_cart/korean.h
+++ b/src/emu/bus/msx_cart/korean.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_KOREAN_H
 #define __MSX_CART_KOREAN_H
 
diff --git a/src/emu/bus/msx_cart/majutsushi.c b/src/emu/bus/msx_cart/majutsushi.c
index f0141948006..40e503d6fcf 100644
--- a/src/emu/bus/msx_cart/majutsushi.c
+++ b/src/emu/bus/msx_cart/majutsushi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "majutsushi.h"
 
diff --git a/src/emu/bus/msx_cart/majutsushi.h b/src/emu/bus/msx_cart/majutsushi.h
index 95188585169..f9920aaa0a1 100644
--- a/src/emu/bus/msx_cart/majutsushi.h
+++ b/src/emu/bus/msx_cart/majutsushi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_MAJUTSUSHI_H
 #define __MSX_CART_MAJUTSUSHI_H
 
diff --git a/src/emu/bus/msx_cart/msx_audio.c b/src/emu/bus/msx_cart/msx_audio.c
index 5bdd0ce1b64..4c5ff1b2287 100644
--- a/src/emu/bus/msx_cart/msx_audio.c
+++ b/src/emu/bus/msx_cart/msx_audio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
 Emulation of the different MSX-AUDIO devices:
diff --git a/src/emu/bus/msx_cart/msx_audio.h b/src/emu/bus/msx_cart/msx_audio.h
index 9d5711c1145..7dd482cb12d 100644
--- a/src/emu/bus/msx_cart/msx_audio.h
+++ b/src/emu/bus/msx_cart/msx_audio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_MSX_AUDIO_H
 #define __MSX_CART_MSX_AUDIO_H
 
diff --git a/src/emu/bus/msx_cart/msx_audio_kb.c b/src/emu/bus/msx_cart/msx_audio_kb.c
index ccf03ae5c22..85356ec419f 100644
--- a/src/emu/bus/msx_cart/msx_audio_kb.c
+++ b/src/emu/bus/msx_cart/msx_audio_kb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msx_audio_kb.h"
 
diff --git a/src/emu/bus/msx_cart/msx_audio_kb.h b/src/emu/bus/msx_cart/msx_audio_kb.h
index 0e4b9538d28..a8e283caeb8 100644
--- a/src/emu/bus/msx_cart/msx_audio_kb.h
+++ b/src/emu/bus/msx_cart/msx_audio_kb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_AUDIO_KB_H__
 #define __MSX_AUDIO_KB_H__
 
diff --git a/src/emu/bus/msx_cart/msxdos2.c b/src/emu/bus/msx_cart/msxdos2.c
index 3a17d5ed7c7..1370b4a4316 100644
--- a/src/emu/bus/msx_cart/msxdos2.c
+++ b/src/emu/bus/msx_cart/msxdos2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msxdos2.h"
 
diff --git a/src/emu/bus/msx_cart/msxdos2.h b/src/emu/bus/msx_cart/msxdos2.h
index eeaaf584e4a..46e69b400e8 100644
--- a/src/emu/bus/msx_cart/msxdos2.h
+++ b/src/emu/bus/msx_cart/msxdos2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_MSXDOS2_H
 #define __MSX_CART_MSXDOS2_H
 
diff --git a/src/emu/bus/msx_cart/nomapper.c b/src/emu/bus/msx_cart/nomapper.c
index 766cbba068f..a5d60287147 100644
--- a/src/emu/bus/msx_cart/nomapper.c
+++ b/src/emu/bus/msx_cart/nomapper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "nomapper.h"
diff --git a/src/emu/bus/msx_cart/nomapper.h b/src/emu/bus/msx_cart/nomapper.h
index c469f776cdc..498d732512f 100644
--- a/src/emu/bus/msx_cart/nomapper.h
+++ b/src/emu/bus/msx_cart/nomapper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_NOMAPPER_H
 #define __MSX_CART_NOMAPPER_H
 
diff --git a/src/emu/bus/msx_cart/rtype.c b/src/emu/bus/msx_cart/rtype.c
index 9752746a180..6c956006135 100644
--- a/src/emu/bus/msx_cart/rtype.c
+++ b/src/emu/bus/msx_cart/rtype.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "rtype.h"
 
diff --git a/src/emu/bus/msx_cart/rtype.h b/src/emu/bus/msx_cart/rtype.h
index 999ba3232ff..993438e156b 100644
--- a/src/emu/bus/msx_cart/rtype.h
+++ b/src/emu/bus/msx_cart/rtype.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_RTYPE_H
 #define __MSX_CART_RTYPE_H
 
diff --git a/src/emu/bus/msx_cart/super_swangi.c b/src/emu/bus/msx_cart/super_swangi.c
index 10c4d49f704..e68120d2190 100644
--- a/src/emu/bus/msx_cart/super_swangi.c
+++ b/src/emu/bus/msx_cart/super_swangi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "super_swangi.h"
 
diff --git a/src/emu/bus/msx_cart/super_swangi.h b/src/emu/bus/msx_cart/super_swangi.h
index 7b2ec4e069c..b7d75d4e17b 100644
--- a/src/emu/bus/msx_cart/super_swangi.h
+++ b/src/emu/bus/msx_cart/super_swangi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_SUPER_SWANGI_H
 #define __MSX_CART_SUPER_SWANGI_H
 
diff --git a/src/emu/bus/msx_cart/superloderunner.c b/src/emu/bus/msx_cart/superloderunner.c
index 5449e1e8efd..e6aa50bae9e 100644
--- a/src/emu/bus/msx_cart/superloderunner.c
+++ b/src/emu/bus/msx_cart/superloderunner.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "superloderunner.h"
 
diff --git a/src/emu/bus/msx_cart/superloderunner.h b/src/emu/bus/msx_cart/superloderunner.h
index 5508f3f361f..939a195dc78 100644
--- a/src/emu/bus/msx_cart/superloderunner.h
+++ b/src/emu/bus/msx_cart/superloderunner.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_SUPERLODERUNNER_H
 #define __MSX_CART_SUPERLODERUNNER_H
 
diff --git a/src/emu/bus/msx_cart/yamaha.c b/src/emu/bus/msx_cart/yamaha.c
index 9a50f60f4fc..c6d324702af 100644
--- a/src/emu/bus/msx_cart/yamaha.c
+++ b/src/emu/bus/msx_cart/yamaha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
 Yamaha SFG01/SFG05 emulation
diff --git a/src/emu/bus/msx_cart/yamaha.h b/src/emu/bus/msx_cart/yamaha.h
index e1f6fc489ff..f518597a6e7 100644
--- a/src/emu/bus/msx_cart/yamaha.h
+++ b/src/emu/bus/msx_cart/yamaha.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_CART_YAMAHA_H
 #define __MSX_CART_YAMAHA_H
 
diff --git a/src/emu/bus/msx_slot/bunsetsu.c b/src/emu/bus/msx_slot/bunsetsu.c
index ef5995ba7a3..93590f83ba4 100644
--- a/src/emu/bus/msx_slot/bunsetsu.c
+++ b/src/emu/bus/msx_slot/bunsetsu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Emulation for the bunsetsu internal firmware mapper found in a number of MSX machines
 */
diff --git a/src/emu/bus/msx_slot/bunsetsu.h b/src/emu/bus/msx_slot/bunsetsu.h
index de41015932c..9a49ed8c46a 100644
--- a/src/emu/bus/msx_slot/bunsetsu.h
+++ b/src/emu/bus/msx_slot/bunsetsu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_BUNSETSU_H
 #define __MSX_SLOT_BUNSETSU_H
 
diff --git a/src/emu/bus/msx_slot/cartridge.c b/src/emu/bus/msx_slot/cartridge.c
index fde2470802c..b96583bfcb6 100644
--- a/src/emu/bus/msx_slot/cartridge.c
+++ b/src/emu/bus/msx_slot/cartridge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "bus/msx_slot/cartridge.h"
 #include "hashfile.h"
diff --git a/src/emu/bus/msx_slot/cartridge.h b/src/emu/bus/msx_slot/cartridge.h
index 6543284d67b..e7c9348078b 100644
--- a/src/emu/bus/msx_slot/cartridge.h
+++ b/src/emu/bus/msx_slot/cartridge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_CARTRIDGE_H
 #define __MSX_SLOT_CARTRIDGE_H
 
diff --git a/src/emu/bus/msx_slot/disk.c b/src/emu/bus/msx_slot/disk.c
index 998ab6e9899..ae40da509dc 100644
--- a/src/emu/bus/msx_slot/disk.c
+++ b/src/emu/bus/msx_slot/disk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 From: erbo@xs4all.nl (erik de boer)
 
diff --git a/src/emu/bus/msx_slot/disk.h b/src/emu/bus/msx_slot/disk.h
index 66aa050ed0e..45dc87bce75 100644
--- a/src/emu/bus/msx_slot/disk.h
+++ b/src/emu/bus/msx_slot/disk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_DISK_H
 #define __MSX_SLOT_DISK_H
 
diff --git a/src/emu/bus/msx_slot/fs4600.c b/src/emu/bus/msx_slot/fs4600.c
index 91c6db51fc4..5bb2066a58b 100644
--- a/src/emu/bus/msx_slot/fs4600.c
+++ b/src/emu/bus/msx_slot/fs4600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Emulation for the internal firmware mapper in the National FS-4600.
 */
diff --git a/src/emu/bus/msx_slot/fs4600.h b/src/emu/bus/msx_slot/fs4600.h
index 61f855e7a08..981859b419a 100644
--- a/src/emu/bus/msx_slot/fs4600.h
+++ b/src/emu/bus/msx_slot/fs4600.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_FS4600_H
 #define __MSX_SLOT_FS4600_H
 
diff --git a/src/emu/bus/msx_slot/music.c b/src/emu/bus/msx_slot/music.c
index 8cf61743850..e09e7c00124 100644
--- a/src/emu/bus/msx_slot/music.c
+++ b/src/emu/bus/msx_slot/music.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "music.h"
 
diff --git a/src/emu/bus/msx_slot/music.h b/src/emu/bus/msx_slot/music.h
index c21ca3b84fc..eaf5e4be590 100644
--- a/src/emu/bus/msx_slot/music.h
+++ b/src/emu/bus/msx_slot/music.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_MUSIC_H
 #define __MSX_SLOT_MUSIC_H
 
diff --git a/src/emu/bus/msx_slot/panasonic08.c b/src/emu/bus/msx_slot/panasonic08.c
index e0dd880221b..220e8f2afb6 100644
--- a/src/emu/bus/msx_slot/panasonic08.c
+++ b/src/emu/bus/msx_slot/panasonic08.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Emulation of the firmware mapper as found in Panasonic FS-A1WX andFS-A1WSX machines.
diff --git a/src/emu/bus/msx_slot/panasonic08.h b/src/emu/bus/msx_slot/panasonic08.h
index 2f97aa537bd..bcc7b274617 100644
--- a/src/emu/bus/msx_slot/panasonic08.h
+++ b/src/emu/bus/msx_slot/panasonic08.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_PANASONIC08_H
 #define __MSX_SLOT_PANASONIC08_H
 
diff --git a/src/emu/bus/msx_slot/ram.c b/src/emu/bus/msx_slot/ram.c
index 57c8c7c15d0..cf6fe2a250a 100644
--- a/src/emu/bus/msx_slot/ram.c
+++ b/src/emu/bus/msx_slot/ram.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/emu/bus/msx_slot/ram.h b/src/emu/bus/msx_slot/ram.h
index 73cbfebdb62..b874a01c442 100644
--- a/src/emu/bus/msx_slot/ram.h
+++ b/src/emu/bus/msx_slot/ram.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_RAM_H
 #define __MSX_SLOT_RAM_H
 
diff --git a/src/emu/bus/msx_slot/ram_mm.c b/src/emu/bus/msx_slot/ram_mm.c
index 14ef2b0d29e..894cdefdbad 100644
--- a/src/emu/bus/msx_slot/ram_mm.c
+++ b/src/emu/bus/msx_slot/ram_mm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "ram_mm.h"
 
diff --git a/src/emu/bus/msx_slot/ram_mm.h b/src/emu/bus/msx_slot/ram_mm.h
index 52b09028159..2e2b2a3c0b4 100644
--- a/src/emu/bus/msx_slot/ram_mm.h
+++ b/src/emu/bus/msx_slot/ram_mm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_RAM_MM_H
 #define __MSX_SLOT_RAM_MM_H
 
diff --git a/src/emu/bus/msx_slot/rom.c b/src/emu/bus/msx_slot/rom.c
index 6d480363c60..29158a33b0b 100644
--- a/src/emu/bus/msx_slot/rom.c
+++ b/src/emu/bus/msx_slot/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "rom.h"
 
diff --git a/src/emu/bus/msx_slot/rom.h b/src/emu/bus/msx_slot/rom.h
index dfed30f902d..007e23ddb6d 100644
--- a/src/emu/bus/msx_slot/rom.h
+++ b/src/emu/bus/msx_slot/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_ROM_H
 #define __MSX_SLOT_ROM_H
 
diff --git a/src/emu/bus/msx_slot/slot.c b/src/emu/bus/msx_slot/slot.c
index 22ef2bf6290..59a23a7fd77 100644
--- a/src/emu/bus/msx_slot/slot.c
+++ b/src/emu/bus/msx_slot/slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
    MSX (logical) internal slot interfacing
diff --git a/src/emu/bus/msx_slot/slot.h b/src/emu/bus/msx_slot/slot.h
index 3ddf36a038f..0c2bf2583f9 100644
--- a/src/emu/bus/msx_slot/slot.h
+++ b/src/emu/bus/msx_slot/slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
    MSX (logical) internal slot/page interfacing
diff --git a/src/emu/bus/msx_slot/sony08.c b/src/emu/bus/msx_slot/sony08.c
index f578263f762..0ad35bfdca5 100644
--- a/src/emu/bus/msx_slot/sony08.c
+++ b/src/emu/bus/msx_slot/sony08.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Emulation of the firmware mapper as found in Sony HB-F1XDJ and HB-F1XV machines.
diff --git a/src/emu/bus/msx_slot/sony08.h b/src/emu/bus/msx_slot/sony08.h
index 440b7de3a1d..5ad94c8cde5 100644
--- a/src/emu/bus/msx_slot/sony08.h
+++ b/src/emu/bus/msx_slot/sony08.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SLOT_SONY08_H
 #define __MSX_SLOT_SONY08_H
 
diff --git a/src/emu/bus/neogeo/banked_cart.c b/src/emu/bus/neogeo/banked_cart.c
index 7908a2df418..45ccd6c6956 100644
--- a/src/emu/bus/neogeo/banked_cart.c
+++ b/src/emu/bus/neogeo/banked_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "banked_cart.h"
 
diff --git a/src/emu/bus/neogeo/banked_cart.h b/src/emu/bus/neogeo/banked_cart.h
index d0921b72c33..a6cfc641471 100644
--- a/src/emu/bus/neogeo/banked_cart.h
+++ b/src/emu/bus/neogeo/banked_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/bootleg_cart.c b/src/emu/bus/neogeo/bootleg_cart.c
index 57cc59990b8..02d31c7fc4f 100644
--- a/src/emu/bus/neogeo/bootleg_cart.c
+++ b/src/emu/bus/neogeo/bootleg_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/bootleg_cart.h b/src/emu/bus/neogeo/bootleg_cart.h
index 87d78afa227..39dfb89e2d6 100644
--- a/src/emu/bus/neogeo/bootleg_cart.h
+++ b/src/emu/bus/neogeo/bootleg_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_BOOTLEG_CART_H
 #define __NEOGEO_BOOTLEG_CART_H
 
diff --git a/src/emu/bus/neogeo/bootleg_hybrid_cart.c b/src/emu/bus/neogeo/bootleg_hybrid_cart.c
index b671c19edff..0551fb4b9aa 100644
--- a/src/emu/bus/neogeo/bootleg_hybrid_cart.c
+++ b/src/emu/bus/neogeo/bootleg_hybrid_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/bootleg_hybrid_cart.h b/src/emu/bus/neogeo/bootleg_hybrid_cart.h
index 6bc21f22390..aaabb686265 100644
--- a/src/emu/bus/neogeo/bootleg_hybrid_cart.h
+++ b/src/emu/bus/neogeo/bootleg_hybrid_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_BOOTLEG_HYBRID_HYBRID_CART_H
 #define __NEOGEO_BOOTLEG_HYBRID_HYBRID_CART_H
 
diff --git a/src/emu/bus/neogeo/bootleg_prot.c b/src/emu/bus/neogeo/bootleg_prot.c
index 24306d43520..1c8bed1931c 100644
--- a/src/emu/bus/neogeo/bootleg_prot.c
+++ b/src/emu/bus/neogeo/bootleg_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "bootleg_prot.h"
diff --git a/src/emu/bus/neogeo/bootleg_prot.h b/src/emu/bus/neogeo/bootleg_prot.h
index b16024a7ffb..920d3676e3d 100644
--- a/src/emu/bus/neogeo/bootleg_prot.h
+++ b/src/emu/bus/neogeo/bootleg_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 
diff --git a/src/emu/bus/neogeo/cmc_cart.c b/src/emu/bus/neogeo/cmc_cart.c
index 43042474546..b4d965617db 100644
--- a/src/emu/bus/neogeo/cmc_cart.c
+++ b/src/emu/bus/neogeo/cmc_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/cmc_cart.h b/src/emu/bus/neogeo/cmc_cart.h
index 3cf0d9547ef..ccd9198dec7 100644
--- a/src/emu/bus/neogeo/cmc_cart.h
+++ b/src/emu/bus/neogeo/cmc_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_CMC_CART_H
 #define __NEOGEO_CMC_CART_H
 
diff --git a/src/emu/bus/neogeo/cmc_prot.c b/src/emu/bus/neogeo/cmc_prot.c
index e390d865473..c02e9138249 100644
--- a/src/emu/bus/neogeo/cmc_prot.c
+++ b/src/emu/bus/neogeo/cmc_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cmc_prot.h"
diff --git a/src/emu/bus/neogeo/cmc_prot.h b/src/emu/bus/neogeo/cmc_prot.h
index 5c535b09f37..7d650b82474 100644
--- a/src/emu/bus/neogeo/cmc_prot.h
+++ b/src/emu/bus/neogeo/cmc_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/fatfury2_cart.c b/src/emu/bus/neogeo/fatfury2_cart.c
index 4bb865281c4..f44ffa87096 100644
--- a/src/emu/bus/neogeo/fatfury2_cart.c
+++ b/src/emu/bus/neogeo/fatfury2_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/fatfury2_cart.h b/src/emu/bus/neogeo/fatfury2_cart.h
index 3f37174acb7..d65a52a7c70 100644
--- a/src/emu/bus/neogeo/fatfury2_cart.h
+++ b/src/emu/bus/neogeo/fatfury2_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_FATFURY2_CART_H
 #define __NEOGEO_FATFURY2_CART_H
 
diff --git a/src/emu/bus/neogeo/fatfury2_prot.c b/src/emu/bus/neogeo/fatfury2_prot.c
index ca76ee26f42..20d0c186170 100644
--- a/src/emu/bus/neogeo/fatfury2_prot.c
+++ b/src/emu/bus/neogeo/fatfury2_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "fatfury2_prot.h"
diff --git a/src/emu/bus/neogeo/fatfury2_prot.h b/src/emu/bus/neogeo/fatfury2_prot.h
index d359f616136..088df39ee2d 100644
--- a/src/emu/bus/neogeo/fatfury2_prot.h
+++ b/src/emu/bus/neogeo/fatfury2_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 
diff --git a/src/emu/bus/neogeo/kof2002_cart.c b/src/emu/bus/neogeo/kof2002_cart.c
index cb19f938ef8..36489d1ce35 100644
--- a/src/emu/bus/neogeo/kof2002_cart.c
+++ b/src/emu/bus/neogeo/kof2002_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/kof2002_cart.h b/src/emu/bus/neogeo/kof2002_cart.h
index 60c48ebd880..25f6207b222 100644
--- a/src/emu/bus/neogeo/kof2002_cart.h
+++ b/src/emu/bus/neogeo/kof2002_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_KOF2002_CART_H
 #define __NEOGEO_KOF2002_CART_H
 
diff --git a/src/emu/bus/neogeo/kof2002_prot.c b/src/emu/bus/neogeo/kof2002_prot.c
index 0f6749e0c0e..64b3db81aac 100644
--- a/src/emu/bus/neogeo/kof2002_prot.c
+++ b/src/emu/bus/neogeo/kof2002_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "kof2002_prot.h"
diff --git a/src/emu/bus/neogeo/kof2002_prot.h b/src/emu/bus/neogeo/kof2002_prot.h
index 6e9074c157e..16aa6c658d0 100644
--- a/src/emu/bus/neogeo/kof2002_prot.h
+++ b/src/emu/bus/neogeo/kof2002_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/kof98_cart.c b/src/emu/bus/neogeo/kof98_cart.c
index 5af4977a000..b6a6f0061ed 100644
--- a/src/emu/bus/neogeo/kof98_cart.c
+++ b/src/emu/bus/neogeo/kof98_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/kof98_cart.h b/src/emu/bus/neogeo/kof98_cart.h
index 529c7b73e26..0bae2d47487 100644
--- a/src/emu/bus/neogeo/kof98_cart.h
+++ b/src/emu/bus/neogeo/kof98_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_KOF98_CART_H
 #define __NEOGEO_KOF98_CART_H
 
diff --git a/src/emu/bus/neogeo/kof98_prot.c b/src/emu/bus/neogeo/kof98_prot.c
index c6b1ecb72bf..973ca64ed3b 100644
--- a/src/emu/bus/neogeo/kof98_prot.c
+++ b/src/emu/bus/neogeo/kof98_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/emu/bus/neogeo/kof98_prot.h b/src/emu/bus/neogeo/kof98_prot.h
index dfd587c418a..22b3ae251a9 100644
--- a/src/emu/bus/neogeo/kof98_prot.h
+++ b/src/emu/bus/neogeo/kof98_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/kog_prot.c b/src/emu/bus/neogeo/kog_prot.c
index 54de00b4ea5..c9b8810faf8 100644
--- a/src/emu/bus/neogeo/kog_prot.c
+++ b/src/emu/bus/neogeo/kog_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "kog_prot.h"
 
diff --git a/src/emu/bus/neogeo/kog_prot.h b/src/emu/bus/neogeo/kog_prot.h
index 65eb7133ee9..1173db6d27d 100644
--- a/src/emu/bus/neogeo/kog_prot.h
+++ b/src/emu/bus/neogeo/kog_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/mslugx_cart.c b/src/emu/bus/neogeo/mslugx_cart.c
index bd9d7a2a9d1..5d56c132f2e 100644
--- a/src/emu/bus/neogeo/mslugx_cart.c
+++ b/src/emu/bus/neogeo/mslugx_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/mslugx_cart.h b/src/emu/bus/neogeo/mslugx_cart.h
index f6b0d9d75cf..449b310d472 100644
--- a/src/emu/bus/neogeo/mslugx_cart.h
+++ b/src/emu/bus/neogeo/mslugx_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_MSLUGX_CART_H
 #define __NEOGEO_MSLUGX_CART_H
 
diff --git a/src/emu/bus/neogeo/mslugx_prot.c b/src/emu/bus/neogeo/mslugx_prot.c
index d8d65ee3251..45a6fb85369 100644
--- a/src/emu/bus/neogeo/mslugx_prot.c
+++ b/src/emu/bus/neogeo/mslugx_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "mslugx_prot.h"
 
diff --git a/src/emu/bus/neogeo/mslugx_prot.h b/src/emu/bus/neogeo/mslugx_prot.h
index cb95da812ac..fd50d64be3b 100644
--- a/src/emu/bus/neogeo/mslugx_prot.h
+++ b/src/emu/bus/neogeo/mslugx_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/neogeo_carts.c b/src/emu/bus/neogeo/neogeo_carts.c
index 1a9cdbb402f..0e84be74397 100644
--- a/src/emu/bus/neogeo/neogeo_carts.c
+++ b/src/emu/bus/neogeo/neogeo_carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**********************************************************************
 
 **********************************************************************/
diff --git a/src/emu/bus/neogeo/neogeo_carts.h b/src/emu/bus/neogeo/neogeo_carts.h
index 69ab1808fb7..5c821a8ed14 100644
--- a/src/emu/bus/neogeo/neogeo_carts.h
+++ b/src/emu/bus/neogeo/neogeo_carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
 **********************************************************************/
diff --git a/src/emu/bus/neogeo/neogeo_helper.c b/src/emu/bus/neogeo/neogeo_helper.c
index b31927cfee8..0160b0c9cff 100644
--- a/src/emu/bus/neogeo/neogeo_helper.c
+++ b/src/emu/bus/neogeo/neogeo_helper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "neogeo_helper.h"
diff --git a/src/emu/bus/neogeo/neogeo_helper.h b/src/emu/bus/neogeo/neogeo_helper.h
index 6d6701f3bb5..3bb97b5fa4a 100644
--- a/src/emu/bus/neogeo/neogeo_helper.h
+++ b/src/emu/bus/neogeo/neogeo_helper.h
@@ -1,2 +1,4 @@
+// license:???
+// copyright-holders:???
 
 extern UINT32 neogeohelper_optimize_sprite_data(std::vector<UINT8> &spritegfx, UINT8* region_sprites, UINT32 region_sprites_size);
diff --git a/src/emu/bus/neogeo/neogeo_intf.c b/src/emu/bus/neogeo/neogeo_intf.c
index 223158242d0..4f2486497d0 100644
--- a/src/emu/bus/neogeo/neogeo_intf.c
+++ b/src/emu/bus/neogeo/neogeo_intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "neogeo_intf.h"
diff --git a/src/emu/bus/neogeo/neogeo_intf.h b/src/emu/bus/neogeo/neogeo_intf.h
index eac0f4f5f3c..03723f1169b 100644
--- a/src/emu/bus/neogeo/neogeo_intf.h
+++ b/src/emu/bus/neogeo/neogeo_intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #ifndef __NEOGEO_INTF_H
 #define __NEOGEO_INTF_H
diff --git a/src/emu/bus/neogeo/neogeo_slot.c b/src/emu/bus/neogeo/neogeo_slot.c
index 497b2b237bc..01a82b9a0bb 100644
--- a/src/emu/bus/neogeo/neogeo_slot.c
+++ b/src/emu/bus/neogeo/neogeo_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  ***********************************************************************************************************/
diff --git a/src/emu/bus/neogeo/neogeo_slot.h b/src/emu/bus/neogeo/neogeo_slot.h
index 5fc1ab8f730..1c865e7715d 100644
--- a/src/emu/bus/neogeo/neogeo_slot.h
+++ b/src/emu/bus/neogeo/neogeo_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_SLOT_H
 #define __NEOGEO_SLOT_H
 
diff --git a/src/emu/bus/neogeo/pcm2_cart.c b/src/emu/bus/neogeo/pcm2_cart.c
index cb24de2ce71..2c8498597f4 100644
--- a/src/emu/bus/neogeo/pcm2_cart.c
+++ b/src/emu/bus/neogeo/pcm2_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/pcm2_cart.h b/src/emu/bus/neogeo/pcm2_cart.h
index 9846c9e28f4..dac8c64bc59 100644
--- a/src/emu/bus/neogeo/pcm2_cart.h
+++ b/src/emu/bus/neogeo/pcm2_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_PCM2_CART_H
 #define __NEOGEO_PCM2_CART_H
 
diff --git a/src/emu/bus/neogeo/pcm2_prot.c b/src/emu/bus/neogeo/pcm2_prot.c
index 309b75d81a9..425eaada677 100644
--- a/src/emu/bus/neogeo/pcm2_prot.c
+++ b/src/emu/bus/neogeo/pcm2_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/emu/bus/neogeo/pcm2_prot.h b/src/emu/bus/neogeo/pcm2_prot.h
index 09b0e8a1f21..70383df23a5 100644
--- a/src/emu/bus/neogeo/pcm2_prot.h
+++ b/src/emu/bus/neogeo/pcm2_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/pvc_cart.c b/src/emu/bus/neogeo/pvc_cart.c
index 9ff5b8f2874..bc517305055 100644
--- a/src/emu/bus/neogeo/pvc_cart.c
+++ b/src/emu/bus/neogeo/pvc_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/pvc_cart.h b/src/emu/bus/neogeo/pvc_cart.h
index bf00bf9e2e4..5ae8404440a 100644
--- a/src/emu/bus/neogeo/pvc_cart.h
+++ b/src/emu/bus/neogeo/pvc_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_PVC_CART_H
 #define __NEOGEO_PVC_CART_H
 
diff --git a/src/emu/bus/neogeo/pvc_prot.c b/src/emu/bus/neogeo/pvc_prot.c
index 728b50bca9f..20640c8ca4c 100644
--- a/src/emu/bus/neogeo/pvc_prot.c
+++ b/src/emu/bus/neogeo/pvc_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/emu/bus/neogeo/pvc_prot.h b/src/emu/bus/neogeo/pvc_prot.h
index fde58cbb8f6..33625fb711b 100644
--- a/src/emu/bus/neogeo/pvc_prot.h
+++ b/src/emu/bus/neogeo/pvc_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 
diff --git a/src/emu/bus/neogeo/rom.c b/src/emu/bus/neogeo/rom.c
index c63686c8a50..35c01bd41f1 100644
--- a/src/emu/bus/neogeo/rom.c
+++ b/src/emu/bus/neogeo/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/rom.h b/src/emu/bus/neogeo/rom.h
index 169ca139ebb..a1c511e878b 100644
--- a/src/emu/bus/neogeo/rom.h
+++ b/src/emu/bus/neogeo/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_ROM_H
 #define __NEOGEO_ROM_H
 
diff --git a/src/emu/bus/neogeo/sbp_prot.c b/src/emu/bus/neogeo/sbp_prot.c
index bec2b26386c..a7df97604c6 100644
--- a/src/emu/bus/neogeo/sbp_prot.c
+++ b/src/emu/bus/neogeo/sbp_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/emu/bus/neogeo/sbp_prot.h b/src/emu/bus/neogeo/sbp_prot.h
index 6fd99d03f58..a679384ce0b 100644
--- a/src/emu/bus/neogeo/sbp_prot.h
+++ b/src/emu/bus/neogeo/sbp_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/neogeo/sma_cart.c b/src/emu/bus/neogeo/sma_cart.c
index a8b46c2994d..7258bdc5ee2 100644
--- a/src/emu/bus/neogeo/sma_cart.c
+++ b/src/emu/bus/neogeo/sma_cart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  NEOGEO ROM cart emulation
diff --git a/src/emu/bus/neogeo/sma_cart.h b/src/emu/bus/neogeo/sma_cart.h
index 52af6f984bf..7179a7f7a89 100644
--- a/src/emu/bus/neogeo/sma_cart.h
+++ b/src/emu/bus/neogeo/sma_cart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEOGEO_SMA_CART_H
 #define __NEOGEO_SMA_CART_H
 
diff --git a/src/emu/bus/neogeo/sma_prot.c b/src/emu/bus/neogeo/sma_prot.c
index 8a6c5beef1f..613f0123897 100644
--- a/src/emu/bus/neogeo/sma_prot.c
+++ b/src/emu/bus/neogeo/sma_prot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sma_prot.h"
 
diff --git a/src/emu/bus/neogeo/sma_prot.h b/src/emu/bus/neogeo/sma_prot.h
index 814b52625aa..7398795dd45 100644
--- a/src/emu/bus/neogeo/sma_prot.h
+++ b/src/emu/bus/neogeo/sma_prot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #pragma once
diff --git a/src/emu/bus/nes/2a03pur.c b/src/emu/bus/nes/2a03pur.c
index aaca3cf51e6..db4f89db0d4 100644
--- a/src/emu/bus/nes/2a03pur.c
+++ b/src/emu/bus/nes/2a03pur.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/2a03pur.h b/src/emu/bus/nes/2a03pur.h
index 29329e0c58b..e66ea23b64e 100644
--- a/src/emu/bus/nes/2a03pur.h
+++ b/src/emu/bus/nes/2a03pur.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_2A03PUR_H
 #define __NES_2A03PUR_H
 
diff --git a/src/emu/bus/nes/act53.c b/src/emu/bus/nes/act53.c
index 6914d1137df..5495544d80b 100644
--- a/src/emu/bus/nes/act53.c
+++ b/src/emu/bus/nes/act53.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/act53.h b/src/emu/bus/nes/act53.h
index 6ec50e6af91..0a64d9f4ec4 100644
--- a/src/emu/bus/nes/act53.h
+++ b/src/emu/bus/nes/act53.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_ACTION53_H
 #define __NES_ACTION53_H
 
diff --git a/src/emu/bus/nes/aladdin.c b/src/emu/bus/nes/aladdin.c
index cd5712bc926..6527b8cf348 100644
--- a/src/emu/bus/nes/aladdin.c
+++ b/src/emu/bus/nes/aladdin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/aladdin.h b/src/emu/bus/nes/aladdin.h
index a53816268cb..c299deee361 100644
--- a/src/emu/bus/nes/aladdin.h
+++ b/src/emu/bus/nes/aladdin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_ALADDIN_H
 #define __NES_ALADDIN_H
 
diff --git a/src/emu/bus/nes/ave.c b/src/emu/bus/nes/ave.c
index 4280286519b..891a6b1c0af 100644
--- a/src/emu/bus/nes/ave.c
+++ b/src/emu/bus/nes/ave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/ave.h b/src/emu/bus/nes/ave.h
index 861b77f28d6..5d9da068437 100644
--- a/src/emu/bus/nes/ave.h
+++ b/src/emu/bus/nes/ave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_AVE_H
 #define __NES_AVE_H
 
diff --git a/src/emu/bus/nes/bandai.c b/src/emu/bus/nes/bandai.c
index 758dcfd037e..d8603274eb9 100644
--- a/src/emu/bus/nes/bandai.c
+++ b/src/emu/bus/nes/bandai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/bandai.h b/src/emu/bus/nes/bandai.h
index 2561fdfa264..3defa3b981a 100644
--- a/src/emu/bus/nes/bandai.h
+++ b/src/emu/bus/nes/bandai.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_BANDAI_H
 #define __NES_BANDAI_H
 
diff --git a/src/emu/bus/nes/benshieng.c b/src/emu/bus/nes/benshieng.c
index e3ddb5117df..ac9794203ff 100644
--- a/src/emu/bus/nes/benshieng.c
+++ b/src/emu/bus/nes/benshieng.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/benshieng.h b/src/emu/bus/nes/benshieng.h
index 8bd6ee60594..4222fb2e406 100644
--- a/src/emu/bus/nes/benshieng.h
+++ b/src/emu/bus/nes/benshieng.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_BENSHIENG_H
 #define __NES_BENSHIENG_H
 
diff --git a/src/emu/bus/nes/bootleg.c b/src/emu/bus/nes/bootleg.c
index 2d85f78ac87..1cdb657eb28 100644
--- a/src/emu/bus/nes/bootleg.c
+++ b/src/emu/bus/nes/bootleg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/bootleg.h b/src/emu/bus/nes/bootleg.h
index 20926602e98..e946d644fab 100644
--- a/src/emu/bus/nes/bootleg.h
+++ b/src/emu/bus/nes/bootleg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_BTL_H
 #define __NES_BTL_H
 
diff --git a/src/emu/bus/nes/camerica.c b/src/emu/bus/nes/camerica.c
index 5c70ea8ecb9..8999484f214 100644
--- a/src/emu/bus/nes/camerica.c
+++ b/src/emu/bus/nes/camerica.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/camerica.h b/src/emu/bus/nes/camerica.h
index 6146ba7df36..2228f02306a 100644
--- a/src/emu/bus/nes/camerica.h
+++ b/src/emu/bus/nes/camerica.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_CAMERICA_H
 #define __NES_CAMERICA_H
 
diff --git a/src/emu/bus/nes/cne.c b/src/emu/bus/nes/cne.c
index 8ba358dfafe..2d1ed23e760 100644
--- a/src/emu/bus/nes/cne.c
+++ b/src/emu/bus/nes/cne.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/cne.h b/src/emu/bus/nes/cne.h
index 5e9453f14a8..391e5eff1c5 100644
--- a/src/emu/bus/nes/cne.h
+++ b/src/emu/bus/nes/cne.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_CNE_H
 #define __NES_CNE_H
 
diff --git a/src/emu/bus/nes/cony.c b/src/emu/bus/nes/cony.c
index ff2cacdb669..f1dd6e404c2 100644
--- a/src/emu/bus/nes/cony.c
+++ b/src/emu/bus/nes/cony.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/cony.h b/src/emu/bus/nes/cony.h
index 314dfb64efb..2e8a76a502f 100644
--- a/src/emu/bus/nes/cony.h
+++ b/src/emu/bus/nes/cony.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_CONY_H
 #define __NES_CONY_H
 
diff --git a/src/emu/bus/nes/datach.c b/src/emu/bus/nes/datach.c
index d0a9bed64ee..04a3817dcf5 100644
--- a/src/emu/bus/nes/datach.c
+++ b/src/emu/bus/nes/datach.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/datach.h b/src/emu/bus/nes/datach.h
index 69cd1a646bf..2479683e194 100644
--- a/src/emu/bus/nes/datach.h
+++ b/src/emu/bus/nes/datach.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_DATACH_H
 #define __NES_DATACH_H
 
diff --git a/src/emu/bus/nes/discrete.c b/src/emu/bus/nes/discrete.c
index d95214c0521..b216992626a 100644
--- a/src/emu/bus/nes/discrete.c
+++ b/src/emu/bus/nes/discrete.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/discrete.h b/src/emu/bus/nes/discrete.h
index c5f1840fe35..d848ee3ee97 100644
--- a/src/emu/bus/nes/discrete.h
+++ b/src/emu/bus/nes/discrete.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_DISCRETE_H
 #define __NES_DISCRETE_H
 
diff --git a/src/emu/bus/nes/disksys.c b/src/emu/bus/nes/disksys.c
index ae95074102c..86484669a7d 100644
--- a/src/emu/bus/nes/disksys.c
+++ b/src/emu/bus/nes/disksys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/disksys.h b/src/emu/bus/nes/disksys.h
index e1a2ec3a0e9..b0db879d224 100644
--- a/src/emu/bus/nes/disksys.h
+++ b/src/emu/bus/nes/disksys.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_DISKSYS_H
 #define __NES_DISKSYS_H
 
diff --git a/src/emu/bus/nes/event.c b/src/emu/bus/nes/event.c
index 5177c785dfb..bb79adb0407 100644
--- a/src/emu/bus/nes/event.c
+++ b/src/emu/bus/nes/event.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/event.h b/src/emu/bus/nes/event.h
index bc8d3550aa9..4bc9248eef5 100644
--- a/src/emu/bus/nes/event.h
+++ b/src/emu/bus/nes/event.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_EVENT_H
 #define __NES_EVENT_H
 
diff --git a/src/emu/bus/nes/ggenie.c b/src/emu/bus/nes/ggenie.c
index 6bcc253cf21..97be7ae4afd 100644
--- a/src/emu/bus/nes/ggenie.c
+++ b/src/emu/bus/nes/ggenie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/ggenie.h b/src/emu/bus/nes/ggenie.h
index 8f208f5b54d..dfd333e061b 100644
--- a/src/emu/bus/nes/ggenie.h
+++ b/src/emu/bus/nes/ggenie.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_GGENIE_H
 #define __NES_GGENIE_H
 
diff --git a/src/emu/bus/nes/henggedianzi.c b/src/emu/bus/nes/henggedianzi.c
index 35759639823..0d0c855f277 100644
--- a/src/emu/bus/nes/henggedianzi.c
+++ b/src/emu/bus/nes/henggedianzi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/henggedianzi.h b/src/emu/bus/nes/henggedianzi.h
index 116316cf766..a92ffcb2738 100644
--- a/src/emu/bus/nes/henggedianzi.h
+++ b/src/emu/bus/nes/henggedianzi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_HENGGEDIANZI_H
 #define __NES_HENGGEDIANZI_H
 
diff --git a/src/emu/bus/nes/hes.c b/src/emu/bus/nes/hes.c
index 514b78c7a1c..d39b343b78c 100644
--- a/src/emu/bus/nes/hes.c
+++ b/src/emu/bus/nes/hes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/hes.h b/src/emu/bus/nes/hes.h
index d7d85adf81d..18512d3564b 100644
--- a/src/emu/bus/nes/hes.h
+++ b/src/emu/bus/nes/hes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_HES_H
 #define __NES_HES_H
 
diff --git a/src/emu/bus/nes/hosenkan.c b/src/emu/bus/nes/hosenkan.c
index b431d1bb5cc..4addd10e834 100644
--- a/src/emu/bus/nes/hosenkan.c
+++ b/src/emu/bus/nes/hosenkan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/hosenkan.h b/src/emu/bus/nes/hosenkan.h
index 70d9c0f959b..fa9d8fe4b6a 100644
--- a/src/emu/bus/nes/hosenkan.h
+++ b/src/emu/bus/nes/hosenkan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_HOSENKAN_H
 #define __NES_HOSENKAN_H
 
diff --git a/src/emu/bus/nes/irem.c b/src/emu/bus/nes/irem.c
index 52afa139152..d747b7e175b 100644
--- a/src/emu/bus/nes/irem.c
+++ b/src/emu/bus/nes/irem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/irem.h b/src/emu/bus/nes/irem.h
index f72f7a0a452..79029bbdf44 100644
--- a/src/emu/bus/nes/irem.h
+++ b/src/emu/bus/nes/irem.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_IREM_H
 #define __NES_IREM_H
 
diff --git a/src/emu/bus/nes/jaleco.c b/src/emu/bus/nes/jaleco.c
index 1761ff08bcb..53637720ab4 100644
--- a/src/emu/bus/nes/jaleco.c
+++ b/src/emu/bus/nes/jaleco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/jaleco.h b/src/emu/bus/nes/jaleco.h
index fd2c60ea4ce..d1cf0d66431 100644
--- a/src/emu/bus/nes/jaleco.h
+++ b/src/emu/bus/nes/jaleco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_JALECO_H
 #define __NES_JALECO_H
 
diff --git a/src/emu/bus/nes/jy.c b/src/emu/bus/nes/jy.c
index fdf72f83683..b977299bc9a 100644
--- a/src/emu/bus/nes/jy.c
+++ b/src/emu/bus/nes/jy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/jy.h b/src/emu/bus/nes/jy.h
index 47e16d983c4..17e4e85129a 100644
--- a/src/emu/bus/nes/jy.h
+++ b/src/emu/bus/nes/jy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_JY_H
 #define __NES_JY_H
 
diff --git a/src/emu/bus/nes/kaiser.c b/src/emu/bus/nes/kaiser.c
index 197a86bb252..72e87c61d8f 100644
--- a/src/emu/bus/nes/kaiser.c
+++ b/src/emu/bus/nes/kaiser.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/kaiser.h b/src/emu/bus/nes/kaiser.h
index 70036ab6606..87ccbf0c279 100644
--- a/src/emu/bus/nes/kaiser.h
+++ b/src/emu/bus/nes/kaiser.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_KAISER_H
 #define __NES_KAISER_H
 
diff --git a/src/emu/bus/nes/karastudio.c b/src/emu/bus/nes/karastudio.c
index db926c131e0..4b5e34799d4 100644
--- a/src/emu/bus/nes/karastudio.c
+++ b/src/emu/bus/nes/karastudio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/karastudio.h b/src/emu/bus/nes/karastudio.h
index 8c4a28afe17..f9fcd4afd96 100644
--- a/src/emu/bus/nes/karastudio.h
+++ b/src/emu/bus/nes/karastudio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_KARASTUDIO_H
 #define __NES_KARASTUDIO_H
 
diff --git a/src/emu/bus/nes/konami.c b/src/emu/bus/nes/konami.c
index 993717b06e4..ee0890c3814 100644
--- a/src/emu/bus/nes/konami.c
+++ b/src/emu/bus/nes/konami.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/konami.h b/src/emu/bus/nes/konami.h
index 375e3d4d8dd..baba4aee72f 100644
--- a/src/emu/bus/nes/konami.h
+++ b/src/emu/bus/nes/konami.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_KONAMI_H
 #define __NES_KONAMI_H
 
diff --git a/src/emu/bus/nes/legacy.c b/src/emu/bus/nes/legacy.c
index 6382fc0aaf1..b0773270db1 100644
--- a/src/emu/bus/nes/legacy.c
+++ b/src/emu/bus/nes/legacy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/legacy.h b/src/emu/bus/nes/legacy.h
index 5cbfd39c3df..6e547a5ddfa 100644
--- a/src/emu/bus/nes/legacy.h
+++ b/src/emu/bus/nes/legacy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_LEGACY_H
 #define __NES_LEGACY_H
 
diff --git a/src/emu/bus/nes/mmc1.c b/src/emu/bus/nes/mmc1.c
index ad3e0175e16..9f83f5efc0d 100644
--- a/src/emu/bus/nes/mmc1.c
+++ b/src/emu/bus/nes/mmc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/mmc1.h b/src/emu/bus/nes/mmc1.h
index f0f0987bb27..4d3c7463cbf 100644
--- a/src/emu/bus/nes/mmc1.h
+++ b/src/emu/bus/nes/mmc1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMC1_H
 #define __NES_MMC1_H
 
diff --git a/src/emu/bus/nes/mmc2.c b/src/emu/bus/nes/mmc2.c
index 64e7931f7ed..7156fbdd968 100644
--- a/src/emu/bus/nes/mmc2.c
+++ b/src/emu/bus/nes/mmc2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/mmc2.h b/src/emu/bus/nes/mmc2.h
index a4963a7f2c4..04bfca48f0a 100644
--- a/src/emu/bus/nes/mmc2.h
+++ b/src/emu/bus/nes/mmc2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMC2_H
 #define __NES_MMC2_H
 
diff --git a/src/emu/bus/nes/mmc3.c b/src/emu/bus/nes/mmc3.c
index aee892535bb..e4263ddbb9f 100644
--- a/src/emu/bus/nes/mmc3.c
+++ b/src/emu/bus/nes/mmc3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/mmc3.h b/src/emu/bus/nes/mmc3.h
index 9f97ad86872..69fd36ae1e3 100644
--- a/src/emu/bus/nes/mmc3.h
+++ b/src/emu/bus/nes/mmc3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMC3_H
 #define __NES_MMC3_H
 
diff --git a/src/emu/bus/nes/mmc3_clones.c b/src/emu/bus/nes/mmc3_clones.c
index ef75d45c329..5bfab346f5f 100644
--- a/src/emu/bus/nes/mmc3_clones.c
+++ b/src/emu/bus/nes/mmc3_clones.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/mmc3_clones.h b/src/emu/bus/nes/mmc3_clones.h
index 6fc1e922e2b..27013f18820 100644
--- a/src/emu/bus/nes/mmc3_clones.h
+++ b/src/emu/bus/nes/mmc3_clones.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMC3_CLONES_H
 #define __NES_MMC3_CLONES_H
 
diff --git a/src/emu/bus/nes/mmc5.c b/src/emu/bus/nes/mmc5.c
index 7d20c1e6846..40b2de387d1 100644
--- a/src/emu/bus/nes/mmc5.c
+++ b/src/emu/bus/nes/mmc5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/mmc5.h b/src/emu/bus/nes/mmc5.h
index e764f9bcc95..d4cbc86881e 100644
--- a/src/emu/bus/nes/mmc5.h
+++ b/src/emu/bus/nes/mmc5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMC5_H
 #define __NES_MMC5_H
 
diff --git a/src/emu/bus/nes/multigame.c b/src/emu/bus/nes/multigame.c
index bfcb8b444ac..185a485b0ed 100644
--- a/src/emu/bus/nes/multigame.c
+++ b/src/emu/bus/nes/multigame.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/multigame.h b/src/emu/bus/nes/multigame.h
index 9e73c4c3d5e..3776be29987 100644
--- a/src/emu/bus/nes/multigame.h
+++ b/src/emu/bus/nes/multigame.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MULTIGAME_H
 #define __NES_MULTIGAME_H
 
diff --git a/src/emu/bus/nes/namcot.c b/src/emu/bus/nes/namcot.c
index 43573a627a0..6b446784b75 100644
--- a/src/emu/bus/nes/namcot.c
+++ b/src/emu/bus/nes/namcot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/namcot.h b/src/emu/bus/nes/namcot.h
index 11cfa4381c5..174347191af 100644
--- a/src/emu/bus/nes/namcot.h
+++ b/src/emu/bus/nes/namcot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_NAMCOT_H
 #define __NES_NAMCOT_H
 
diff --git a/src/emu/bus/nes/nanjing.c b/src/emu/bus/nes/nanjing.c
index b14297f067b..1ab64ef88a9 100644
--- a/src/emu/bus/nes/nanjing.c
+++ b/src/emu/bus/nes/nanjing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/nanjing.h b/src/emu/bus/nes/nanjing.h
index 3b1efe0a165..b43dde619f8 100644
--- a/src/emu/bus/nes/nanjing.h
+++ b/src/emu/bus/nes/nanjing.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_NANJING_H
 #define __NES_NANJING_H
 
diff --git a/src/emu/bus/nes/nes_carts.c b/src/emu/bus/nes/nes_carts.c
index d932ac8b567..8ecdc0abb3a 100644
--- a/src/emu/bus/nes/nes_carts.c
+++ b/src/emu/bus/nes/nes_carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NES carts
diff --git a/src/emu/bus/nes/nes_carts.h b/src/emu/bus/nes/nes_carts.h
index c4e35e0e5a1..334848d8241 100644
--- a/src/emu/bus/nes/nes_carts.h
+++ b/src/emu/bus/nes/nes_carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NES carts
diff --git a/src/emu/bus/nes/nes_slot.c b/src/emu/bus/nes/nes_slot.c
index 7c1827c487f..8e711fe196b 100644
--- a/src/emu/bus/nes/nes_slot.c
+++ b/src/emu/bus/nes/nes_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/nes_slot.h b/src/emu/bus/nes/nes_slot.h
index 2f8ec875f8c..a9fd4e65369 100644
--- a/src/emu/bus/nes/nes_slot.h
+++ b/src/emu/bus/nes/nes_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_SLOT_H__
 #define __NES_SLOT_H__
 
diff --git a/src/emu/bus/nes/ntdec.c b/src/emu/bus/nes/ntdec.c
index b204f231554..60482dd9efa 100644
--- a/src/emu/bus/nes/ntdec.c
+++ b/src/emu/bus/nes/ntdec.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/ntdec.h b/src/emu/bus/nes/ntdec.h
index 4b611e303b6..eb6c3549a43 100644
--- a/src/emu/bus/nes/ntdec.h
+++ b/src/emu/bus/nes/ntdec.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_NTDEC_H
 #define __NES_NTDEC_H
 
diff --git a/src/emu/bus/nes/nxrom.c b/src/emu/bus/nes/nxrom.c
index 8c3d56a4e6a..49db0d380e6 100644
--- a/src/emu/bus/nes/nxrom.c
+++ b/src/emu/bus/nes/nxrom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/nxrom.h b/src/emu/bus/nes/nxrom.h
index 43c462409fe..d9712481aa8 100644
--- a/src/emu/bus/nes/nxrom.h
+++ b/src/emu/bus/nes/nxrom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_MMCX_H
 #define __NES_MMCX_H
 
diff --git a/src/emu/bus/nes/pirate.c b/src/emu/bus/nes/pirate.c
index e8c4762b1a8..1b23a31bf8b 100644
--- a/src/emu/bus/nes/pirate.c
+++ b/src/emu/bus/nes/pirate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/pirate.h b/src/emu/bus/nes/pirate.h
index 474afc81598..29e4ae557ed 100644
--- a/src/emu/bus/nes/pirate.h
+++ b/src/emu/bus/nes/pirate.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_PIR_H
 #define __NES_PIR_H
 
diff --git a/src/emu/bus/nes/pt554.c b/src/emu/bus/nes/pt554.c
index 7f38c1bd0c8..9c2ebe1ff33 100644
--- a/src/emu/bus/nes/pt554.c
+++ b/src/emu/bus/nes/pt554.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/pt554.h b/src/emu/bus/nes/pt554.h
index 979acc31d8b..41a317fe279 100644
--- a/src/emu/bus/nes/pt554.h
+++ b/src/emu/bus/nes/pt554.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_PT554_H
 #define __NES_PT554_H
 
diff --git a/src/emu/bus/nes/racermate.c b/src/emu/bus/nes/racermate.c
index 290c1179114..7ad8e7df8da 100644
--- a/src/emu/bus/nes/racermate.c
+++ b/src/emu/bus/nes/racermate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/racermate.h b/src/emu/bus/nes/racermate.h
index 520429c26c0..6116484d181 100644
--- a/src/emu/bus/nes/racermate.h
+++ b/src/emu/bus/nes/racermate.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_RACERMATE_H
 #define __NES_RACERMATE_H
 
diff --git a/src/emu/bus/nes/rcm.c b/src/emu/bus/nes/rcm.c
index 50419f6c1e2..8fdfb945140 100644
--- a/src/emu/bus/nes/rcm.c
+++ b/src/emu/bus/nes/rcm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/rcm.h b/src/emu/bus/nes/rcm.h
index f101a2710f8..fef415f1fe1 100644
--- a/src/emu/bus/nes/rcm.h
+++ b/src/emu/bus/nes/rcm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_RCM_H
 #define __NES_RCM_H
 
diff --git a/src/emu/bus/nes/rexsoft.c b/src/emu/bus/nes/rexsoft.c
index 690f56b6177..1d181189f4c 100644
--- a/src/emu/bus/nes/rexsoft.c
+++ b/src/emu/bus/nes/rexsoft.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/rexsoft.h b/src/emu/bus/nes/rexsoft.h
index 184da640347..780f9afdd01 100644
--- a/src/emu/bus/nes/rexsoft.h
+++ b/src/emu/bus/nes/rexsoft.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_REXSOFT_H
 #define __NES_REXSOFT_H
 
diff --git a/src/emu/bus/nes/sachen.c b/src/emu/bus/nes/sachen.c
index 6ce6e8a3804..182aff24d1d 100644
--- a/src/emu/bus/nes/sachen.c
+++ b/src/emu/bus/nes/sachen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/sachen.h b/src/emu/bus/nes/sachen.h
index 32baf7c6708..e8901d94612 100644
--- a/src/emu/bus/nes/sachen.h
+++ b/src/emu/bus/nes/sachen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_SACHEN_H
 #define __NES_SACHEN_H
 
diff --git a/src/emu/bus/nes/somari.c b/src/emu/bus/nes/somari.c
index 9ce78f74148..9e50fc3cde2 100644
--- a/src/emu/bus/nes/somari.c
+++ b/src/emu/bus/nes/somari.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/somari.h b/src/emu/bus/nes/somari.h
index bdf4f5f359d..861344f3875 100644
--- a/src/emu/bus/nes/somari.h
+++ b/src/emu/bus/nes/somari.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_SOMARI_H
 #define __NES_SOMARI_H
 
diff --git a/src/emu/bus/nes/sunsoft.c b/src/emu/bus/nes/sunsoft.c
index a927df2f3eb..79540a1831c 100644
--- a/src/emu/bus/nes/sunsoft.c
+++ b/src/emu/bus/nes/sunsoft.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/sunsoft.h b/src/emu/bus/nes/sunsoft.h
index 91f6a34bb26..57a59b94a9b 100644
--- a/src/emu/bus/nes/sunsoft.h
+++ b/src/emu/bus/nes/sunsoft.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_SUNSOFT_H
 #define __NES_SUNSOFT_H
 
diff --git a/src/emu/bus/nes/sunsoft_dcs.c b/src/emu/bus/nes/sunsoft_dcs.c
index 4deb83e3e9a..112b5f26188 100644
--- a/src/emu/bus/nes/sunsoft_dcs.c
+++ b/src/emu/bus/nes/sunsoft_dcs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/sunsoft_dcs.h b/src/emu/bus/nes/sunsoft_dcs.h
index 0203e316431..3a8cfbad7fc 100644
--- a/src/emu/bus/nes/sunsoft_dcs.h
+++ b/src/emu/bus/nes/sunsoft_dcs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_SUNSOFT_DCS_H
 #define __NES_SUNSOFT_DCS_H
 
diff --git a/src/emu/bus/nes/taito.c b/src/emu/bus/nes/taito.c
index bba7a526fb4..a8ceeb3f2df 100644
--- a/src/emu/bus/nes/taito.c
+++ b/src/emu/bus/nes/taito.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/taito.h b/src/emu/bus/nes/taito.h
index ad55199d5ad..ebd657149df 100644
--- a/src/emu/bus/nes/taito.h
+++ b/src/emu/bus/nes/taito.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_TAITO_H
 #define __NES_TAITO_H
 
diff --git a/src/emu/bus/nes/tengen.c b/src/emu/bus/nes/tengen.c
index 9efb798fc9c..da4b9e4c639 100644
--- a/src/emu/bus/nes/tengen.c
+++ b/src/emu/bus/nes/tengen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/tengen.h b/src/emu/bus/nes/tengen.h
index e7956adb161..ce2c1d11c16 100644
--- a/src/emu/bus/nes/tengen.h
+++ b/src/emu/bus/nes/tengen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_TENGEN_H
 #define __NES_TENGEN_H
 
diff --git a/src/emu/bus/nes/txc.c b/src/emu/bus/nes/txc.c
index bf2c983a486..e36c56337c4 100644
--- a/src/emu/bus/nes/txc.c
+++ b/src/emu/bus/nes/txc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/txc.h b/src/emu/bus/nes/txc.h
index 9b7e089cc36..212c9b49a18 100644
--- a/src/emu/bus/nes/txc.h
+++ b/src/emu/bus/nes/txc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_TXC_H
 #define __NES_TXC_H
 
diff --git a/src/emu/bus/nes/waixing.c b/src/emu/bus/nes/waixing.c
index 3a2793cf92b..38d85fa2efa 100644
--- a/src/emu/bus/nes/waixing.c
+++ b/src/emu/bus/nes/waixing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/nes/waixing.h b/src/emu/bus/nes/waixing.h
index e6633739463..070d9f9488c 100644
--- a/src/emu/bus/nes/waixing.h
+++ b/src/emu/bus/nes/waixing.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NES_WAIXING_H
 #define __NES_WAIXING_H
 
diff --git a/src/emu/bus/nes_ctrl/4score.c b/src/emu/bus/nes_ctrl/4score.c
index a631804f7a7..a9a398e3b29 100644
--- a/src/emu/bus/nes_ctrl/4score.c
+++ b/src/emu/bus/nes_ctrl/4score.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System Four Score Adapter
diff --git a/src/emu/bus/nes_ctrl/4score.h b/src/emu/bus/nes_ctrl/4score.h
index 9d1d4a348fa..83ab605b5fa 100644
--- a/src/emu/bus/nes_ctrl/4score.h
+++ b/src/emu/bus/nes_ctrl/4score.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System Four Score Adapter
diff --git a/src/emu/bus/nes_ctrl/arkpaddle.c b/src/emu/bus/nes_ctrl/arkpaddle.c
index 2ab6aef468b..992169d7a97 100644
--- a/src/emu/bus/nes_ctrl/arkpaddle.c
+++ b/src/emu/bus/nes_ctrl/arkpaddle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System -
diff --git a/src/emu/bus/nes_ctrl/arkpaddle.h b/src/emu/bus/nes_ctrl/arkpaddle.h
index 73f0ff864d0..4a5c90cd5bc 100644
--- a/src/emu/bus/nes_ctrl/arkpaddle.h
+++ b/src/emu/bus/nes_ctrl/arkpaddle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System -
diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/emu/bus/nes_ctrl/bcbattle.c
index aa75aeddd39..b85c618d0ef 100644
--- a/src/emu/bus/nes_ctrl/bcbattle.c
+++ b/src/emu/bus/nes_ctrl/bcbattle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer - Epoch Barcode Battler
diff --git a/src/emu/bus/nes_ctrl/bcbattle.h b/src/emu/bus/nes_ctrl/bcbattle.h
index f844b7ac28b..340f0c3aebb 100644
--- a/src/emu/bus/nes_ctrl/bcbattle.h
+++ b/src/emu/bus/nes_ctrl/bcbattle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer - Epoch Barcode Battler
diff --git a/src/emu/bus/nes_ctrl/ctrl.c b/src/emu/bus/nes_ctrl/ctrl.c
index ea41b6285bc..3649580fd13 100644
--- a/src/emu/bus/nes_ctrl/ctrl.c
+++ b/src/emu/bus/nes_ctrl/ctrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System controller ports
diff --git a/src/emu/bus/nes_ctrl/ctrl.h b/src/emu/bus/nes_ctrl/ctrl.h
index 79d981827de..b79c40ed215 100644
--- a/src/emu/bus/nes_ctrl/ctrl.h
+++ b/src/emu/bus/nes_ctrl/ctrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System controller port
diff --git a/src/emu/bus/nes_ctrl/fckeybrd.c b/src/emu/bus/nes_ctrl/fckeybrd.c
index 53f3584780c..9923ef60a94 100644
--- a/src/emu/bus/nes_ctrl/fckeybrd.c
+++ b/src/emu/bus/nes_ctrl/fckeybrd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Keyboard Component
diff --git a/src/emu/bus/nes_ctrl/fckeybrd.h b/src/emu/bus/nes_ctrl/fckeybrd.h
index df265370fff..6c5c0922c2c 100644
--- a/src/emu/bus/nes_ctrl/fckeybrd.h
+++ b/src/emu/bus/nes_ctrl/fckeybrd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Keyboard Component
diff --git a/src/emu/bus/nes_ctrl/ftrainer.c b/src/emu/bus/nes_ctrl/ftrainer.c
index b8a7a3a22c2..d950ac288fd 100644
--- a/src/emu/bus/nes_ctrl/ftrainer.c
+++ b/src/emu/bus/nes_ctrl/ftrainer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer - Bandai Family Trainer Mat
diff --git a/src/emu/bus/nes_ctrl/ftrainer.h b/src/emu/bus/nes_ctrl/ftrainer.h
index 52c3ae0529c..479b9ddbd7c 100644
--- a/src/emu/bus/nes_ctrl/ftrainer.h
+++ b/src/emu/bus/nes_ctrl/ftrainer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer - Bandai Family Trainer Mat
diff --git a/src/emu/bus/nes_ctrl/hori.c b/src/emu/bus/nes_ctrl/hori.c
index 720552c7799..f014faf4e1f 100644
--- a/src/emu/bus/nes_ctrl/hori.c
+++ b/src/emu/bus/nes_ctrl/hori.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Hori Twin (and 4P?) adapters
diff --git a/src/emu/bus/nes_ctrl/hori.h b/src/emu/bus/nes_ctrl/hori.h
index 3f9626221c9..b3531b61305 100644
--- a/src/emu/bus/nes_ctrl/hori.h
+++ b/src/emu/bus/nes_ctrl/hori.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Hori Twin (and 4P?) adapters
diff --git a/src/emu/bus/nes_ctrl/joypad.c b/src/emu/bus/nes_ctrl/joypad.c
index 9d1a853901b..8c83d104bb5 100644
--- a/src/emu/bus/nes_ctrl/joypad.c
+++ b/src/emu/bus/nes_ctrl/joypad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System Joypads
diff --git a/src/emu/bus/nes_ctrl/joypad.h b/src/emu/bus/nes_ctrl/joypad.h
index 27d5198ef58..a74b27ed65f 100644
--- a/src/emu/bus/nes_ctrl/joypad.h
+++ b/src/emu/bus/nes_ctrl/joypad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System Joypads
diff --git a/src/emu/bus/nes_ctrl/konamihs.c b/src/emu/bus/nes_ctrl/konamihs.c
index 19654b9bcd9..1e8a3ef5edd 100644
--- a/src/emu/bus/nes_ctrl/konamihs.c
+++ b/src/emu/bus/nes_ctrl/konamihs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Konami Hyper Shot Controllers
diff --git a/src/emu/bus/nes_ctrl/konamihs.h b/src/emu/bus/nes_ctrl/konamihs.h
index 71d6dd737cb..3543fcaa072 100644
--- a/src/emu/bus/nes_ctrl/konamihs.h
+++ b/src/emu/bus/nes_ctrl/konamihs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Konami Hyper Shot Controllers
diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/emu/bus/nes_ctrl/miracle.c
index 790a6be9dd4..c34ea9c1994 100644
--- a/src/emu/bus/nes_ctrl/miracle.c
+++ b/src/emu/bus/nes_ctrl/miracle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System - Miracle Piano Keyboard
diff --git a/src/emu/bus/nes_ctrl/miracle.h b/src/emu/bus/nes_ctrl/miracle.h
index 5763f0d6059..2ad03f45703 100644
--- a/src/emu/bus/nes_ctrl/miracle.h
+++ b/src/emu/bus/nes_ctrl/miracle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System - Miracle Piano Keyboard
diff --git a/src/emu/bus/nes_ctrl/mjpanel.c b/src/emu/bus/nes_ctrl/mjpanel.c
index 4e45ecbd7c7..609a8bac038 100644
--- a/src/emu/bus/nes_ctrl/mjpanel.c
+++ b/src/emu/bus/nes_ctrl/mjpanel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Mahjong Panel
diff --git a/src/emu/bus/nes_ctrl/mjpanel.h b/src/emu/bus/nes_ctrl/mjpanel.h
index 6df7680eb26..27ca61a710a 100644
--- a/src/emu/bus/nes_ctrl/mjpanel.h
+++ b/src/emu/bus/nes_ctrl/mjpanel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Mahjong Panel
diff --git a/src/emu/bus/nes_ctrl/pachinko.c b/src/emu/bus/nes_ctrl/pachinko.c
index 6790e636dd6..03b69e25636 100644
--- a/src/emu/bus/nes_ctrl/pachinko.c
+++ b/src/emu/bus/nes_ctrl/pachinko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Pachinko Controller
diff --git a/src/emu/bus/nes_ctrl/pachinko.h b/src/emu/bus/nes_ctrl/pachinko.h
index ab07e4fa961..3c227a245f4 100644
--- a/src/emu/bus/nes_ctrl/pachinko.h
+++ b/src/emu/bus/nes_ctrl/pachinko.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Pachinko Controller
diff --git a/src/emu/bus/nes_ctrl/partytap.c b/src/emu/bus/nes_ctrl/partytap.c
index 769d2f30d76..17f9662a82d 100644
--- a/src/emu/bus/nes_ctrl/partytap.c
+++ b/src/emu/bus/nes_ctrl/partytap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Yonezawa / PartyRoom 21 Party Tap Controller
diff --git a/src/emu/bus/nes_ctrl/partytap.h b/src/emu/bus/nes_ctrl/partytap.h
index 1b85832ea4d..334d4af49d2 100644
--- a/src/emu/bus/nes_ctrl/partytap.h
+++ b/src/emu/bus/nes_ctrl/partytap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Yonezawa / PartyRoom 21 Party Tap Controller
diff --git a/src/emu/bus/nes_ctrl/powerpad.c b/src/emu/bus/nes_ctrl/powerpad.c
index ab13a49b8bf..72789471b93 100644
--- a/src/emu/bus/nes_ctrl/powerpad.c
+++ b/src/emu/bus/nes_ctrl/powerpad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System - Bandai Power Pad
diff --git a/src/emu/bus/nes_ctrl/powerpad.h b/src/emu/bus/nes_ctrl/powerpad.h
index 0bf6d5fa53d..3302eb991a3 100644
--- a/src/emu/bus/nes_ctrl/powerpad.h
+++ b/src/emu/bus/nes_ctrl/powerpad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Entertainment System - Bandai Power Pad
diff --git a/src/emu/bus/nes_ctrl/suborkey.c b/src/emu/bus/nes_ctrl/suborkey.c
index 2449f6a5b12..4c1fde4c41c 100644
--- a/src/emu/bus/nes_ctrl/suborkey.c
+++ b/src/emu/bus/nes_ctrl/suborkey.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Subor Keyboard (used by some Famiclones)
diff --git a/src/emu/bus/nes_ctrl/suborkey.h b/src/emu/bus/nes_ctrl/suborkey.h
index c48c9715657..f38d505efaf 100644
--- a/src/emu/bus/nes_ctrl/suborkey.h
+++ b/src/emu/bus/nes_ctrl/suborkey.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer Subor Keyboard (used by some Famiclones)
diff --git a/src/emu/bus/nes_ctrl/zapper.c b/src/emu/bus/nes_ctrl/zapper.c
index b603025203b..1b677a1c596 100644
--- a/src/emu/bus/nes_ctrl/zapper.c
+++ b/src/emu/bus/nes_ctrl/zapper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System Zapper Lightgun
diff --git a/src/emu/bus/nes_ctrl/zapper.h b/src/emu/bus/nes_ctrl/zapper.h
index ed19fdfc265..1db42f4f961 100644
--- a/src/emu/bus/nes_ctrl/zapper.h
+++ b/src/emu/bus/nes_ctrl/zapper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Family Computer & Entertainment System Zapper Lightgun
diff --git a/src/emu/bus/nubus/nubus.c b/src/emu/bus/nubus/nubus.c
index e4c8a189af7..e6bae6c0f9b 100644
--- a/src/emu/bus/nubus/nubus.c
+++ b/src/emu/bus/nubus/nubus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nubus.c - NuBus bus and card emulation
diff --git a/src/emu/bus/nubus/nubus.h b/src/emu/bus/nubus/nubus.h
index e494df7ac0a..16aff3a18d1 100644
--- a/src/emu/bus/nubus/nubus.h
+++ b/src/emu/bus/nubus/nubus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nubus.h - NuBus bus and card emulation
diff --git a/src/emu/bus/nubus/nubus_48gc.c b/src/emu/bus/nubus/nubus_48gc.c
index 5e450d84003..6d03237f882 100644
--- a/src/emu/bus/nubus/nubus_48gc.c
+++ b/src/emu/bus/nubus/nubus_48gc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Apple 4*8 Graphics Card (model 630-0400) emulation
diff --git a/src/emu/bus/nubus/nubus_48gc.h b/src/emu/bus/nubus/nubus_48gc.h
index ad81b1b0fc1..14c29e87437 100644
--- a/src/emu/bus/nubus/nubus_48gc.h
+++ b/src/emu/bus/nubus/nubus_48gc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_48GC_H__
diff --git a/src/emu/bus/nubus/nubus_asntmc3b.c b/src/emu/bus/nubus/nubus_asntmc3b.c
index bedac21c16e..345c3550de2 100644
--- a/src/emu/bus/nubus/nubus_asntmc3b.c
+++ b/src/emu/bus/nubus/nubus_asntmc3b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Asante MC3NB NuBus Ethernet card (DP83902)
diff --git a/src/emu/bus/nubus/nubus_asntmc3b.h b/src/emu/bus/nubus/nubus_asntmc3b.h
index 645bde9e0de..fdd73808e64 100644
--- a/src/emu/bus/nubus/nubus_asntmc3b.h
+++ b/src/emu/bus/nubus/nubus_asntmc3b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_ASNTMC3B_H__
diff --git a/src/emu/bus/nubus/nubus_cb264.c b/src/emu/bus/nubus/nubus_cb264.c
index 9beb5085ea3..a9f388bae46 100644
--- a/src/emu/bus/nubus/nubus_cb264.c
+++ b/src/emu/bus/nubus/nubus_cb264.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   RasterOps ColorBoard 264 NuBus video card emulation
diff --git a/src/emu/bus/nubus/nubus_cb264.h b/src/emu/bus/nubus/nubus_cb264.h
index 8964b6a104f..f8c8ce9a60b 100644
--- a/src/emu/bus/nubus/nubus_cb264.h
+++ b/src/emu/bus/nubus/nubus_cb264.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_CB264_H__
diff --git a/src/emu/bus/nubus/nubus_image.c b/src/emu/bus/nubus/nubus_image.c
index 20a7051eaa6..475adc21f5b 100644
--- a/src/emu/bus/nubus/nubus_image.c
+++ b/src/emu/bus/nubus/nubus_image.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nubus_image.c - synthetic NuBus card to allow reading/writing "raw"
diff --git a/src/emu/bus/nubus/nubus_image.h b/src/emu/bus/nubus/nubus_image.h
index 9bd7c11c002..1bfc08e9663 100644
--- a/src/emu/bus/nubus/nubus_image.h
+++ b/src/emu/bus/nubus/nubus_image.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_IMAGE_H__
diff --git a/src/emu/bus/nubus/nubus_m2hires.c b/src/emu/bus/nubus/nubus_m2hires.c
index bb222c15483..f55ee931843 100644
--- a/src/emu/bus/nubus/nubus_m2hires.c
+++ b/src/emu/bus/nubus/nubus_m2hires.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Apple Hi-Resolution Video Card emulation
diff --git a/src/emu/bus/nubus/nubus_m2hires.h b/src/emu/bus/nubus/nubus_m2hires.h
index 1d910d4bdf8..6298c9805e7 100644
--- a/src/emu/bus/nubus/nubus_m2hires.h
+++ b/src/emu/bus/nubus/nubus_m2hires.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_M2HIRES_H__
diff --git a/src/emu/bus/nubus/nubus_m2video.c b/src/emu/bus/nubus/nubus_m2video.c
index 5719270df2d..f4a1f4e7ca3 100644
--- a/src/emu/bus/nubus/nubus_m2video.c
+++ b/src/emu/bus/nubus/nubus_m2video.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Apple Macintosh II Video Card (630-0153) emulation
diff --git a/src/emu/bus/nubus/nubus_m2video.h b/src/emu/bus/nubus/nubus_m2video.h
index 6e048898d0f..f02f02d12df 100644
--- a/src/emu/bus/nubus/nubus_m2video.h
+++ b/src/emu/bus/nubus/nubus_m2video.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_M2VIDEO_H__
diff --git a/src/emu/bus/nubus/nubus_radiustpd.c b/src/emu/bus/nubus/nubus_radiustpd.c
index 7710318b29e..35b34325209 100644
--- a/src/emu/bus/nubus/nubus_radiustpd.c
+++ b/src/emu/bus/nubus/nubus_radiustpd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Radius Two Page Display (1280x960?)
diff --git a/src/emu/bus/nubus/nubus_radiustpd.h b/src/emu/bus/nubus/nubus_radiustpd.h
index 259cfbebd03..08b67d9393e 100644
--- a/src/emu/bus/nubus/nubus_radiustpd.h
+++ b/src/emu/bus/nubus/nubus_radiustpd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_RADIUSTPD_H__
diff --git a/src/emu/bus/nubus/nubus_spec8.c b/src/emu/bus/nubus/nubus_spec8.c
index 4447417aefb..eecd4a0cbf8 100644
--- a/src/emu/bus/nubus/nubus_spec8.c
+++ b/src/emu/bus/nubus/nubus_spec8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   SuperMac Spectrum/8 Series III video card
diff --git a/src/emu/bus/nubus/nubus_spec8.h b/src/emu/bus/nubus/nubus_spec8.h
index de0628fc532..58ec3bc5701 100644
--- a/src/emu/bus/nubus/nubus_spec8.h
+++ b/src/emu/bus/nubus/nubus_spec8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_SPEC8S3_H__
diff --git a/src/emu/bus/nubus/nubus_specpdq.c b/src/emu/bus/nubus/nubus_specpdq.c
index 8a928177706..1a910a00438 100644
--- a/src/emu/bus/nubus/nubus_specpdq.c
+++ b/src/emu/bus/nubus/nubus_specpdq.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   SuperMac Spectrum PDQ video card
diff --git a/src/emu/bus/nubus/nubus_specpdq.h b/src/emu/bus/nubus/nubus_specpdq.h
index 287297d2b11..4fd6536d57a 100644
--- a/src/emu/bus/nubus/nubus_specpdq.h
+++ b/src/emu/bus/nubus/nubus_specpdq.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_SPECPDQ_H__
diff --git a/src/emu/bus/nubus/nubus_vikbw.c b/src/emu/bus/nubus/nubus_vikbw.c
index 5424335e36a..10b495b7bb5 100644
--- a/src/emu/bus/nubus/nubus_vikbw.c
+++ b/src/emu/bus/nubus/nubus_vikbw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Viking 1024x768 fixed-resolution monochrome board
diff --git a/src/emu/bus/nubus/nubus_vikbw.h b/src/emu/bus/nubus/nubus_vikbw.h
index 5e236cf7582..8d4afadd44e 100644
--- a/src/emu/bus/nubus/nubus_vikbw.h
+++ b/src/emu/bus/nubus/nubus_vikbw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_VIKBW_H__
diff --git a/src/emu/bus/nubus/nubus_wsportrait.c b/src/emu/bus/nubus/nubus_wsportrait.c
index 9d2a1be3e0c..d837ea47023 100644
--- a/src/emu/bus/nubus/nubus_wsportrait.c
+++ b/src/emu/bus/nubus/nubus_wsportrait.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Apple model 820-5037-C "Macintosh II Portrait Video Card"
diff --git a/src/emu/bus/nubus/nubus_wsportrait.h b/src/emu/bus/nubus/nubus_wsportrait.h
index 52cbbbf26eb..6ebc0f77b79 100644
--- a/src/emu/bus/nubus/nubus_wsportrait.h
+++ b/src/emu/bus/nubus/nubus_wsportrait.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_WSPORTRAIT_H__
diff --git a/src/emu/bus/nubus/pds30_30hr.c b/src/emu/bus/nubus/pds30_30hr.c
index 21c3a79bf16..249ea473f79 100644
--- a/src/emu/bus/nubus/pds30_30hr.c
+++ b/src/emu/bus/nubus/pds30_30hr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Micron/XCEED Technologies Color 30HR
diff --git a/src/emu/bus/nubus/pds30_30hr.h b/src/emu/bus/nubus/pds30_30hr.h
index 804877dd327..f51494c4176 100644
--- a/src/emu/bus/nubus/pds30_30hr.h
+++ b/src/emu/bus/nubus/pds30_30hr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_XCEED30HR_H__
diff --git a/src/emu/bus/nubus/pds30_cb264.c b/src/emu/bus/nubus/pds30_cb264.c
index 0f2655ed741..ce2f3dd7e3f 100644
--- a/src/emu/bus/nubus/pds30_cb264.c
+++ b/src/emu/bus/nubus/pds30_cb264.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   RasterOps ColorBoard 264/SE30 video card emulation
diff --git a/src/emu/bus/nubus/pds30_cb264.h b/src/emu/bus/nubus/pds30_cb264.h
index 26766072889..3c2637ac57d 100644
--- a/src/emu/bus/nubus/pds30_cb264.h
+++ b/src/emu/bus/nubus/pds30_cb264.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_CB264SE30_H__
diff --git a/src/emu/bus/nubus/pds30_mc30.c b/src/emu/bus/nubus/pds30_mc30.c
index 43b078ed588..b8185e37377 100644
--- a/src/emu/bus/nubus/pds30_mc30.c
+++ b/src/emu/bus/nubus/pds30_mc30.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Micron/XCEED Technologies MacroColor 30
diff --git a/src/emu/bus/nubus/pds30_mc30.h b/src/emu/bus/nubus/pds30_mc30.h
index 7882cff534d..19d1c233253 100644
--- a/src/emu/bus/nubus/pds30_mc30.h
+++ b/src/emu/bus/nubus/pds30_mc30.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_XCEEDMC30_H__
diff --git a/src/emu/bus/nubus/pds30_procolor816.c b/src/emu/bus/nubus/pds30_procolor816.c
index 7fca7b81bfa..499a9fd8cf7 100644
--- a/src/emu/bus/nubus/pds30_procolor816.c
+++ b/src/emu/bus/nubus/pds30_procolor816.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Lapis ProColor Server 8*16 video card
diff --git a/src/emu/bus/nubus/pds30_procolor816.h b/src/emu/bus/nubus/pds30_procolor816.h
index 41cd02d8717..660ff606ca6 100644
--- a/src/emu/bus/nubus/pds30_procolor816.h
+++ b/src/emu/bus/nubus/pds30_procolor816.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_PROCOLOR816_H__
diff --git a/src/emu/bus/nubus/pds30_sigmalview.c b/src/emu/bus/nubus/pds30_sigmalview.c
index 82824d18c2b..5e090cd702a 100644
--- a/src/emu/bus/nubus/pds30_sigmalview.c
+++ b/src/emu/bus/nubus/pds30_sigmalview.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sigma Designs L-View card
diff --git a/src/emu/bus/nubus/pds30_sigmalview.h b/src/emu/bus/nubus/pds30_sigmalview.h
index b72f7f46485..fd71f29e5f2 100644
--- a/src/emu/bus/nubus/pds30_sigmalview.h
+++ b/src/emu/bus/nubus/pds30_sigmalview.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NUBUS_LVIEW_H__
diff --git a/src/emu/bus/oricext/jasmin.c b/src/emu/bus/oricext/jasmin.c
index 3391cf1539f..a1903e5d5df 100644
--- a/src/emu/bus/oricext/jasmin.c
+++ b/src/emu/bus/oricext/jasmin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "jasmin.h"
 #include "formats/oric_dsk.h"
 
diff --git a/src/emu/bus/oricext/jasmin.h b/src/emu/bus/oricext/jasmin.h
index 4fe40da89fc..c5362a7f89c 100644
--- a/src/emu/bus/oricext/jasmin.h
+++ b/src/emu/bus/oricext/jasmin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __JASMIN_H__
 #define __JASMIN_H__
 
diff --git a/src/emu/bus/oricext/microdisc.c b/src/emu/bus/oricext/microdisc.c
index 740820b4ebd..8817f251e44 100644
--- a/src/emu/bus/oricext/microdisc.c
+++ b/src/emu/bus/oricext/microdisc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "microdisc.h"
 #include "formats/oric_dsk.h"
 
diff --git a/src/emu/bus/oricext/microdisc.h b/src/emu/bus/oricext/microdisc.h
index 3ea5e8f9545..42a23f3b78e 100644
--- a/src/emu/bus/oricext/microdisc.h
+++ b/src/emu/bus/oricext/microdisc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MICRODISC_H__
 #define __MICRODISC_H__
 
diff --git a/src/emu/bus/oricext/oricext.c b/src/emu/bus/oricext/oricext.c
index fa6471d59f2..8fa9305c93b 100644
--- a/src/emu/bus/oricext/oricext.c
+++ b/src/emu/bus/oricext/oricext.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "oricext.h"
 #include "jasmin.h"
 #include "microdisc.h"
diff --git a/src/emu/bus/oricext/oricext.h b/src/emu/bus/oricext/oricext.h
index 5308ca36da8..936701e4c47 100644
--- a/src/emu/bus/oricext/oricext.h
+++ b/src/emu/bus/oricext/oricext.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   oric.h - Oric 1/Atmos extension port
diff --git a/src/emu/bus/pc_joy/pc_joy.c b/src/emu/bus/pc_joy/pc_joy.c
index 665bd68d42b..1d2020499bd 100644
--- a/src/emu/bus/pc_joy/pc_joy.c
+++ b/src/emu/bus/pc_joy/pc_joy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
  *
  *      pc_joy.h
diff --git a/src/emu/bus/pc_joy/pc_joy.h b/src/emu/bus/pc_joy/pc_joy.h
index 8247bdfd87a..bcc86882ef6 100644
--- a/src/emu/bus/pc_joy/pc_joy.h
+++ b/src/emu/bus/pc_joy/pc_joy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
  *
  *      pc_joy.h
diff --git a/src/emu/bus/pc_joy/pc_joy_sw.c b/src/emu/bus/pc_joy/pc_joy_sw.c
index 06b9e792a07..5aad8836f0b 100644
--- a/src/emu/bus/pc_joy/pc_joy_sw.c
+++ b/src/emu/bus/pc_joy/pc_joy_sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //TODO: determine when to switch modes and add single bit mode
 
 #include "pc_joy_sw.h"
diff --git a/src/emu/bus/pc_joy/pc_joy_sw.h b/src/emu/bus/pc_joy/pc_joy_sw.h
index 654b10f63c6..558507e6ac5 100644
--- a/src/emu/bus/pc_joy/pc_joy_sw.h
+++ b/src/emu/bus/pc_joy/pc_joy_sw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PC_JOY_SW_H_
 #define PC_JOY_SW_H_
 
diff --git a/src/emu/bus/pc_kbd/ec1841.c b/src/emu/bus/pc_kbd/ec1841.c
index 261de0776d9..c839574e355 100644
--- a/src/emu/bus/pc_kbd/ec1841.c
+++ b/src/emu/bus/pc_kbd/ec1841.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EC-1841 92-key keyboard emulation
diff --git a/src/emu/bus/pc_kbd/ec1841.h b/src/emu/bus/pc_kbd/ec1841.h
index 6d635895d95..b39a399dc39 100644
--- a/src/emu/bus/pc_kbd/ec1841.h
+++ b/src/emu/bus/pc_kbd/ec1841.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     EC-1841 92-key keyboard emulation
diff --git a/src/emu/bus/pc_kbd/iskr1030.c b/src/emu/bus/pc_kbd/iskr1030.c
index ed3ce4005e8..0d885e59684 100644
--- a/src/emu/bus/pc_kbd/iskr1030.c
+++ b/src/emu/bus/pc_kbd/iskr1030.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Iskra-1030 and -1031 XX-key keyboard emulation
diff --git a/src/emu/bus/pc_kbd/iskr1030.h b/src/emu/bus/pc_kbd/iskr1030.h
index 1234f2143c1..e8fb57df933 100644
--- a/src/emu/bus/pc_kbd/iskr1030.h
+++ b/src/emu/bus/pc_kbd/iskr1030.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Iskra-1030 XX-key keyboard emulation
diff --git a/src/emu/bus/pc_kbd/keyboards.c b/src/emu/bus/pc_kbd/keyboards.c
index ab7ed1ff5a0..5c537e39d36 100644
--- a/src/emu/bus/pc_kbd/keyboards.c
+++ b/src/emu/bus/pc_kbd/keyboards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "keyboards.h"
diff --git a/src/emu/bus/pc_kbd/keyboards.h b/src/emu/bus/pc_kbd/keyboards.h
index 5b8dff781ce..335133b8b6f 100644
--- a/src/emu/bus/pc_kbd/keyboards.h
+++ b/src/emu/bus/pc_kbd/keyboards.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     PC Keyboards
diff --git a/src/emu/bus/pc_kbd/keytro.c b/src/emu/bus/pc_kbd/keytro.c
index e0826a20ec2..3903be3c93c 100644
--- a/src/emu/bus/pc_kbd/keytro.c
+++ b/src/emu/bus/pc_kbd/keytro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 TODO:
diff --git a/src/emu/bus/pc_kbd/keytro.h b/src/emu/bus/pc_kbd/keytro.h
index 825ca1cf174..e8880bf4a4b 100644
--- a/src/emu/bus/pc_kbd/keytro.h
+++ b/src/emu/bus/pc_kbd/keytro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Keytronic Keyboard
diff --git a/src/emu/bus/pc_kbd/msnat.c b/src/emu/bus/pc_kbd/msnat.c
index 8024a11dc94..a014686768d 100644
--- a/src/emu/bus/pc_kbd/msnat.c
+++ b/src/emu/bus/pc_kbd/msnat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microsoft Natural Keybaord emulation
diff --git a/src/emu/bus/pc_kbd/msnat.h b/src/emu/bus/pc_kbd/msnat.h
index 0af8aa986eb..dab1bfafbda 100644
--- a/src/emu/bus/pc_kbd/msnat.h
+++ b/src/emu/bus/pc_kbd/msnat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microsoft Natural Keyboard
diff --git a/src/emu/bus/pc_kbd/pc83.c b/src/emu/bus/pc_kbd/pc83.c
index e1cd414af74..ef979eef530 100644
--- a/src/emu/bus/pc_kbd/pc83.c
+++ b/src/emu/bus/pc_kbd/pc83.c
@@ -4,9 +4,6 @@
 
     IBM 5150 83-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "pc83.h"
diff --git a/src/emu/bus/pc_kbd/pc83.h b/src/emu/bus/pc_kbd/pc83.h
index 3b26e9ac316..5ee259253ff 100644
--- a/src/emu/bus/pc_kbd/pc83.h
+++ b/src/emu/bus/pc_kbd/pc83.h
@@ -4,9 +4,6 @@
 
     IBM 5150 83-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pc_kbd/pc_kbdc.c b/src/emu/bus/pc_kbd/pc_kbdc.c
index 856e1a34761..8de226729d9 100644
--- a/src/emu/bus/pc_kbd/pc_kbdc.c
+++ b/src/emu/bus/pc_kbd/pc_kbdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   PC Keyboard connector interface
diff --git a/src/emu/bus/pc_kbd/pc_kbdc.h b/src/emu/bus/pc_kbd/pc_kbdc.h
index 679870c5b93..10702349ffc 100644
--- a/src/emu/bus/pc_kbd/pc_kbdc.h
+++ b/src/emu/bus/pc_kbd/pc_kbdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   PC Keyboard connector interface
diff --git a/src/emu/bus/pc_kbd/pcat84.c b/src/emu/bus/pc_kbd/pcat84.c
index 3d2de063d1d..471333e9d18 100644
--- a/src/emu/bus/pc_kbd/pcat84.c
+++ b/src/emu/bus/pc_kbd/pcat84.c
@@ -4,9 +4,6 @@
 
     IBM Model F PC/AT 84-key / 3270PC 122-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/pc_kbd/pcat84.h b/src/emu/bus/pc_kbd/pcat84.h
index c43c1c202f1..06f58c84738 100644
--- a/src/emu/bus/pc_kbd/pcat84.h
+++ b/src/emu/bus/pc_kbd/pcat84.h
@@ -4,9 +4,6 @@
 
     IBM Model F PC/AT 84-key / 3270PC 122-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pc_kbd/pcxt83.c b/src/emu/bus/pc_kbd/pcxt83.c
index 504e7c118ad..dfbc5616b73 100644
--- a/src/emu/bus/pc_kbd/pcxt83.c
+++ b/src/emu/bus/pc_kbd/pcxt83.c
@@ -4,9 +4,6 @@
 
     IBM Model F PC/XT 83-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/bus/pc_kbd/pcxt83.h b/src/emu/bus/pc_kbd/pcxt83.h
index ff632c885f8..cec03f8bc92 100644
--- a/src/emu/bus/pc_kbd/pcxt83.h
+++ b/src/emu/bus/pc_kbd/pcxt83.h
@@ -4,9 +4,6 @@
 
     IBM Model F PC/XT 83-key keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pce/pce_rom.c b/src/emu/bus/pce/pce_rom.c
index f210ad6a225..a81b99ba972 100644
--- a/src/emu/bus/pce/pce_rom.c
+++ b/src/emu/bus/pce/pce_rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/pce/pce_rom.h b/src/emu/bus/pce/pce_rom.h
index 1588757b96f..adbd8afda23 100644
--- a/src/emu/bus/pce/pce_rom.h
+++ b/src/emu/bus/pce/pce_rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PCE_ROM_H
 #define __PCE_ROM_H
 
diff --git a/src/emu/bus/pce/pce_slot.c b/src/emu/bus/pce/pce_slot.c
index f9d438c04ef..29bdda9e2a8 100644
--- a/src/emu/bus/pce/pce_slot.c
+++ b/src/emu/bus/pce/pce_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/pce/pce_slot.h b/src/emu/bus/pce/pce_slot.h
index eb7d7b9e95c..4681fd5315e 100644
--- a/src/emu/bus/pce/pce_slot.h
+++ b/src/emu/bus/pce/pce_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PCE_SLOT_H
 #define __PCE_SLOT_H
 
diff --git a/src/emu/bus/pet/64k.c b/src/emu/bus/pet/64k.c
index f0057cf6b36..4bc9c01d596 100644
--- a/src/emu/bus/pet/64k.c
+++ b/src/emu/bus/pet/64k.c
@@ -4,9 +4,6 @@
 
     Commodore PET 64KB RAM Expansion emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "64k.h"
diff --git a/src/emu/bus/pet/64k.h b/src/emu/bus/pet/64k.h
index 96971fd83ba..6a7511357ad 100644
--- a/src/emu/bus/pet/64k.h
+++ b/src/emu/bus/pet/64k.h
@@ -4,9 +4,6 @@
 
     Commodore PET 64KB RAM Expansion emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/c2n.c b/src/emu/bus/pet/c2n.c
index b2061c47b91..aab392e9ffb 100644
--- a/src/emu/bus/pet/c2n.c
+++ b/src/emu/bus/pet/c2n.c
@@ -4,9 +4,6 @@
 
     Commodore C2N/1530/1531 Datassette emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c2n.h"
diff --git a/src/emu/bus/pet/c2n.h b/src/emu/bus/pet/c2n.h
index 5d2edc746c9..a8e09d57c00 100644
--- a/src/emu/bus/pet/c2n.h
+++ b/src/emu/bus/pet/c2n.h
@@ -4,9 +4,6 @@
 
     Commodore C2N/1530/1531 Datassette emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/cass.c b/src/emu/bus/pet/cass.c
index 8ceb01d7c54..f425478e5a2 100644
--- a/src/emu/bus/pet/cass.c
+++ b/src/emu/bus/pet/cass.c
@@ -4,9 +4,6 @@
 
     Commodore PET/VIC-20/C64/Plus-4 Datassette Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cass.h"
diff --git a/src/emu/bus/pet/cass.h b/src/emu/bus/pet/cass.h
index 584c3834e5f..b4c2da0738b 100644
--- a/src/emu/bus/pet/cass.h
+++ b/src/emu/bus/pet/cass.h
@@ -4,9 +4,6 @@
 
     Commodore PET/VIC-20/C64/Plus-4 Datassette Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/pet/cb2snd.c b/src/emu/bus/pet/cb2snd.c
index 0ff4659a24c..d89ef26268c 100644
--- a/src/emu/bus/pet/cb2snd.c
+++ b/src/emu/bus/pet/cb2snd.c
@@ -6,9 +6,6 @@
 
     http://zimmers.net/cbmpics/cbm/PETx/petfaq.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cb2snd.h"
diff --git a/src/emu/bus/pet/cb2snd.h b/src/emu/bus/pet/cb2snd.h
index 23c8a2c0f53..77d5f93979a 100644
--- a/src/emu/bus/pet/cb2snd.h
+++ b/src/emu/bus/pet/cb2snd.h
@@ -4,9 +4,6 @@
 
     Commodore PET userport "CB2 sound" audio device emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/diag.c b/src/emu/bus/pet/diag.c
index 653b2c2af3f..7cd73c6fff0 100644
--- a/src/emu/bus/pet/diag.c
+++ b/src/emu/bus/pet/diag.c
@@ -4,9 +4,6 @@
 
     Commodore PET User Port Diagnostic Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "diag.h"
diff --git a/src/emu/bus/pet/diag.h b/src/emu/bus/pet/diag.h
index fec6dcae5a8..2f8d094ef01 100644
--- a/src/emu/bus/pet/diag.h
+++ b/src/emu/bus/pet/diag.h
@@ -4,9 +4,6 @@
 
     Commodore PET User Port Diagnostic Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/diag264_lb_tape.c b/src/emu/bus/pet/diag264_lb_tape.c
index 110fc937a70..0c3bfb87d74 100644
--- a/src/emu/bus/pet/diag264_lb_tape.c
+++ b/src/emu/bus/pet/diag264_lb_tape.c
@@ -4,9 +4,6 @@
 
     Diag264 Cassette Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "diag264_lb_tape.h"
diff --git a/src/emu/bus/pet/diag264_lb_tape.h b/src/emu/bus/pet/diag264_lb_tape.h
index 8fc749e66fc..4d37e32ec94 100644
--- a/src/emu/bus/pet/diag264_lb_tape.h
+++ b/src/emu/bus/pet/diag264_lb_tape.h
@@ -4,9 +4,6 @@
 
     Diag264 Cassette Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/exp.c b/src/emu/bus/pet/exp.c
index f94f4640364..e550c2cf80f 100644
--- a/src/emu/bus/pet/exp.c
+++ b/src/emu/bus/pet/exp.c
@@ -4,9 +4,6 @@
 
     Commodore PET Memory Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/pet/exp.h b/src/emu/bus/pet/exp.h
index daf579a315b..ed583333c60 100644
--- a/src/emu/bus/pet/exp.h
+++ b/src/emu/bus/pet/exp.h
@@ -4,9 +4,6 @@
 
     Commodore PET Memory Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
 **********************************************************************/
diff --git a/src/emu/bus/pet/hsg.c b/src/emu/bus/pet/hsg.c
index 6cbb28860cd..5f2d7d1df9d 100644
--- a/src/emu/bus/pet/hsg.c
+++ b/src/emu/bus/pet/hsg.c
@@ -4,9 +4,6 @@
 
     CBM 8000 High Speed Graphics (324402-01) card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/pet/hsg.h b/src/emu/bus/pet/hsg.h
index c99e360e739..40345894063 100644
--- a/src/emu/bus/pet/hsg.h
+++ b/src/emu/bus/pet/hsg.h
@@ -4,9 +4,6 @@
 
     CBM 8000 High Speed Graphics (324402-01) card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/petuja.c b/src/emu/bus/pet/petuja.c
index 6d0376aa549..4bc335e7dab 100644
--- a/src/emu/bus/pet/petuja.c
+++ b/src/emu/bus/pet/petuja.c
@@ -6,9 +6,6 @@
 
     http://zimmers.net/cbmpics/cbm/PETx/petfaq.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "petuja.h"
diff --git a/src/emu/bus/pet/petuja.h b/src/emu/bus/pet/petuja.h
index de93d1fb370..f923b3dccda 100644
--- a/src/emu/bus/pet/petuja.h
+++ b/src/emu/bus/pet/petuja.h
@@ -4,9 +4,6 @@
 
     Commodore PET userport joystick adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/superpet.c b/src/emu/bus/pet/superpet.c
index 30c3d3d70c8..35a80c2e298 100644
--- a/src/emu/bus/pet/superpet.c
+++ b/src/emu/bus/pet/superpet.c
@@ -4,9 +4,6 @@
 
     Commodore SuperPET emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "superpet.h"
diff --git a/src/emu/bus/pet/superpet.h b/src/emu/bus/pet/superpet.h
index de7d6ee9f75..2cf1c011c6e 100644
--- a/src/emu/bus/pet/superpet.h
+++ b/src/emu/bus/pet/superpet.h
@@ -4,9 +4,6 @@
 
     Commodore SuperPET emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/pet/user.c b/src/emu/bus/pet/user.c
index b4e93ec8463..b543777df63 100644
--- a/src/emu/bus/pet/user.c
+++ b/src/emu/bus/pet/user.c
@@ -4,9 +4,6 @@
 
     Commodore PET User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "user.h"
diff --git a/src/emu/bus/pet/user.h b/src/emu/bus/pet/user.h
index c8647543759..9c6e6d8bd3e 100644
--- a/src/emu/bus/pet/user.h
+++ b/src/emu/bus/pet/user.h
@@ -4,9 +4,6 @@
 
     Commodore PET User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/plus4/c1551.c b/src/emu/bus/plus4/c1551.c
index 5f3edbff910..b50678ca594 100644
--- a/src/emu/bus/plus4/c1551.c
+++ b/src/emu/bus/plus4/c1551.c
@@ -4,9 +4,6 @@
 
     Commodore 1551 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "c1551.h"
diff --git a/src/emu/bus/plus4/c1551.h b/src/emu/bus/plus4/c1551.h
index 1c3a0639b0a..89c385f94d8 100644
--- a/src/emu/bus/plus4/c1551.h
+++ b/src/emu/bus/plus4/c1551.h
@@ -4,9 +4,6 @@
 
     Commodore 1551 Single Disk Drive emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/plus4/diag264_lb_user.c b/src/emu/bus/plus4/diag264_lb_user.c
index 37c3f4ba5d9..10d93e462e6 100644
--- a/src/emu/bus/plus4/diag264_lb_user.c
+++ b/src/emu/bus/plus4/diag264_lb_user.c
@@ -4,9 +4,6 @@
 
     Diag264 User Port Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "diag264_lb_user.h"
diff --git a/src/emu/bus/plus4/diag264_lb_user.h b/src/emu/bus/plus4/diag264_lb_user.h
index 9da2b7eb269..25e0766d064 100644
--- a/src/emu/bus/plus4/diag264_lb_user.h
+++ b/src/emu/bus/plus4/diag264_lb_user.h
@@ -4,9 +4,6 @@
 
     Diag264 User Port Loop Back Connector emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/plus4/exp.c b/src/emu/bus/plus4/exp.c
index efdff1a1a70..801470cbf30 100644
--- a/src/emu/bus/plus4/exp.c
+++ b/src/emu/bus/plus4/exp.c
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/plus4/exp.h b/src/emu/bus/plus4/exp.h
index 2cbcf1a0a1a..0bd8e963cc6 100644
--- a/src/emu/bus/plus4/exp.h
+++ b/src/emu/bus/plus4/exp.h
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/plus4/sid.c b/src/emu/bus/plus4/sid.c
index a5e0a7a6ac9..57515474824 100644
--- a/src/emu/bus/plus4/sid.c
+++ b/src/emu/bus/plus4/sid.c
@@ -6,9 +6,6 @@
 
     http://solder.dyndns.info/cgi-bin/showdir.pl?dir=files/commodore/plus4/hardware/SID-Card
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/plus4/sid.h b/src/emu/bus/plus4/sid.h
index 5a4f327ec99..63a7040416f 100644
--- a/src/emu/bus/plus4/sid.h
+++ b/src/emu/bus/plus4/sid.h
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 SID cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/plus4/std.c b/src/emu/bus/plus4/std.c
index 943c874ac81..8627f99cc30 100644
--- a/src/emu/bus/plus4/std.c
+++ b/src/emu/bus/plus4/std.c
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/plus4/std.h b/src/emu/bus/plus4/std.h
index 1bb7d440bb3..3949240b037 100644
--- a/src/emu/bus/plus4/std.h
+++ b/src/emu/bus/plus4/std.h
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 standard cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/plus4/user.c b/src/emu/bus/plus4/user.c
index b0e92fb9f64..7c9c6ed24b5 100644
--- a/src/emu/bus/plus4/user.c
+++ b/src/emu/bus/plus4/user.c
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "user.h"
diff --git a/src/emu/bus/plus4/user.h b/src/emu/bus/plus4/user.h
index 913cb811d41..abf4a909ccb 100644
--- a/src/emu/bus/plus4/user.h
+++ b/src/emu/bus/plus4/user.h
@@ -4,9 +4,6 @@
 
     Commodore Plus/4 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/psx/analogue.c b/src/emu/bus/psx/analogue.c
index e050d7643f0..9cb1944429a 100644
--- a/src/emu/bus/psx/analogue.c
+++ b/src/emu/bus/psx/analogue.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "analogue.h"
 
 const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>;
diff --git a/src/emu/bus/psx/analogue.h b/src/emu/bus/psx/analogue.h
index 4b73d7cffc5..790ef423688 100644
--- a/src/emu/bus/psx/analogue.h
+++ b/src/emu/bus/psx/analogue.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PSXANALOG_H_
 #define PSXANALOG_H_
 
diff --git a/src/emu/bus/psx/ctlrport.c b/src/emu/bus/psx/ctlrport.c
index 46b2ab51de1..7b38b7ad9e0 100644
--- a/src/emu/bus/psx/ctlrport.c
+++ b/src/emu/bus/psx/ctlrport.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* PAD emulation */
 
 #include "ctlrport.h"
diff --git a/src/emu/bus/psx/ctlrport.h b/src/emu/bus/psx/ctlrport.h
index 2e73bcc52ac..4a74c6766d6 100644
--- a/src/emu/bus/psx/ctlrport.h
+++ b/src/emu/bus/psx/ctlrport.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __PSXCPORT_H__
diff --git a/src/emu/bus/psx/memcard.c b/src/emu/bus/psx/memcard.c
index 6db61c85740..a0784dfe9cf 100644
--- a/src/emu/bus/psx/memcard.c
+++ b/src/emu/bus/psx/memcard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     psxcard.c - Sony PlayStation memory card device
 
diff --git a/src/emu/bus/psx/memcard.h b/src/emu/bus/psx/memcard.h
index 49e8236fbc7..a14b8b725ca 100644
--- a/src/emu/bus/psx/memcard.h
+++ b/src/emu/bus/psx/memcard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef _PSXCARD_
diff --git a/src/emu/bus/psx/multitap.c b/src/emu/bus/psx/multitap.c
index 01028aea727..5f03a0f754a 100644
--- a/src/emu/bus/psx/multitap.c
+++ b/src/emu/bus/psx/multitap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // psx multitap emulation
 
 #include "multitap.h"
diff --git a/src/emu/bus/psx/multitap.h b/src/emu/bus/psx/multitap.h
index bfbcac17a04..ed36f45cbfa 100644
--- a/src/emu/bus/psx/multitap.h
+++ b/src/emu/bus/psx/multitap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PSXMULTITAP_H_
 #define PSXMULTITAP_H_
 
diff --git a/src/emu/bus/ql/cst_q_plus4.c b/src/emu/bus/ql/cst_q_plus4.c
index 7b98a3319b3..76f5a046566 100644
--- a/src/emu/bus/ql/cst_q_plus4.c
+++ b/src/emu/bus/ql/cst_q_plus4.c
@@ -4,9 +4,6 @@
 
     CST Q+4 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cst_q_plus4.h"
diff --git a/src/emu/bus/ql/cst_q_plus4.h b/src/emu/bus/ql/cst_q_plus4.h
index 6dc315ccaa9..3fa37a71bcc 100644
--- a/src/emu/bus/ql/cst_q_plus4.h
+++ b/src/emu/bus/ql/cst_q_plus4.h
@@ -4,9 +4,6 @@
 
     CST Q+4 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/cst_qdisc.c b/src/emu/bus/ql/cst_qdisc.c
index 29e6e960604..f9fdcf26e04 100644
--- a/src/emu/bus/ql/cst_qdisc.c
+++ b/src/emu/bus/ql/cst_qdisc.c
@@ -4,9 +4,6 @@
 
     CST QL Disc Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cst_qdisc.h"
diff --git a/src/emu/bus/ql/cst_qdisc.h b/src/emu/bus/ql/cst_qdisc.h
index 545b825744c..a4f50cb7ccb 100644
--- a/src/emu/bus/ql/cst_qdisc.h
+++ b/src/emu/bus/ql/cst_qdisc.h
@@ -4,9 +4,6 @@
 
     CST QL Disc Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/cumana_fdi.c b/src/emu/bus/ql/cumana_fdi.c
index bc8a12c7d47..91259f0db43 100644
--- a/src/emu/bus/ql/cumana_fdi.c
+++ b/src/emu/bus/ql/cumana_fdi.c
@@ -4,9 +4,6 @@
 
     Cumana Floppy Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cumana_fdi.h"
diff --git a/src/emu/bus/ql/cumana_fdi.h b/src/emu/bus/ql/cumana_fdi.h
index 4be8652ca2b..b3249e76cdf 100644
--- a/src/emu/bus/ql/cumana_fdi.h
+++ b/src/emu/bus/ql/cumana_fdi.h
@@ -4,9 +4,6 @@
 
     Cumana Floppy Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/exp.c b/src/emu/bus/ql/exp.c
index 427b94c6e9c..4276f941811 100644
--- a/src/emu/bus/ql/exp.c
+++ b/src/emu/bus/ql/exp.c
@@ -4,9 +4,6 @@
 
     Sinclair QL expansion port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/ql/exp.h b/src/emu/bus/ql/exp.h
index 045812c2a32..c9f84c793e9 100644
--- a/src/emu/bus/ql/exp.h
+++ b/src/emu/bus/ql/exp.h
@@ -4,9 +4,6 @@
 
     Sinclair QL expansion port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                               A     B
diff --git a/src/emu/bus/ql/kempston_di.c b/src/emu/bus/ql/kempston_di.c
index 5fd32282f87..c69c129e2e9 100644
--- a/src/emu/bus/ql/kempston_di.c
+++ b/src/emu/bus/ql/kempston_di.c
@@ -4,9 +4,6 @@
 
     Kempston Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "kempston_di.h"
diff --git a/src/emu/bus/ql/kempston_di.h b/src/emu/bus/ql/kempston_di.h
index 1ca3a14e1f2..0920fe2430d 100644
--- a/src/emu/bus/ql/kempston_di.h
+++ b/src/emu/bus/ql/kempston_di.h
@@ -4,9 +4,6 @@
 
     Kempston Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/miracle_gold_card.c b/src/emu/bus/ql/miracle_gold_card.c
index d18e764d55b..3e25f43e0a6 100644
--- a/src/emu/bus/ql/miracle_gold_card.c
+++ b/src/emu/bus/ql/miracle_gold_card.c
@@ -4,9 +4,6 @@
 
     Miracle Systems Gold Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "miracle_gold_card.h"
diff --git a/src/emu/bus/ql/miracle_gold_card.h b/src/emu/bus/ql/miracle_gold_card.h
index 721ae564e46..36c358984a3 100644
--- a/src/emu/bus/ql/miracle_gold_card.h
+++ b/src/emu/bus/ql/miracle_gold_card.h
@@ -4,9 +4,6 @@
 
     Miracle Systems Gold Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/miracle_hd.c b/src/emu/bus/ql/miracle_hd.c
index 604938e5923..b181fc48918 100644
--- a/src/emu/bus/ql/miracle_hd.c
+++ b/src/emu/bus/ql/miracle_hd.c
@@ -4,9 +4,6 @@
 
     Miracle Hard Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "miracle_hd.h"
diff --git a/src/emu/bus/ql/miracle_hd.h b/src/emu/bus/ql/miracle_hd.h
index 7df72866a8f..43ef817475a 100644
--- a/src/emu/bus/ql/miracle_hd.h
+++ b/src/emu/bus/ql/miracle_hd.h
@@ -4,9 +4,6 @@
 
     Miracle Hard Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/mp_fdi.c b/src/emu/bus/ql/mp_fdi.c
index 0bd50408076..d23542ab8f4 100644
--- a/src/emu/bus/ql/mp_fdi.c
+++ b/src/emu/bus/ql/mp_fdi.c
@@ -4,9 +4,6 @@
 
     Micro Peripherals Floppy Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mp_fdi.h"
diff --git a/src/emu/bus/ql/mp_fdi.h b/src/emu/bus/ql/mp_fdi.h
index 7934cf0731a..5f0d3e9fd0f 100644
--- a/src/emu/bus/ql/mp_fdi.h
+++ b/src/emu/bus/ql/mp_fdi.h
@@ -4,9 +4,6 @@
 
     Micro Peripherals Floppy Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/opd_basic_master.c b/src/emu/bus/ql/opd_basic_master.c
index 21955a61ba8..fa20bf4f5eb 100644
--- a/src/emu/bus/ql/opd_basic_master.c
+++ b/src/emu/bus/ql/opd_basic_master.c
@@ -4,9 +4,6 @@
 
     OPD Basic Master emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "opd_basic_master.h"
diff --git a/src/emu/bus/ql/opd_basic_master.h b/src/emu/bus/ql/opd_basic_master.h
index 261ce258980..4a9b2b7e043 100644
--- a/src/emu/bus/ql/opd_basic_master.h
+++ b/src/emu/bus/ql/opd_basic_master.h
@@ -4,9 +4,6 @@
 
     OPD Basic Master emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/pcml_qdisk.c b/src/emu/bus/ql/pcml_qdisk.c
index 9a9298adc5f..b5d534f68d7 100644
--- a/src/emu/bus/ql/pcml_qdisk.c
+++ b/src/emu/bus/ql/pcml_qdisk.c
@@ -4,9 +4,6 @@
 
     PCML Q+ Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "pcml_qdisk.h"
diff --git a/src/emu/bus/ql/pcml_qdisk.h b/src/emu/bus/ql/pcml_qdisk.h
index 1c6f33df282..e59d101d9c4 100644
--- a/src/emu/bus/ql/pcml_qdisk.h
+++ b/src/emu/bus/ql/pcml_qdisk.h
@@ -4,9 +4,6 @@
 
     PCML Q+ Disk Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/qubide.c b/src/emu/bus/ql/qubide.c
index 0437d7bfa07..7af6c6d6694 100644
--- a/src/emu/bus/ql/qubide.c
+++ b/src/emu/bus/ql/qubide.c
@@ -4,9 +4,6 @@
 
     Qubbesoft QubIDE emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/ql/qubide.h b/src/emu/bus/ql/qubide.h
index 6b5ef287c5f..8c93c68cae6 100644
--- a/src/emu/bus/ql/qubide.h
+++ b/src/emu/bus/ql/qubide.h
@@ -4,9 +4,6 @@
 
     Qubbesoft QubIDE emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/rom.c b/src/emu/bus/ql/rom.c
index 6d336f61dbc..13d72619e8b 100644
--- a/src/emu/bus/ql/rom.c
+++ b/src/emu/bus/ql/rom.c
@@ -4,9 +4,6 @@
 
     Sinclair QL ROM cartridge port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "rom.h"
diff --git a/src/emu/bus/ql/rom.h b/src/emu/bus/ql/rom.h
index 97311d82ebd..a8b82d0dc57 100644
--- a/src/emu/bus/ql/rom.h
+++ b/src/emu/bus/ql/rom.h
@@ -4,9 +4,6 @@
 
     Sinclair QL ROM cartridge port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                               A     B
diff --git a/src/emu/bus/ql/sandy_superdisk.c b/src/emu/bus/ql/sandy_superdisk.c
index 3ee38632534..548268edfef 100644
--- a/src/emu/bus/ql/sandy_superdisk.c
+++ b/src/emu/bus/ql/sandy_superdisk.c
@@ -4,9 +4,6 @@
 
     Sandy Super Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "sandy_superdisk.h"
diff --git a/src/emu/bus/ql/sandy_superdisk.h b/src/emu/bus/ql/sandy_superdisk.h
index 0ab375aea7f..350ba709c72 100644
--- a/src/emu/bus/ql/sandy_superdisk.h
+++ b/src/emu/bus/ql/sandy_superdisk.h
@@ -4,9 +4,6 @@
 
     Sandy Super Disk emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/sandy_superqboard.c b/src/emu/bus/ql/sandy_superqboard.c
index 16459fe2822..51e338ea76c 100644
--- a/src/emu/bus/ql/sandy_superqboard.c
+++ b/src/emu/bus/ql/sandy_superqboard.c
@@ -4,9 +4,6 @@
 
     Sandy SuperQBoard/SuperQMouse (with HD upgrade) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "sandy_superqboard.h"
diff --git a/src/emu/bus/ql/sandy_superqboard.h b/src/emu/bus/ql/sandy_superqboard.h
index 535f9b0dd26..07bcd60a137 100644
--- a/src/emu/bus/ql/sandy_superqboard.h
+++ b/src/emu/bus/ql/sandy_superqboard.h
@@ -4,9 +4,6 @@
 
     Sandy SuperQBoard/SuperQMouse (with HD upgrade) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/std.c b/src/emu/bus/ql/std.c
index 0927cb221b1..11132954104 100644
--- a/src/emu/bus/ql/std.c
+++ b/src/emu/bus/ql/std.c
@@ -4,9 +4,6 @@
 
     Sinclair QL standard ROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/ql/std.h b/src/emu/bus/ql/std.h
index 35014c4d812..70b1328d79c 100644
--- a/src/emu/bus/ql/std.h
+++ b/src/emu/bus/ql/std.h
@@ -4,9 +4,6 @@
 
     Sinclair QL standard ROM cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/ql/trumpcard.c b/src/emu/bus/ql/trumpcard.c
index d31597d7710..08217f04950 100644
--- a/src/emu/bus/ql/trumpcard.c
+++ b/src/emu/bus/ql/trumpcard.c
@@ -4,9 +4,6 @@
 
     Miracle Systems QL Trump Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "trumpcard.h"
diff --git a/src/emu/bus/ql/trumpcard.h b/src/emu/bus/ql/trumpcard.h
index ecae4d0e88c..4c303aafd3e 100644
--- a/src/emu/bus/ql/trumpcard.h
+++ b/src/emu/bus/ql/trumpcard.h
@@ -4,9 +4,6 @@
 
     Miracle Systems QL Trump Card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/rs232/keyboard.c b/src/emu/bus/rs232/keyboard.c
index 6ed39962b5b..cfb053f7258 100644
--- a/src/emu/bus/rs232/keyboard.c
+++ b/src/emu/bus/rs232/keyboard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "keyboard.h"
 
 serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/rs232/keyboard.h b/src/emu/bus/rs232/keyboard.h
index 9923d04d160..f2258d6da3d 100644
--- a/src/emu/bus/rs232/keyboard.h
+++ b/src/emu/bus/rs232/keyboard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __RS232_KEYBOARD_H__
 #define __RS232_KEYBOARD_H__
 
diff --git a/src/emu/bus/rs232/null_modem.c b/src/emu/bus/rs232/null_modem.c
index ea8dfb1c79f..df39ba86843 100644
--- a/src/emu/bus/rs232/null_modem.c
+++ b/src/emu/bus/rs232/null_modem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "null_modem.h"
 
 null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/rs232/null_modem.h b/src/emu/bus/rs232/null_modem.h
index d94a6cc7a9f..f1318ec2ccd 100644
--- a/src/emu/bus/rs232/null_modem.h
+++ b/src/emu/bus/rs232/null_modem.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef NULL_MODEM_H_
 #define NULL_MODEM_H_
 
diff --git a/src/emu/bus/rs232/printer.c b/src/emu/bus/rs232/printer.c
index 2215d4dd1bd..8a66df1d82e 100644
--- a/src/emu/bus/rs232/printer.c
+++ b/src/emu/bus/rs232/printer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "printer.h"
 
 serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/rs232/printer.h b/src/emu/bus/rs232/printer.h
index 0d2c03b24bf..91084198a5e 100644
--- a/src/emu/bus/rs232/printer.h
+++ b/src/emu/bus/rs232/printer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __RS232_PRINTER_H__
 #define __RS232_PRINTER_H__
 
diff --git a/src/emu/bus/rs232/rs232.c b/src/emu/bus/rs232/rs232.c
index 24862b22a92..b1c82c7927d 100644
--- a/src/emu/bus/rs232/rs232.c
+++ b/src/emu/bus/rs232/rs232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "rs232.h"
 
 const device_type RS232_PORT = &device_creator<rs232_port_device>;
diff --git a/src/emu/bus/rs232/rs232.h b/src/emu/bus/rs232/rs232.h
index a7df88e0700..1fb734b83d8 100644
--- a/src/emu/bus/rs232/rs232.h
+++ b/src/emu/bus/rs232/rs232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __BUS_RS232_H__
 #define __BUS_RS232_H__
 
diff --git a/src/emu/bus/rs232/ser_mouse.c b/src/emu/bus/rs232/ser_mouse.c
index 823cf732607..27f44d16e9d 100644
--- a/src/emu/bus/rs232/ser_mouse.c
+++ b/src/emu/bus/rs232/ser_mouse.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/ser_mouse.c
diff --git a/src/emu/bus/rs232/ser_mouse.h b/src/emu/bus/rs232/ser_mouse.h
index 02ca3cbe715..aa34ef8f83d 100644
--- a/src/emu/bus/rs232/ser_mouse.h
+++ b/src/emu/bus/rs232/ser_mouse.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * machine/ser_mouse.h
diff --git a/src/emu/bus/rs232/terminal.c b/src/emu/bus/rs232/terminal.c
index 6f440bff4c1..a8ef52ee44e 100644
--- a/src/emu/bus/rs232/terminal.c
+++ b/src/emu/bus/rs232/terminal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "terminal.h"
 
 serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/rs232/terminal.h b/src/emu/bus/rs232/terminal.h
index eb1c72c1c35..e08a2d858b9 100644
--- a/src/emu/bus/rs232/terminal.h
+++ b/src/emu/bus/rs232/terminal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __RS232_TERMINAL_H__
 #define __RS232_TERMINAL_H__
 
diff --git a/src/emu/bus/rs232/xvd701.c b/src/emu/bus/rs232/xvd701.c
index a7a1ba40eab..4eabd94adfb 100644
--- a/src/emu/bus/rs232/xvd701.c
+++ b/src/emu/bus/rs232/xvd701.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "xvd701.h"
 
 jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/rs232/xvd701.h b/src/emu/bus/rs232/xvd701.h
index 6c03b0c4710..c41d3e460ab 100644
--- a/src/emu/bus/rs232/xvd701.h
+++ b/src/emu/bus/rs232/xvd701.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef JVC_XV701_H_
 #define JVC_XV701_H_
 
diff --git a/src/emu/bus/s100/dj2db.c b/src/emu/bus/s100/dj2db.c
index 6d98a17633e..061a0c07880 100644
--- a/src/emu/bus/s100/dj2db.c
+++ b/src/emu/bus/s100/dj2db.c
@@ -4,9 +4,6 @@
 
     Morrow Designs Disk Jockey 2D/B floppy controller board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/s100/dj2db.h b/src/emu/bus/s100/dj2db.h
index 43aa245c831..460a45ff3dc 100644
--- a/src/emu/bus/s100/dj2db.h
+++ b/src/emu/bus/s100/dj2db.h
@@ -4,9 +4,6 @@
 
     Morrow Designs Disk Jockey 2D/B floppy controller board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/s100/djdma.c b/src/emu/bus/s100/djdma.c
index 6a8b4403f26..c0d93aed2f5 100644
--- a/src/emu/bus/s100/djdma.c
+++ b/src/emu/bus/s100/djdma.c
@@ -4,9 +4,6 @@
 
     Morrow Designs Disk Jockey/DMA floppy controller board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "djdma.h"
diff --git a/src/emu/bus/s100/djdma.h b/src/emu/bus/s100/djdma.h
index 2f36218bb5c..b5b54c972c4 100644
--- a/src/emu/bus/s100/djdma.h
+++ b/src/emu/bus/s100/djdma.h
@@ -4,9 +4,6 @@
 
     Morrow Designs Disk Jockey/DMA floppy controller board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/s100/mm65k16s.c b/src/emu/bus/s100/mm65k16s.c
index 6bc4ab13a84..22240dd789a 100644
--- a/src/emu/bus/s100/mm65k16s.c
+++ b/src/emu/bus/s100/mm65k16s.c
@@ -4,9 +4,6 @@
 
     Morrow Designs MM65K16S memory board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mm65k16s.h"
diff --git a/src/emu/bus/s100/mm65k16s.h b/src/emu/bus/s100/mm65k16s.h
index 54928dd30c4..35d9cbc21c5 100644
--- a/src/emu/bus/s100/mm65k16s.h
+++ b/src/emu/bus/s100/mm65k16s.h
@@ -4,9 +4,6 @@
 
     Morrow Designs MM65K16S memory board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/s100/nsmdsa.c b/src/emu/bus/s100/nsmdsa.c
index ecbc9668fa9..91fb4f46135 100644
--- a/src/emu/bus/s100/nsmdsa.c
+++ b/src/emu/bus/s100/nsmdsa.c
@@ -4,9 +4,6 @@
 
     North Star MICRO-DISK System MDS-A (Single Density) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "nsmdsa.h"
diff --git a/src/emu/bus/s100/nsmdsa.h b/src/emu/bus/s100/nsmdsa.h
index 16393b1fb74..88a2f330391 100644
--- a/src/emu/bus/s100/nsmdsa.h
+++ b/src/emu/bus/s100/nsmdsa.h
@@ -4,9 +4,6 @@
 
     North Star MICRO-DISK System MDS-A (Single Density) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/s100/nsmdsad.c b/src/emu/bus/s100/nsmdsad.c
index 00aa0b47cbd..d1a06407c6d 100644
--- a/src/emu/bus/s100/nsmdsad.c
+++ b/src/emu/bus/s100/nsmdsad.c
@@ -4,9 +4,6 @@
 
     North Star MICRO-DISK System MDS-A-D (Double Density) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "nsmdsad.h"
diff --git a/src/emu/bus/s100/nsmdsad.h b/src/emu/bus/s100/nsmdsad.h
index a7692fd61df..1c156590ba1 100644
--- a/src/emu/bus/s100/nsmdsad.h
+++ b/src/emu/bus/s100/nsmdsad.h
@@ -4,9 +4,6 @@
 
     North Star MICRO-DISK System MDS-A-D (Double Density) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/s100/s100.c b/src/emu/bus/s100/s100.c
index bf067658c80..aee9ecbccf6 100644
--- a/src/emu/bus/s100/s100.c
+++ b/src/emu/bus/s100/s100.c
@@ -4,9 +4,6 @@
 
     S-100 (IEEE-696/1983) bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "s100.h"
diff --git a/src/emu/bus/s100/s100.h b/src/emu/bus/s100/s100.h
index a44923c5945..9d622b573b6 100644
--- a/src/emu/bus/s100/s100.h
+++ b/src/emu/bus/s100/s100.h
@@ -4,9 +4,6 @@
 
     S-100 (IEEE Std 696-1983) bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                 +8 V (B)     1      51      +8 V (B)
diff --git a/src/emu/bus/s100/wunderbus.c b/src/emu/bus/s100/wunderbus.c
index 19341bc2327..4b269a80e93 100644
--- a/src/emu/bus/s100/wunderbus.c
+++ b/src/emu/bus/s100/wunderbus.c
@@ -4,9 +4,6 @@
 
     Morrow Designs Wunderbus I/O card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "wunderbus.h"
diff --git a/src/emu/bus/s100/wunderbus.h b/src/emu/bus/s100/wunderbus.h
index 2ce59c881b8..9b51f9afaee 100644
--- a/src/emu/bus/s100/wunderbus.h
+++ b/src/emu/bus/s100/wunderbus.h
@@ -4,9 +4,6 @@
 
     Morrow Designs Wunderbus I/O card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/saturn/bram.c b/src/emu/bus/saturn/bram.c
index 92357c44e0b..d08c8c08bc0 100644
--- a/src/emu/bus/saturn/bram.c
+++ b/src/emu/bus/saturn/bram.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Saturn Battery RAM cart emulation
diff --git a/src/emu/bus/saturn/bram.h b/src/emu/bus/saturn/bram.h
index 972cd9e7081..130fed385c4 100644
--- a/src/emu/bus/saturn/bram.h
+++ b/src/emu/bus/saturn/bram.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SAT_BRAM_H
 #define __SAT_BRAM_H
 
diff --git a/src/emu/bus/saturn/dram.c b/src/emu/bus/saturn/dram.c
index 37f963ebf07..06d9b7897dc 100644
--- a/src/emu/bus/saturn/dram.c
+++ b/src/emu/bus/saturn/dram.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Saturn cart emulation
diff --git a/src/emu/bus/saturn/dram.h b/src/emu/bus/saturn/dram.h
index a1a82d971c1..49d8f03418a 100644
--- a/src/emu/bus/saturn/dram.h
+++ b/src/emu/bus/saturn/dram.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SAT_DRAM_H
 #define __SAT_DRAM_H
 
diff --git a/src/emu/bus/saturn/rom.c b/src/emu/bus/saturn/rom.c
index 6fefeaf9d51..a87222ffd45 100644
--- a/src/emu/bus/saturn/rom.c
+++ b/src/emu/bus/saturn/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Saturn ROM cart emulation
diff --git a/src/emu/bus/saturn/rom.h b/src/emu/bus/saturn/rom.h
index 3cb8dd1bf73..a26f7382c20 100644
--- a/src/emu/bus/saturn/rom.h
+++ b/src/emu/bus/saturn/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SAT_ROM_H
 #define __SAT_ROM_H
 
diff --git a/src/emu/bus/saturn/sat_slot.c b/src/emu/bus/saturn/sat_slot.c
index ba9f4255307..fb06267ef75 100644
--- a/src/emu/bus/saturn/sat_slot.c
+++ b/src/emu/bus/saturn/sat_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/saturn/sat_slot.h b/src/emu/bus/saturn/sat_slot.h
index 7f622bb456b..a098b131bd3 100644
--- a/src/emu/bus/saturn/sat_slot.h
+++ b/src/emu/bus/saturn/sat_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SAT_SLOT_H
 #define __SAT_SLOT_H
 
diff --git a/src/emu/bus/scsi/acb4070.c b/src/emu/bus/scsi/acb4070.c
index 52ed15ef339..5898fa027f8 100644
--- a/src/emu/bus/scsi/acb4070.c
+++ b/src/emu/bus/scsi/acb4070.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * ACB4070 + RLL drive
  *
diff --git a/src/emu/bus/scsi/acb4070.h b/src/emu/bus/scsi/acb4070.h
index 8c90d2aab74..6b209c35cc6 100644
--- a/src/emu/bus/scsi/acb4070.h
+++ b/src/emu/bus/scsi/acb4070.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ACB4070__
diff --git a/src/emu/bus/scsi/cdu76s.c b/src/emu/bus/scsi/cdu76s.c
index 943fe831de0..4ea4276766c 100644
--- a/src/emu/bus/scsi/cdu76s.c
+++ b/src/emu/bus/scsi/cdu76s.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cdu76s.h"
 
 void sony_cdu76s_device::ExecCommand()
diff --git a/src/emu/bus/scsi/cdu76s.h b/src/emu/bus/scsi/cdu76s.h
index 83c8f07dfe2..db9af6a0dab 100644
--- a/src/emu/bus/scsi/cdu76s.h
+++ b/src/emu/bus/scsi/cdu76s.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cdu76s.h
diff --git a/src/emu/bus/scsi/d9060hd.c b/src/emu/bus/scsi/d9060hd.c
index 1b9413d8e68..0abb7fce2f7 100644
--- a/src/emu/bus/scsi/d9060hd.c
+++ b/src/emu/bus/scsi/d9060hd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * D9060 - SASI + TANDON TM602S
  *
diff --git a/src/emu/bus/scsi/d9060hd.h b/src/emu/bus/scsi/d9060hd.h
index fd87746f6f1..4ef8dd653c0 100644
--- a/src/emu/bus/scsi/d9060hd.h
+++ b/src/emu/bus/scsi/d9060hd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __D9060HD__
diff --git a/src/emu/bus/scsi/omti5100.c b/src/emu/bus/scsi/omti5100.c
index 0d7ed1567ab..dffa1d21d87 100644
--- a/src/emu/bus/scsi/omti5100.c
+++ b/src/emu/bus/scsi/omti5100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "omti5100.h"
 
 #define OMTI_STATUS_NOT_READY 0x04
diff --git a/src/emu/bus/scsi/omti5100.h b/src/emu/bus/scsi/omti5100.h
index 8fcb50bf72d..7b2bbee4349 100644
--- a/src/emu/bus/scsi/omti5100.h
+++ b/src/emu/bus/scsi/omti5100.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef OMTI5100_H_
 #define OMTI5100_H_
 
diff --git a/src/emu/bus/scsi/pc9801_sasi.c b/src/emu/bus/scsi/pc9801_sasi.c
index 82fcbe41239..06cda5848c7 100644
--- a/src/emu/bus/scsi/pc9801_sasi.c
+++ b/src/emu/bus/scsi/pc9801_sasi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pc9801_sasi.h"
 
 #define SASI_CMD_SPECIFY 0xc2 // according to x68k_hdc.c
diff --git a/src/emu/bus/scsi/pc9801_sasi.h b/src/emu/bus/scsi/pc9801_sasi.h
index 21876a6f519..61057e3e96a 100644
--- a/src/emu/bus/scsi/pc9801_sasi.h
+++ b/src/emu/bus/scsi/pc9801_sasi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PC9801_SASI_H_
 #define PC9801_SASI_H_
 
diff --git a/src/emu/bus/scsi/s1410.c b/src/emu/bus/scsi/s1410.c
index 6672c0bd9a7..59b964ce4f2 100644
--- a/src/emu/bus/scsi/s1410.c
+++ b/src/emu/bus/scsi/s1410.c
@@ -4,9 +4,6 @@
 
     Xebec S1410 5.25" Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/scsi/s1410.h b/src/emu/bus/scsi/s1410.h
index d392ef93270..b7834f56c88 100644
--- a/src/emu/bus/scsi/s1410.h
+++ b/src/emu/bus/scsi/s1410.h
@@ -4,9 +4,6 @@
 
     Xebec S1410 5.25" Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/scsi/sa1403d.c b/src/emu/bus/scsi/sa1403d.c
index 816f9187433..1abe47e0805 100644
--- a/src/emu/bus/scsi/sa1403d.c
+++ b/src/emu/bus/scsi/sa1403d.c
@@ -4,9 +4,6 @@
 
     Shugart SA1403D Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "sa1403d.h"
diff --git a/src/emu/bus/scsi/sa1403d.h b/src/emu/bus/scsi/sa1403d.h
index 44897e7156a..5f92ff11240 100644
--- a/src/emu/bus/scsi/sa1403d.h
+++ b/src/emu/bus/scsi/sa1403d.h
@@ -4,9 +4,6 @@
 
     Shugart SA1403D Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/sega8/ccatch.c b/src/emu/bus/sega8/ccatch.c
index 0f1b464660d..3fba1f1fa35 100644
--- a/src/emu/bus/sega8/ccatch.c
+++ b/src/emu/bus/sega8/ccatch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  SG-1000 Card Catcher emulation
diff --git a/src/emu/bus/sega8/ccatch.h b/src/emu/bus/sega8/ccatch.h
index 3a632e6f6ce..6fe84b45693 100644
--- a/src/emu/bus/sega8/ccatch.h
+++ b/src/emu/bus/sega8/ccatch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SEGA8_CCATCH_H
 #define __SEGA8_CCATCH_H
 
diff --git a/src/emu/bus/sega8/mgear.c b/src/emu/bus/sega8/mgear.c
index 601bef6b9ec..d271ac74dfa 100644
--- a/src/emu/bus/sega8/mgear.c
+++ b/src/emu/bus/sega8/mgear.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Master Gear Adapter emulation
diff --git a/src/emu/bus/sega8/mgear.h b/src/emu/bus/sega8/mgear.h
index d4e800c19e8..f4e225f85bd 100644
--- a/src/emu/bus/sega8/mgear.h
+++ b/src/emu/bus/sega8/mgear.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SEGA8_MGEAR_H
 #define __SEGA8_MGEAR_H
 
diff --git a/src/emu/bus/sega8/rom.c b/src/emu/bus/sega8/rom.c
index 116f7d14ee3..dc3b4ec460c 100644
--- a/src/emu/bus/sega8/rom.c
+++ b/src/emu/bus/sega8/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Sega 8-bit cart emulation (for Master System, GameGear and SG-1000)
diff --git a/src/emu/bus/sega8/rom.h b/src/emu/bus/sega8/rom.h
index be540fc1efb..aeb5196fa0d 100644
--- a/src/emu/bus/sega8/rom.h
+++ b/src/emu/bus/sega8/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SEGA8_ROM_H
 #define __SEGA8_ROM_H
 
diff --git a/src/emu/bus/sega8/sega8_slot.c b/src/emu/bus/sega8/sega8_slot.c
index 5a090c00762..7614d6b5d19 100644
--- a/src/emu/bus/sega8/sega8_slot.c
+++ b/src/emu/bus/sega8/sega8_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/sega8/sega8_slot.h b/src/emu/bus/sega8/sega8_slot.h
index 5bac375e6fb..33c6c225b84 100644
--- a/src/emu/bus/sega8/sega8_slot.h
+++ b/src/emu/bus/sega8/sega8_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SEGA8_SLOT_H
 #define __SEGA8_SLOT_H
 
diff --git a/src/emu/bus/sms_ctrl/graphic.c b/src/emu/bus/sms_ctrl/graphic.c
index 00a6bd027c9..17a8bf18544 100644
--- a/src/emu/bus/sms_ctrl/graphic.c
+++ b/src/emu/bus/sms_ctrl/graphic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Graphic Board" emulation
diff --git a/src/emu/bus/sms_ctrl/graphic.h b/src/emu/bus/sms_ctrl/graphic.h
index fab7234c6b3..337f8fb5550 100644
--- a/src/emu/bus/sms_ctrl/graphic.h
+++ b/src/emu/bus/sms_ctrl/graphic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Graphic Board" emulation
diff --git a/src/emu/bus/sms_ctrl/joypad.c b/src/emu/bus/sms_ctrl/joypad.c
index 24149ca5d4f..136d3e1262b 100644
--- a/src/emu/bus/sms_ctrl/joypad.c
+++ b/src/emu/bus/sms_ctrl/joypad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Control Pad"/generic joystick emulation
diff --git a/src/emu/bus/sms_ctrl/joypad.h b/src/emu/bus/sms_ctrl/joypad.h
index f102ca6d596..fb3c5769787 100644
--- a/src/emu/bus/sms_ctrl/joypad.h
+++ b/src/emu/bus/sms_ctrl/joypad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Control Pad"/generic joystick emulation
diff --git a/src/emu/bus/sms_ctrl/lphaser.c b/src/emu/bus/sms_ctrl/lphaser.c
index 050086aa09c..f431ec631a7 100644
--- a/src/emu/bus/sms_ctrl/lphaser.c
+++ b/src/emu/bus/sms_ctrl/lphaser.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Light Phaser" (light gun) emulation
diff --git a/src/emu/bus/sms_ctrl/lphaser.h b/src/emu/bus/sms_ctrl/lphaser.h
index 8afaa47fcd7..e9f7c0ee71e 100644
--- a/src/emu/bus/sms_ctrl/lphaser.h
+++ b/src/emu/bus/sms_ctrl/lphaser.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Light Phaser" (light gun) emulation
diff --git a/src/emu/bus/sms_ctrl/multitap.c b/src/emu/bus/sms_ctrl/multitap.c
index 45d93733493..e42743cd9fb 100644
--- a/src/emu/bus/sms_ctrl/multitap.c
+++ b/src/emu/bus/sms_ctrl/multitap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Furrtek's homemade multitap emulation
diff --git a/src/emu/bus/sms_ctrl/multitap.h b/src/emu/bus/sms_ctrl/multitap.h
index 390624bc650..a249d20437d 100644
--- a/src/emu/bus/sms_ctrl/multitap.h
+++ b/src/emu/bus/sms_ctrl/multitap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Furrtek's homemade multitap emulation
diff --git a/src/emu/bus/sms_ctrl/paddle.c b/src/emu/bus/sms_ctrl/paddle.c
index 41a79ecf0be..dd851ce0cfa 100644
--- a/src/emu/bus/sms_ctrl/paddle.c
+++ b/src/emu/bus/sms_ctrl/paddle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Paddle Control" emulation
diff --git a/src/emu/bus/sms_ctrl/paddle.h b/src/emu/bus/sms_ctrl/paddle.h
index 59d41ec645d..c2c1e9fbd3b 100644
--- a/src/emu/bus/sms_ctrl/paddle.h
+++ b/src/emu/bus/sms_ctrl/paddle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Paddle Control" emulation
diff --git a/src/emu/bus/sms_ctrl/rfu.c b/src/emu/bus/sms_ctrl/rfu.c
index 99dfcdbd615..89579bee3b3 100644
--- a/src/emu/bus/sms_ctrl/rfu.c
+++ b/src/emu/bus/sms_ctrl/rfu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Rapid Fire Unit" emulation
diff --git a/src/emu/bus/sms_ctrl/rfu.h b/src/emu/bus/sms_ctrl/rfu.h
index 4edefaf2517..a87209891b7 100644
--- a/src/emu/bus/sms_ctrl/rfu.h
+++ b/src/emu/bus/sms_ctrl/rfu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Rapid Fire Unit" emulation
diff --git a/src/emu/bus/sms_ctrl/smsctrl.c b/src/emu/bus/sms_ctrl/smsctrl.c
index 667d090da86..0274d1e606e 100644
--- a/src/emu/bus/sms_ctrl/smsctrl.c
+++ b/src/emu/bus/sms_ctrl/smsctrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System controller port emulation
diff --git a/src/emu/bus/sms_ctrl/smsctrl.h b/src/emu/bus/sms_ctrl/smsctrl.h
index 8a9e3646ee1..a282ebb7a6e 100644
--- a/src/emu/bus/sms_ctrl/smsctrl.h
+++ b/src/emu/bus/sms_ctrl/smsctrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System controller port emulation
diff --git a/src/emu/bus/sms_ctrl/sports.c b/src/emu/bus/sms_ctrl/sports.c
index a32ce734b4d..1e7a03a413c 100644
--- a/src/emu/bus/sms_ctrl/sports.c
+++ b/src/emu/bus/sms_ctrl/sports.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Sports Pad" (US model) emulation
diff --git a/src/emu/bus/sms_ctrl/sports.h b/src/emu/bus/sms_ctrl/sports.h
index ab2eaf7377a..56cbd2504f6 100644
--- a/src/emu/bus/sms_ctrl/sports.h
+++ b/src/emu/bus/sms_ctrl/sports.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Sports Pad" (US model) emulation
diff --git a/src/emu/bus/sms_ctrl/sportsjp.c b/src/emu/bus/sms_ctrl/sportsjp.c
index 2d89a73772e..c30b1c438d4 100644
--- a/src/emu/bus/sms_ctrl/sportsjp.c
+++ b/src/emu/bus/sms_ctrl/sportsjp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Sports Pad" (Japanese model) emulation
diff --git a/src/emu/bus/sms_ctrl/sportsjp.h b/src/emu/bus/sms_ctrl/sportsjp.h
index b8b643519fd..96d59dbc4f0 100644
--- a/src/emu/bus/sms_ctrl/sportsjp.h
+++ b/src/emu/bus/sms_ctrl/sportsjp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Sports Pad" (Japanese model) emulation
diff --git a/src/emu/bus/sms_exp/gender.c b/src/emu/bus/sms_exp/gender.c
index f93ac7314f5..c93d16fe7eb 100644
--- a/src/emu/bus/sms_exp/gender.c
+++ b/src/emu/bus/sms_exp/gender.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Gender Adapter" emulation
diff --git a/src/emu/bus/sms_exp/gender.h b/src/emu/bus/sms_exp/gender.h
index 3e24fec8066..333fde7d4de 100644
--- a/src/emu/bus/sms_exp/gender.h
+++ b/src/emu/bus/sms_exp/gender.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System "Gender Adapter" emulation
diff --git a/src/emu/bus/sms_exp/smsexp.c b/src/emu/bus/sms_exp/smsexp.c
index 46d16c1a935..492ae3887c3 100644
--- a/src/emu/bus/sms_exp/smsexp.c
+++ b/src/emu/bus/sms_exp/smsexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System expansion slot emulation
diff --git a/src/emu/bus/sms_exp/smsexp.h b/src/emu/bus/sms_exp/smsexp.h
index 5e665439b9d..ef8050c9eed 100644
--- a/src/emu/bus/sms_exp/smsexp.h
+++ b/src/emu/bus/sms_exp/smsexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega Master System expansion slot emulation
diff --git a/src/emu/bus/snes/bsx.c b/src/emu/bus/snes/bsx.c
index 5b4b7532325..3ad13147b66 100644
--- a/src/emu/bus/snes/bsx.c
+++ b/src/emu/bus/snes/bsx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  BS-X Satellaview cartridge emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/bsx.h b/src/emu/bus/snes/bsx.h
index 369b8e856f7..889477d968b 100644
--- a/src/emu/bus/snes/bsx.h
+++ b/src/emu/bus/snes/bsx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_BSX_H
 #define __SNS_BSX_H
 
diff --git a/src/emu/bus/snes/event.c b/src/emu/bus/snes/event.c
index 80cf69bcd98..1440bf9395e 100644
--- a/src/emu/bus/snes/event.c
+++ b/src/emu/bus/snes/event.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Super NES/Famicom Event cartridges emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/event.h b/src/emu/bus/snes/event.h
index ad115655a8e..a55c9ec2dda 100644
--- a/src/emu/bus/snes/event.h
+++ b/src/emu/bus/snes/event.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_EVENT_H
 #define __SNS_EVENT_H
 
diff --git a/src/emu/bus/snes/rom.c b/src/emu/bus/snes/rom.c
index 83c3963d925..78563230d16 100644
--- a/src/emu/bus/snes/rom.c
+++ b/src/emu/bus/snes/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Super NES/Famicom (LoROM) cartridge emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/rom.h b/src/emu/bus/snes/rom.h
index 2830f573434..a813550667b 100644
--- a/src/emu/bus/snes/rom.h
+++ b/src/emu/bus/snes/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_ROM_H
 #define __SNS_ROM_H
 
diff --git a/src/emu/bus/snes/rom21.c b/src/emu/bus/snes/rom21.c
index 5c991504579..bd22faa7de4 100644
--- a/src/emu/bus/snes/rom21.c
+++ b/src/emu/bus/snes/rom21.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Super NES/Famicom (HiROM) cartridge emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/rom21.h b/src/emu/bus/snes/rom21.h
index d9738e0c035..02151b0c9f8 100644
--- a/src/emu/bus/snes/rom21.h
+++ b/src/emu/bus/snes/rom21.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_ROM21_H
 #define __SNS_ROM21_H
 
diff --git a/src/emu/bus/snes/sa1.c b/src/emu/bus/snes/sa1.c
index a7979bf64d8..cb634fdccf9 100644
--- a/src/emu/bus/snes/sa1.c
+++ b/src/emu/bus/snes/sa1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  SA-1 add-on chip emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/sa1.h b/src/emu/bus/snes/sa1.h
index a72263116d0..fb8f57ea2e9 100644
--- a/src/emu/bus/snes/sa1.h
+++ b/src/emu/bus/snes/sa1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SA1_H
 #define __SNS_SA1_H
 
diff --git a/src/emu/bus/snes/sdd1.c b/src/emu/bus/snes/sdd1.c
index 6d5356317b7..b7fed0e0fac 100644
--- a/src/emu/bus/snes/sdd1.c
+++ b/src/emu/bus/snes/sdd1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  S-DD1 add-on chip emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/sdd1.h b/src/emu/bus/snes/sdd1.h
index fdd94ed7b2f..d379d973c61 100644
--- a/src/emu/bus/snes/sdd1.h
+++ b/src/emu/bus/snes/sdd1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SDD1_H
 #define __SNS_SDD1_H
 
diff --git a/src/emu/bus/snes/sfx.c b/src/emu/bus/snes/sfx.c
index 75c2827a5a6..5ec39ff188a 100644
--- a/src/emu/bus/snes/sfx.c
+++ b/src/emu/bus/snes/sfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  SuperFX add-on chip emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/sfx.h b/src/emu/bus/snes/sfx.h
index a68ea4ffce9..feab4484337 100644
--- a/src/emu/bus/snes/sfx.h
+++ b/src/emu/bus/snes/sfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SFX_H
 #define __SNS_SFX_H
 
diff --git a/src/emu/bus/snes/sgb.c b/src/emu/bus/snes/sgb.c
index a2e8eabe4c2..02fc2a48890 100644
--- a/src/emu/bus/snes/sgb.c
+++ b/src/emu/bus/snes/sgb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Super Game Boy emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/sgb.h b/src/emu/bus/snes/sgb.h
index 549a7152da2..0bc4f78fca8 100644
--- a/src/emu/bus/snes/sgb.h
+++ b/src/emu/bus/snes/sgb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SGB_H
 #define __SNS_SGB_H
 
diff --git a/src/emu/bus/snes/snes_carts.c b/src/emu/bus/snes/snes_carts.c
index 121edca8f3b..6b8bb1b8082 100644
--- a/src/emu/bus/snes/snes_carts.c
+++ b/src/emu/bus/snes/snes_carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     SNES carts
diff --git a/src/emu/bus/snes/snes_carts.h b/src/emu/bus/snes/snes_carts.h
index f5f619e272c..504e83aafea 100644
--- a/src/emu/bus/snes/snes_carts.h
+++ b/src/emu/bus/snes/snes_carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     SNES carts
diff --git a/src/emu/bus/snes/snes_slot.c b/src/emu/bus/snes/snes_slot.c
index a15ff01ec8c..d336a9af4e3 100644
--- a/src/emu/bus/snes/snes_slot.c
+++ b/src/emu/bus/snes/snes_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/snes/snes_slot.h b/src/emu/bus/snes/snes_slot.h
index 967011e7976..c216d520df9 100644
--- a/src/emu/bus/snes/snes_slot.h
+++ b/src/emu/bus/snes/snes_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SLOT_H
 #define __SNS_SLOT_H
 
diff --git a/src/emu/bus/snes/spc7110.c b/src/emu/bus/snes/spc7110.c
index e9f156a6f39..acfb06d5198 100644
--- a/src/emu/bus/snes/spc7110.c
+++ b/src/emu/bus/snes/spc7110.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  SPC-7110 add-on chip emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/spc7110.h b/src/emu/bus/snes/spc7110.h
index c18bb16eaad..8743592aeda 100644
--- a/src/emu/bus/snes/spc7110.h
+++ b/src/emu/bus/snes/spc7110.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SPC7110_H
 #define __SNS_SPC7110_H
 
diff --git a/src/emu/bus/snes/sufami.c b/src/emu/bus/snes/sufami.c
index f4f388bbfae..5839d909744 100644
--- a/src/emu/bus/snes/sufami.c
+++ b/src/emu/bus/snes/sufami.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  Bandai Sufami Turbo cartridge emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/sufami.h b/src/emu/bus/snes/sufami.h
index 5e8572a953b..274e1232b4c 100644
--- a/src/emu/bus/snes/sufami.h
+++ b/src/emu/bus/snes/sufami.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_SUFAMI_H
 #define __SNS_SUFAMI_H
 
diff --git a/src/emu/bus/snes/upd.c b/src/emu/bus/snes/upd.c
index 808bcabdbf5..6706a059317 100644
--- a/src/emu/bus/snes/upd.c
+++ b/src/emu/bus/snes/upd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  UPD7725 / UPD96050 add-on chip emulation (for SNES/SFC)
diff --git a/src/emu/bus/snes/upd.h b/src/emu/bus/snes/upd.h
index 919cb1b1cb9..6c42259bf57 100644
--- a/src/emu/bus/snes/upd.h
+++ b/src/emu/bus/snes/upd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SNS_UPD_H
 #define __SNS_UPD_H
 
diff --git a/src/emu/bus/snes_ctrl/bcbattle.c b/src/emu/bus/snes_ctrl/bcbattle.c
index 27d7dd1c71c..19bbe1ccc48 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.c
+++ b/src/emu/bus/snes_ctrl/bcbattle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Epoch Barcode Battler
diff --git a/src/emu/bus/snes_ctrl/bcbattle.h b/src/emu/bus/snes_ctrl/bcbattle.h
index e960b8ac134..7c5a8f29178 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.h
+++ b/src/emu/bus/snes_ctrl/bcbattle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Epoch Barcode Battler
diff --git a/src/emu/bus/snes_ctrl/ctrl.c b/src/emu/bus/snes_ctrl/ctrl.c
index 9f13534561e..31661597721 100644
--- a/src/emu/bus/snes_ctrl/ctrl.c
+++ b/src/emu/bus/snes_ctrl/ctrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES controller port emulation
diff --git a/src/emu/bus/snes_ctrl/ctrl.h b/src/emu/bus/snes_ctrl/ctrl.h
index 2d6850806d7..27a8806db50 100644
--- a/src/emu/bus/snes_ctrl/ctrl.h
+++ b/src/emu/bus/snes_ctrl/ctrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES controller port emulation
diff --git a/src/emu/bus/snes_ctrl/joypad.c b/src/emu/bus/snes_ctrl/joypad.c
index 4b26d35b887..20eefdabc0f 100644
--- a/src/emu/bus/snes_ctrl/joypad.c
+++ b/src/emu/bus/snes_ctrl/joypad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Joypad
diff --git a/src/emu/bus/snes_ctrl/joypad.h b/src/emu/bus/snes_ctrl/joypad.h
index bb0b36b6a4f..9df850b162b 100644
--- a/src/emu/bus/snes_ctrl/joypad.h
+++ b/src/emu/bus/snes_ctrl/joypad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Joypad
diff --git a/src/emu/bus/snes_ctrl/miracle.c b/src/emu/bus/snes_ctrl/miracle.c
index ee8c6d2934d..4a8b959a39d 100644
--- a/src/emu/bus/snes_ctrl/miracle.c
+++ b/src/emu/bus/snes_ctrl/miracle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Super Nintendo Entertainment System - Miracle Piano Keyboard
diff --git a/src/emu/bus/snes_ctrl/miracle.h b/src/emu/bus/snes_ctrl/miracle.h
index 7140544d570..45054e3330a 100644
--- a/src/emu/bus/snes_ctrl/miracle.h
+++ b/src/emu/bus/snes_ctrl/miracle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Super Nintendo Entertainment System - Miracle Piano Keyboard
diff --git a/src/emu/bus/snes_ctrl/mouse.c b/src/emu/bus/snes_ctrl/mouse.c
index 8337af09859..a6267fe11ba 100644
--- a/src/emu/bus/snes_ctrl/mouse.c
+++ b/src/emu/bus/snes_ctrl/mouse.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Mouse
diff --git a/src/emu/bus/snes_ctrl/mouse.h b/src/emu/bus/snes_ctrl/mouse.h
index c795b93579a..1ee3b3c1410 100644
--- a/src/emu/bus/snes_ctrl/mouse.h
+++ b/src/emu/bus/snes_ctrl/mouse.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Mouse
diff --git a/src/emu/bus/snes_ctrl/multitap.c b/src/emu/bus/snes_ctrl/multitap.c
index 8a18422c19f..a778f3ca9c6 100644
--- a/src/emu/bus/snes_ctrl/multitap.c
+++ b/src/emu/bus/snes_ctrl/multitap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Multitap Adapter
diff --git a/src/emu/bus/snes_ctrl/multitap.h b/src/emu/bus/snes_ctrl/multitap.h
index b43f3116f18..da05cd4d3a7 100644
--- a/src/emu/bus/snes_ctrl/multitap.h
+++ b/src/emu/bus/snes_ctrl/multitap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES Multitap Adapter
diff --git a/src/emu/bus/snes_ctrl/pachinko.c b/src/emu/bus/snes_ctrl/pachinko.c
index e69050a9a78..77a4f98af30 100644
--- a/src/emu/bus/snes_ctrl/pachinko.c
+++ b/src/emu/bus/snes_ctrl/pachinko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Sunsoft Pachinko Controller
diff --git a/src/emu/bus/snes_ctrl/pachinko.h b/src/emu/bus/snes_ctrl/pachinko.h
index 0dc2fe25480..2afbbac7032 100644
--- a/src/emu/bus/snes_ctrl/pachinko.h
+++ b/src/emu/bus/snes_ctrl/pachinko.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Sunsoft Pachinko Controller
diff --git a/src/emu/bus/snes_ctrl/sscope.c b/src/emu/bus/snes_ctrl/sscope.c
index 178ab25bddd..01cb344d645 100644
--- a/src/emu/bus/snes_ctrl/sscope.c
+++ b/src/emu/bus/snes_ctrl/sscope.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES SuperScope
diff --git a/src/emu/bus/snes_ctrl/sscope.h b/src/emu/bus/snes_ctrl/sscope.h
index 7b9379336dc..d602e47d8ea 100644
--- a/src/emu/bus/snes_ctrl/sscope.h
+++ b/src/emu/bus/snes_ctrl/sscope.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom & SNES SuperScope
diff --git a/src/emu/bus/snes_ctrl/twintap.c b/src/emu/bus/snes_ctrl/twintap.c
index d5d38d55ac4..a326d24dcc4 100644
--- a/src/emu/bus/snes_ctrl/twintap.c
+++ b/src/emu/bus/snes_ctrl/twintap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Yonezawa / PartyRoom 21 Twin Tap Controller
diff --git a/src/emu/bus/snes_ctrl/twintap.h b/src/emu/bus/snes_ctrl/twintap.h
index 482a20e1bc6..2df67773935 100644
--- a/src/emu/bus/snes_ctrl/twintap.h
+++ b/src/emu/bus/snes_ctrl/twintap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nintendo Super Famicom - Yonezawa / PartyRoom 21 Twin Tap Controller
diff --git a/src/emu/bus/spc1000/exp.c b/src/emu/bus/spc1000/exp.c
index 8a236b64fb8..df3e1ae14c1 100644
--- a/src/emu/bus/spc1000/exp.c
+++ b/src/emu/bus/spc1000/exp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
     Samsung SPC-1000 Expansion port
diff --git a/src/emu/bus/spc1000/exp.h b/src/emu/bus/spc1000/exp.h
index 44d3a49ae27..350aa60e0a2 100644
--- a/src/emu/bus/spc1000/exp.h
+++ b/src/emu/bus/spc1000/exp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SCP1000_SLOT_H
 #define __SCP1000_SLOT_H
 
diff --git a/src/emu/bus/spc1000/fdd.c b/src/emu/bus/spc1000/fdd.c
index ebe1c6e90d3..f633315f54c 100644
--- a/src/emu/bus/spc1000/fdd.c
+++ b/src/emu/bus/spc1000/fdd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SPC-1000 FDD unit
diff --git a/src/emu/bus/spc1000/fdd.h b/src/emu/bus/spc1000/fdd.h
index 7ee6f56a50c..129fd2af506 100644
--- a/src/emu/bus/spc1000/fdd.h
+++ b/src/emu/bus/spc1000/fdd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SPC1000_FDD_H__
 #define __SPC1000_FDD_H__
 
diff --git a/src/emu/bus/spc1000/vdp.c b/src/emu/bus/spc1000/vdp.c
index 539bfe5a8bb..13db91ec368 100644
--- a/src/emu/bus/spc1000/vdp.c
+++ b/src/emu/bus/spc1000/vdp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SPC-1000 VDP expansion unit
diff --git a/src/emu/bus/spc1000/vdp.h b/src/emu/bus/spc1000/vdp.h
index f4cd47e9b81..15f470c5cee 100644
--- a/src/emu/bus/spc1000/vdp.h
+++ b/src/emu/bus/spc1000/vdp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SPC1000_VDP_H__
 #define __SPC1000_VDP_H__
 
diff --git a/src/emu/bus/vcs/compumat.c b/src/emu/bus/vcs/compumat.c
index 57de9257711..d07e10719e2 100644
--- a/src/emu/bus/vcs/compumat.c
+++ b/src/emu/bus/vcs/compumat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Atari 2600 cart Spectravideo Compumate (Cart + keyboard!)
diff --git a/src/emu/bus/vcs/compumat.h b/src/emu/bus/vcs/compumat.h
index b18988181ac..33da446b143 100644
--- a/src/emu/bus/vcs/compumat.h
+++ b/src/emu/bus/vcs/compumat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VCS_COMPUMAT_H
 #define __VCS_COMPUMAT_H
 
diff --git a/src/emu/bus/vcs/dpc.c b/src/emu/bus/vcs/dpc.c
index f802926ea09..dc301930179 100644
--- a/src/emu/bus/vcs/dpc.c
+++ b/src/emu/bus/vcs/dpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 
diff --git a/src/emu/bus/vcs/dpc.h b/src/emu/bus/vcs/dpc.h
index a54e67e5778..b9d8a9ea5a2 100644
--- a/src/emu/bus/vcs/dpc.h
+++ b/src/emu/bus/vcs/dpc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VCS_DCP_H
 #define __VCS_DCP_H
 
diff --git a/src/emu/bus/vcs/rom.c b/src/emu/bus/vcs/rom.c
index 5444e5f5534..f99f478597e 100755
--- a/src/emu/bus/vcs/rom.c
+++ b/src/emu/bus/vcs/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
  A2600 VCS ROM cart emulation
diff --git a/src/emu/bus/vcs/rom.h b/src/emu/bus/vcs/rom.h
index a0434bd35c4..e4df31f11e4 100755
--- a/src/emu/bus/vcs/rom.h
+++ b/src/emu/bus/vcs/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VCS_ROM_H
 #define __VCS_ROM_H
 
diff --git a/src/emu/bus/vcs/scharger.c b/src/emu/bus/vcs/scharger.c
index e536a474c18..4e24902325d 100644
--- a/src/emu/bus/vcs/scharger.c
+++ b/src/emu/bus/vcs/scharger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Atari 2600 cart Starpath Supercharger (Cart + Tape drive!)
diff --git a/src/emu/bus/vcs/scharger.h b/src/emu/bus/vcs/scharger.h
index 94ffda7230c..7a5470724ab 100644
--- a/src/emu/bus/vcs/scharger.h
+++ b/src/emu/bus/vcs/scharger.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VCS_SCHARGER_H
 #define __VCS_SCHARGER_H
 
diff --git a/src/emu/bus/vcs/vcs_slot.c b/src/emu/bus/vcs/vcs_slot.c
index ba63b05229f..ce44de2a3c1 100755
--- a/src/emu/bus/vcs/vcs_slot.c
+++ b/src/emu/bus/vcs/vcs_slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/vcs/vcs_slot.h b/src/emu/bus/vcs/vcs_slot.h
index 31cb03543e2..365056bb1c1 100755
--- a/src/emu/bus/vcs/vcs_slot.h
+++ b/src/emu/bus/vcs/vcs_slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VCS_SLOT_H
 #define __VCS_SLOT_H
 
diff --git a/src/emu/bus/vcs_ctrl/ctrl.c b/src/emu/bus/vcs_ctrl/ctrl.c
index 226ea75bf67..07afbb93cb1 100644
--- a/src/emu/bus/vcs_ctrl/ctrl.c
+++ b/src/emu/bus/vcs_ctrl/ctrl.c
@@ -4,9 +4,6 @@
 
     Atari Video Computer System controller port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ctrl.h"
diff --git a/src/emu/bus/vcs_ctrl/ctrl.h b/src/emu/bus/vcs_ctrl/ctrl.h
index ab01e6ab942..50f817a2a01 100644
--- a/src/emu/bus/vcs_ctrl/ctrl.h
+++ b/src/emu/bus/vcs_ctrl/ctrl.h
@@ -4,9 +4,6 @@
 
     Atari Video Computer System controller port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
 
diff --git a/src/emu/bus/vcs_ctrl/joybooster.c b/src/emu/bus/vcs_ctrl/joybooster.c
index 22b892f4bf7..3dc488b8526 100644
--- a/src/emu/bus/vcs_ctrl/joybooster.c
+++ b/src/emu/bus/vcs_ctrl/joybooster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System digital joystick emulation with
diff --git a/src/emu/bus/vcs_ctrl/joybooster.h b/src/emu/bus/vcs_ctrl/joybooster.h
index 8f4c3bf9ca2..febfc2c5c65 100644
--- a/src/emu/bus/vcs_ctrl/joybooster.h
+++ b/src/emu/bus/vcs_ctrl/joybooster.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System digital joystick emulation with
diff --git a/src/emu/bus/vcs_ctrl/joystick.c b/src/emu/bus/vcs_ctrl/joystick.c
index f2c83ffa7f1..f1539eabeef 100644
--- a/src/emu/bus/vcs_ctrl/joystick.c
+++ b/src/emu/bus/vcs_ctrl/joystick.c
@@ -4,9 +4,6 @@
 
     Atari Video Computer System digital joystick emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "joystick.h"
diff --git a/src/emu/bus/vcs_ctrl/joystick.h b/src/emu/bus/vcs_ctrl/joystick.h
index 7de13ff3c36..9e4d6eebed5 100644
--- a/src/emu/bus/vcs_ctrl/joystick.h
+++ b/src/emu/bus/vcs_ctrl/joystick.h
@@ -4,9 +4,6 @@
 
     Atari Video Computer System digital joystick emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vcs_ctrl/keypad.c b/src/emu/bus/vcs_ctrl/keypad.c
index 57929788e49..0e0b7df77dd 100644
--- a/src/emu/bus/vcs_ctrl/keypad.c
+++ b/src/emu/bus/vcs_ctrl/keypad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System keypad emulation
diff --git a/src/emu/bus/vcs_ctrl/keypad.h b/src/emu/bus/vcs_ctrl/keypad.h
index 628731b2350..247656f0609 100644
--- a/src/emu/bus/vcs_ctrl/keypad.h
+++ b/src/emu/bus/vcs_ctrl/keypad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System Keypad emulation
diff --git a/src/emu/bus/vcs_ctrl/lightpen.c b/src/emu/bus/vcs_ctrl/lightpen.c
index 9fefb29b31b..8531930b2a1 100644
--- a/src/emu/bus/vcs_ctrl/lightpen.c
+++ b/src/emu/bus/vcs_ctrl/lightpen.c
@@ -4,9 +4,6 @@
 
     Atari Video Computer System lightpen emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "lightpen.h"
diff --git a/src/emu/bus/vcs_ctrl/lightpen.h b/src/emu/bus/vcs_ctrl/lightpen.h
index c18a2a4a368..61849e789ad 100644
--- a/src/emu/bus/vcs_ctrl/lightpen.h
+++ b/src/emu/bus/vcs_ctrl/lightpen.h
@@ -4,9 +4,6 @@
 
     Atari Video Computer System lightpen emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vcs_ctrl/paddles.c b/src/emu/bus/vcs_ctrl/paddles.c
index 98f4f8990cc..b8a4f4a6de5 100644
--- a/src/emu/bus/vcs_ctrl/paddles.c
+++ b/src/emu/bus/vcs_ctrl/paddles.c
@@ -4,9 +4,6 @@
 
     Atari Video Computer System analog paddles emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "paddles.h"
diff --git a/src/emu/bus/vcs_ctrl/paddles.h b/src/emu/bus/vcs_ctrl/paddles.h
index 7363d05bf25..90e8dc910ab 100644
--- a/src/emu/bus/vcs_ctrl/paddles.h
+++ b/src/emu/bus/vcs_ctrl/paddles.h
@@ -4,9 +4,6 @@
 
     Atari Video Computer System analog paddles emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vcs_ctrl/wheel.c b/src/emu/bus/vcs_ctrl/wheel.c
index 61111ecd033..bab5d74a4ce 100644
--- a/src/emu/bus/vcs_ctrl/wheel.c
+++ b/src/emu/bus/vcs_ctrl/wheel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System Driving Wheel emulation
diff --git a/src/emu/bus/vcs_ctrl/wheel.h b/src/emu/bus/vcs_ctrl/wheel.h
index 07bcafd0534..3c1929767bf 100644
--- a/src/emu/bus/vcs_ctrl/wheel.h
+++ b/src/emu/bus/vcs_ctrl/wheel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Atari Video Computer System Driving Wheel emulation
diff --git a/src/emu/bus/vic10/exp.c b/src/emu/bus/vic10/exp.c
index ea3b3e2009f..c6d7a43c6bb 100644
--- a/src/emu/bus/vic10/exp.c
+++ b/src/emu/bus/vic10/exp.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-10 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/bus/vic10/exp.h b/src/emu/bus/vic10/exp.h
index 189ed376f93..26e5f6c1e45 100644
--- a/src/emu/bus/vic10/exp.h
+++ b/src/emu/bus/vic10/exp.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-10 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/vic10/std.c b/src/emu/bus/vic10/std.c
index dfdecd34f81..a0cd1aa67cf 100644
--- a/src/emu/bus/vic10/std.c
+++ b/src/emu/bus/vic10/std.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-10 Standard 8K/16K ROM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/vic10/std.h b/src/emu/bus/vic10/std.h
index ca5fc55f593..cdbaef140de 100644
--- a/src/emu/bus/vic10/std.h
+++ b/src/emu/bus/vic10/std.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-10 Standard 8K/16K ROM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/4cga.c b/src/emu/bus/vic20/4cga.c
index 8b369b6f527..67901823065 100644
--- a/src/emu/bus/vic20/4cga.c
+++ b/src/emu/bus/vic20/4cga.c
@@ -7,9 +7,6 @@
     http://www.protovision-online.com/hardw/4_player.htm
     http://hitmen.c02.at/html/hardware.html
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "4cga.h"
diff --git a/src/emu/bus/vic20/4cga.h b/src/emu/bus/vic20/4cga.h
index dc29d646e41..b852c5e0958 100644
--- a/src/emu/bus/vic20/4cga.h
+++ b/src/emu/bus/vic20/4cga.h
@@ -4,9 +4,6 @@
 
     Classical Games/Protovision 4 Player Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/exp.c b/src/emu/bus/vic20/exp.c
index a6f80554593..bab88756ff5 100644
--- a/src/emu/bus/vic20/exp.c
+++ b/src/emu/bus/vic20/exp.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/vic20/exp.h b/src/emu/bus/vic20/exp.h
index 13d3ccef43d..8dfd840fa22 100644
--- a/src/emu/bus/vic20/exp.h
+++ b/src/emu/bus/vic20/exp.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/vic20/fe3.c b/src/emu/bus/vic20/fe3.c
index d7a7616cfca..6b9cc319cd4 100644
--- a/src/emu/bus/vic20/fe3.c
+++ b/src/emu/bus/vic20/fe3.c
@@ -4,9 +4,6 @@
 
     Final Expansion v3 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/vic20/fe3.h b/src/emu/bus/vic20/fe3.h
index 9a209f44fbe..f42ae0e2f94 100644
--- a/src/emu/bus/vic20/fe3.h
+++ b/src/emu/bus/vic20/fe3.h
@@ -4,9 +4,6 @@
 
     Final Expansion v3 cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/megacart.c b/src/emu/bus/vic20/megacart.c
index 582bd3de6d9..e92e1dbbc55 100644
--- a/src/emu/bus/vic20/megacart.c
+++ b/src/emu/bus/vic20/megacart.c
@@ -4,9 +4,6 @@
 
     Mega-Cart cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "megacart.h"
diff --git a/src/emu/bus/vic20/megacart.h b/src/emu/bus/vic20/megacart.h
index 6440925ed9f..5e9f82b10bf 100644
--- a/src/emu/bus/vic20/megacart.h
+++ b/src/emu/bus/vic20/megacart.h
@@ -4,9 +4,6 @@
 
     Mega-Cart cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/std.c b/src/emu/bus/vic20/std.c
index f7729c41b0b..4757470b093 100644
--- a/src/emu/bus/vic20/std.c
+++ b/src/emu/bus/vic20/std.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 Standard 8K/16K ROM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/vic20/std.h b/src/emu/bus/vic20/std.h
index 0b74be61779..e7a70d338e5 100644
--- a/src/emu/bus/vic20/std.h
+++ b/src/emu/bus/vic20/std.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 Standard 8K/16K ROM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/user.c b/src/emu/bus/vic20/user.c
index 0f918b05c44..f810cddc46e 100644
--- a/src/emu/bus/vic20/user.c
+++ b/src/emu/bus/vic20/user.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "user.h"
diff --git a/src/emu/bus/vic20/user.h b/src/emu/bus/vic20/user.h
index 019893172bd..2273a744917 100644
--- a/src/emu/bus/vic20/user.h
+++ b/src/emu/bus/vic20/user.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-20 User Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      A       GND
diff --git a/src/emu/bus/vic20/vic1010.c b/src/emu/bus/vic20/vic1010.c
index 4dc380d29ab..98fd3552afa 100644
--- a/src/emu/bus/vic20/vic1010.c
+++ b/src/emu/bus/vic20/vic1010.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-1010 Expansion Module emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1010.h"
diff --git a/src/emu/bus/vic20/vic1010.h b/src/emu/bus/vic20/vic1010.h
index ea6e3dae9dd..56f194635b8 100644
--- a/src/emu/bus/vic20/vic1010.h
+++ b/src/emu/bus/vic20/vic1010.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-1010 Expansion Module emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/vic1011.c b/src/emu/bus/vic20/vic1011.c
index d813d9bbd4d..402a44f41df 100644
--- a/src/emu/bus/vic20/vic1011.c
+++ b/src/emu/bus/vic20/vic1011.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-1011A/B RS-232C Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1011.h"
diff --git a/src/emu/bus/vic20/vic1011.h b/src/emu/bus/vic20/vic1011.h
index 10c2963b75d..9ec16e5fd2a 100644
--- a/src/emu/bus/vic20/vic1011.h
+++ b/src/emu/bus/vic20/vic1011.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-1011A/B RS-232C Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/vic1110.c b/src/emu/bus/vic20/vic1110.c
index aea20954cf5..c8d9acb1398 100644
--- a/src/emu/bus/vic20/vic1110.c
+++ b/src/emu/bus/vic20/vic1110.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-1110 8K RAM Expansion Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1110.h"
diff --git a/src/emu/bus/vic20/vic1110.h b/src/emu/bus/vic20/vic1110.h
index 33241beedb5..4b6aecebd5a 100644
--- a/src/emu/bus/vic20/vic1110.h
+++ b/src/emu/bus/vic20/vic1110.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-1110 8K RAM Expansion Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/vic1111.c b/src/emu/bus/vic20/vic1111.c
index 35cfa72f2c4..770d5639d8f 100644
--- a/src/emu/bus/vic20/vic1111.c
+++ b/src/emu/bus/vic20/vic1111.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-1111 16K RAM Expansion Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1111.h"
diff --git a/src/emu/bus/vic20/vic1111.h b/src/emu/bus/vic20/vic1111.h
index 3743b335188..e20dc4a8e2d 100644
--- a/src/emu/bus/vic20/vic1111.h
+++ b/src/emu/bus/vic20/vic1111.h
@@ -4,9 +4,6 @@
 
     Commodore VIC-1111 16K RAM Expansion Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/vic1112.c b/src/emu/bus/vic20/vic1112.c
index 93b9c13c94b..482f7f01b03 100644
--- a/src/emu/bus/vic20/vic1112.c
+++ b/src/emu/bus/vic20/vic1112.c
@@ -4,9 +4,6 @@
 
     Commodore VIC-1112 IEEE-488 Interface Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1112.h"
diff --git a/src/emu/bus/vic20/vic1112.h b/src/emu/bus/vic20/vic1112.h
index 60544edee1e..6149866c020 100644
--- a/src/emu/bus/vic20/vic1112.h
+++ b/src/emu/bus/vic20/vic1112.h
@@ -6,9 +6,6 @@
 
     SYS 45065 to start
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vic20/vic1210.c b/src/emu/bus/vic20/vic1210.c
index d4236182142..5acb518cd08 100644
--- a/src/emu/bus/vic20/vic1210.c
+++ b/src/emu/bus/vic20/vic1210.c
@@ -5,9 +5,6 @@
     Commodore VIC-1210 3K RAM Expansion Cartridge emulation
     Commodore VIC-1211A Super Expander with 3K RAM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vic1210.h"
diff --git a/src/emu/bus/vic20/vic1210.h b/src/emu/bus/vic20/vic1210.h
index 8e30bf23090..904336dd6c0 100644
--- a/src/emu/bus/vic20/vic1210.h
+++ b/src/emu/bus/vic20/vic1210.h
@@ -5,9 +5,6 @@
     Commodore VIC-1210 3K RAM Expansion Cartridge emulation
     Commodore VIC-1211A Super Expander with 3K RAM Cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vidbrain/exp.c b/src/emu/bus/vidbrain/exp.c
index e388aecbf03..e3634283efa 100644
--- a/src/emu/bus/vidbrain/exp.c
+++ b/src/emu/bus/vidbrain/exp.c
@@ -4,9 +4,6 @@
 
     VideoBrain Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/vidbrain/exp.h b/src/emu/bus/vidbrain/exp.h
index 326ccfd43c4..8e6064dbc94 100644
--- a/src/emu/bus/vidbrain/exp.h
+++ b/src/emu/bus/vidbrain/exp.h
@@ -4,9 +4,6 @@
 
     VideoBrain Expansion Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                     GND       1      2       BO2
diff --git a/src/emu/bus/vidbrain/money_minder.c b/src/emu/bus/vidbrain/money_minder.c
index 98df3830963..f5fa70bd868 100644
--- a/src/emu/bus/vidbrain/money_minder.c
+++ b/src/emu/bus/vidbrain/money_minder.c
@@ -4,9 +4,6 @@
 
     VideoBrain Money Minder cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "money_minder.h"
diff --git a/src/emu/bus/vidbrain/money_minder.h b/src/emu/bus/vidbrain/money_minder.h
index 20bdaf1f1e5..9cdd6c8f4e6 100644
--- a/src/emu/bus/vidbrain/money_minder.h
+++ b/src/emu/bus/vidbrain/money_minder.h
@@ -4,9 +4,6 @@
 
     VideoBrain Money Minder cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vidbrain/std.c b/src/emu/bus/vidbrain/std.c
index cbfbf6e20d3..f56f5fd9d9f 100644
--- a/src/emu/bus/vidbrain/std.c
+++ b/src/emu/bus/vidbrain/std.c
@@ -4,9 +4,6 @@
 
     VideoBrain Standard 2K/4K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "std.h"
diff --git a/src/emu/bus/vidbrain/std.h b/src/emu/bus/vidbrain/std.h
index a0baea9e3a7..74e9b4096e8 100644
--- a/src/emu/bus/vidbrain/std.h
+++ b/src/emu/bus/vidbrain/std.h
@@ -4,9 +4,6 @@
 
     VideoBrain Standard 2K/4K cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vidbrain/timeshare.c b/src/emu/bus/vidbrain/timeshare.c
index ccb3f8781ad..196bf66db2e 100644
--- a/src/emu/bus/vidbrain/timeshare.c
+++ b/src/emu/bus/vidbrain/timeshare.c
@@ -4,9 +4,6 @@
 
     VideoBrain Timeshare cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "timeshare.h"
diff --git a/src/emu/bus/vidbrain/timeshare.h b/src/emu/bus/vidbrain/timeshare.h
index d4c10b4821e..6f57c04d32f 100644
--- a/src/emu/bus/vidbrain/timeshare.h
+++ b/src/emu/bus/vidbrain/timeshare.h
@@ -4,9 +4,6 @@
 
     VideoBrain Timeshare cartridge emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/byteio.c b/src/emu/bus/vip/byteio.c
index 5410cd8c9be..bdebad76dba 100644
--- a/src/emu/bus/vip/byteio.c
+++ b/src/emu/bus/vip/byteio.c
@@ -4,9 +4,6 @@
 
     RCA Cosmac VIP Byte Input/Output port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "byteio.h"
diff --git a/src/emu/bus/vip/byteio.h b/src/emu/bus/vip/byteio.h
index 2d8a8667814..fd696975c7c 100644
--- a/src/emu/bus/vip/byteio.h
+++ b/src/emu/bus/vip/byteio.h
@@ -4,9 +4,6 @@
 
     RCA Cosmac VIP Byte Input/Output port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                             A   IN 0
diff --git a/src/emu/bus/vip/exp.c b/src/emu/bus/vip/exp.c
index 11e11b3916c..4d83df7119a 100644
--- a/src/emu/bus/vip/exp.c
+++ b/src/emu/bus/vip/exp.c
@@ -4,9 +4,6 @@
 
     RCA Cosmac VIP Expansion Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "exp.h"
diff --git a/src/emu/bus/vip/exp.h b/src/emu/bus/vip/exp.h
index 5ff114f2402..37a33482db8 100644
--- a/src/emu/bus/vip/exp.h
+++ b/src/emu/bus/vip/exp.h
@@ -4,9 +4,6 @@
 
     RCA Cosmac VIP Expansion Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
                   CLOCK       1      A       _MWR
diff --git a/src/emu/bus/vip/vp550.c b/src/emu/bus/vip/vp550.c
index 6108c6d93d6..c5f4ed201e4 100644
--- a/src/emu/bus/vip/vp550.c
+++ b/src/emu/bus/vip/vp550.c
@@ -4,9 +4,6 @@
 
     RCA VIP Super Sound System VP550 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/vip/vp550.h b/src/emu/bus/vip/vp550.h
index c4de33993e8..1045871b5d7 100644
--- a/src/emu/bus/vip/vp550.h
+++ b/src/emu/bus/vip/vp550.h
@@ -4,9 +4,6 @@
 
     RCA VIP Super Sound System VP550 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp570.c b/src/emu/bus/vip/vp570.c
index 2f357ad14d9..42ec4119c21 100644
--- a/src/emu/bus/vip/vp570.c
+++ b/src/emu/bus/vip/vp570.c
@@ -4,9 +4,6 @@
 
     RCA VIP Expansion Board VP-570 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp570.h"
diff --git a/src/emu/bus/vip/vp570.h b/src/emu/bus/vip/vp570.h
index 23b0d047384..2a382a064f5 100644
--- a/src/emu/bus/vip/vp570.h
+++ b/src/emu/bus/vip/vp570.h
@@ -4,9 +4,6 @@
 
     RCA VIP Memory Expansion Board VP-570 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp575.c b/src/emu/bus/vip/vp575.c
index 29aebe42106..c7801e9c414 100644
--- a/src/emu/bus/vip/vp575.c
+++ b/src/emu/bus/vip/vp575.c
@@ -4,9 +4,6 @@
 
     RCA VIP Expansion Board VP-575 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp575.h"
diff --git a/src/emu/bus/vip/vp575.h b/src/emu/bus/vip/vp575.h
index 49517880192..83ea31fd277 100644
--- a/src/emu/bus/vip/vp575.h
+++ b/src/emu/bus/vip/vp575.h
@@ -4,9 +4,6 @@
 
     RCA VIP Expansion Board VP-575 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp585.c b/src/emu/bus/vip/vp585.c
index 663bd61d8fc..dd51edebcff 100644
--- a/src/emu/bus/vip/vp585.c
+++ b/src/emu/bus/vip/vp585.c
@@ -4,9 +4,6 @@
 
     RCA VIP Expansion Keypad Interface Board VP585 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp585.h"
diff --git a/src/emu/bus/vip/vp585.h b/src/emu/bus/vip/vp585.h
index 6ed7803ed15..2bda8647c57 100644
--- a/src/emu/bus/vip/vp585.h
+++ b/src/emu/bus/vip/vp585.h
@@ -4,9 +4,6 @@
 
     RCA VIP Expansion Keypad Interface Board VP585 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp590.c b/src/emu/bus/vip/vp590.c
index 9b05d4441f5..e4a045388dd 100644
--- a/src/emu/bus/vip/vp590.c
+++ b/src/emu/bus/vip/vp590.c
@@ -4,9 +4,6 @@
 
     RCA VIP Color Board VP590 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp590.h"
diff --git a/src/emu/bus/vip/vp590.h b/src/emu/bus/vip/vp590.h
index 81db82f10ea..e4be2ab48fa 100644
--- a/src/emu/bus/vip/vp590.h
+++ b/src/emu/bus/vip/vp590.h
@@ -4,9 +4,6 @@
 
     RCA VIP Color Board VP590 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp595.c b/src/emu/bus/vip/vp595.c
index 72d69ee744e..d2ed10de18d 100644
--- a/src/emu/bus/vip/vp595.c
+++ b/src/emu/bus/vip/vp595.c
@@ -4,9 +4,6 @@
 
     RCA VIP Simple Sound Board VP595 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp595.h"
diff --git a/src/emu/bus/vip/vp595.h b/src/emu/bus/vip/vp595.h
index 0a788e4a585..bd7bcdbdbe7 100644
--- a/src/emu/bus/vip/vp595.h
+++ b/src/emu/bus/vip/vp595.h
@@ -4,9 +4,6 @@
 
     RCA VIP Simple Sound Board VP595 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp620.c b/src/emu/bus/vip/vp620.c
index b7dffc2f013..42a00b37444 100644
--- a/src/emu/bus/vip/vp620.c
+++ b/src/emu/bus/vip/vp620.c
@@ -4,9 +4,6 @@
 
     RCA VIP ASCII Keyboard Interface VP-620 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp620.h"
diff --git a/src/emu/bus/vip/vp620.h b/src/emu/bus/vip/vp620.h
index 509820fd2d8..67400cd2304 100644
--- a/src/emu/bus/vip/vp620.h
+++ b/src/emu/bus/vip/vp620.h
@@ -4,9 +4,6 @@
 
     RCA VIP ASCII Keyboard Interface VP-620 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vip/vp700.c b/src/emu/bus/vip/vp700.c
index dda6b9e7bf6..7d9b32536a7 100644
--- a/src/emu/bus/vip/vp700.c
+++ b/src/emu/bus/vip/vp700.c
@@ -4,9 +4,6 @@
 
     RCA VIP Tiny BASIC VP-700 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "vp700.h"
diff --git a/src/emu/bus/vip/vp700.h b/src/emu/bus/vip/vp700.h
index 62194a2c96a..8f521199d76 100644
--- a/src/emu/bus/vip/vp700.h
+++ b/src/emu/bus/vip/vp700.h
@@ -4,9 +4,6 @@
 
     RCA VIP Tiny BASIC VP-700 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/vtech/ioexp/carts.c b/src/emu/bus/vtech/ioexp/carts.c
index bf9a44ed467..7d0eff19aae 100644
--- a/src/emu/bus/vtech/ioexp/carts.c
+++ b/src/emu/bus/vtech/ioexp/carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ I/O Expansion Slot Devices
diff --git a/src/emu/bus/vtech/ioexp/carts.h b/src/emu/bus/vtech/ioexp/carts.h
index fb7cf41cd9f..cfcbf512848 100644
--- a/src/emu/bus/vtech/ioexp/carts.h
+++ b/src/emu/bus/vtech/ioexp/carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ I/O Expansion Slot Devices
diff --git a/src/emu/bus/vtech/ioexp/ioexp.c b/src/emu/bus/vtech/ioexp/ioexp.c
index cf1106a511a..24c9add58aa 100644
--- a/src/emu/bus/vtech/ioexp/ioexp.c
+++ b/src/emu/bus/vtech/ioexp/ioexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ I/O Expansion Slot
diff --git a/src/emu/bus/vtech/ioexp/ioexp.h b/src/emu/bus/vtech/ioexp/ioexp.h
index b82962ee0ee..cbf7c686b70 100644
--- a/src/emu/bus/vtech/ioexp/ioexp.h
+++ b/src/emu/bus/vtech/ioexp/ioexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ I/O Expansion Slot
diff --git a/src/emu/bus/vtech/ioexp/joystick.c b/src/emu/bus/vtech/ioexp/joystick.c
index 1b3437436f0..ec433aa1861 100644
--- a/src/emu/bus/vtech/ioexp/joystick.c
+++ b/src/emu/bus/vtech/ioexp/joystick.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Joystick Interface
diff --git a/src/emu/bus/vtech/ioexp/joystick.h b/src/emu/bus/vtech/ioexp/joystick.h
index 0226f517393..6904853d3ec 100644
--- a/src/emu/bus/vtech/ioexp/joystick.h
+++ b/src/emu/bus/vtech/ioexp/joystick.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser Joystick Interface
diff --git a/src/emu/bus/vtech/ioexp/printer.c b/src/emu/bus/vtech/ioexp/printer.c
index b3342d54a0a..bf5c6681c41 100644
--- a/src/emu/bus/vtech/ioexp/printer.c
+++ b/src/emu/bus/vtech/ioexp/printer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Printer Interface
diff --git a/src/emu/bus/vtech/ioexp/printer.h b/src/emu/bus/vtech/ioexp/printer.h
index ed3010c5f73..762cf41a6e8 100644
--- a/src/emu/bus/vtech/ioexp/printer.h
+++ b/src/emu/bus/vtech/ioexp/printer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Printer Interface
diff --git a/src/emu/bus/vtech/memexp/carts.c b/src/emu/bus/vtech/memexp/carts.c
index b166e30ff07..a8c044a792b 100644
--- a/src/emu/bus/vtech/memexp/carts.c
+++ b/src/emu/bus/vtech/memexp/carts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Memory Expansion Slot Devices
diff --git a/src/emu/bus/vtech/memexp/carts.h b/src/emu/bus/vtech/memexp/carts.h
index c00f069f79d..e9e7440dcfb 100644
--- a/src/emu/bus/vtech/memexp/carts.h
+++ b/src/emu/bus/vtech/memexp/carts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Memory Expansion Slot Devices
diff --git a/src/emu/bus/vtech/memexp/floppy.c b/src/emu/bus/vtech/memexp/floppy.c
index a773fc0a244..3b46b3ff3eb 100644
--- a/src/emu/bus/vtech/memexp/floppy.c
+++ b/src/emu/bus/vtech/memexp/floppy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Floppy Controller Cartridge
diff --git a/src/emu/bus/vtech/memexp/floppy.h b/src/emu/bus/vtech/memexp/floppy.h
index a5d0aa12757..47a36c10721 100644
--- a/src/emu/bus/vtech/memexp/floppy.h
+++ b/src/emu/bus/vtech/memexp/floppy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Floppy Controller Cartridge
diff --git a/src/emu/bus/vtech/memexp/memexp.c b/src/emu/bus/vtech/memexp/memexp.c
index 55207612c51..c74c7e4ca2e 100644
--- a/src/emu/bus/vtech/memexp/memexp.c
+++ b/src/emu/bus/vtech/memexp/memexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Memory Expansion Slot
diff --git a/src/emu/bus/vtech/memexp/memexp.h b/src/emu/bus/vtech/memexp/memexp.h
index 38aceb2835c..880cee4ea30 100644
--- a/src/emu/bus/vtech/memexp/memexp.h
+++ b/src/emu/bus/vtech/memexp/memexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Memory Expansion Slot
diff --git a/src/emu/bus/vtech/memexp/memory.c b/src/emu/bus/vtech/memexp/memory.c
index 11f1aeaaf4c..76cba20af67 100644
--- a/src/emu/bus/vtech/memexp/memory.c
+++ b/src/emu/bus/vtech/memexp/memory.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Laser Memory Expansions
diff --git a/src/emu/bus/vtech/memexp/memory.h b/src/emu/bus/vtech/memexp/memory.h
index b51bdeb60e0..bb487ac1d1e 100644
--- a/src/emu/bus/vtech/memexp/memory.h
+++ b/src/emu/bus/vtech/memexp/memory.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VTech Laser/VZ Memory Expansions
diff --git a/src/emu/bus/vtech/memexp/rs232.c b/src/emu/bus/vtech/memexp/rs232.c
index 5951b541707..fa9d0730d6d 100644
--- a/src/emu/bus/vtech/memexp/rs232.c
+++ b/src/emu/bus/vtech/memexp/rs232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dick Smith VZ-200/300 RS-232 Cartridge
diff --git a/src/emu/bus/vtech/memexp/rs232.h b/src/emu/bus/vtech/memexp/rs232.h
index 9314b6c6721..2e254ea9571 100644
--- a/src/emu/bus/vtech/memexp/rs232.h
+++ b/src/emu/bus/vtech/memexp/rs232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dick Smith VZ-200/300 RS-232 Cartridge
diff --git a/src/emu/bus/vtech/memexp/wordpro.c b/src/emu/bus/vtech/memexp/wordpro.c
index 1e5a51fd9d7..12bf18b2a1d 100644
--- a/src/emu/bus/vtech/memexp/wordpro.c
+++ b/src/emu/bus/vtech/memexp/wordpro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dick Smith VZ-300 WordPro Cartridge
diff --git a/src/emu/bus/vtech/memexp/wordpro.h b/src/emu/bus/vtech/memexp/wordpro.h
index 58caa365251..73a7acdd405 100644
--- a/src/emu/bus/vtech/memexp/wordpro.h
+++ b/src/emu/bus/vtech/memexp/wordpro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dick Smith VZ-300 WordPro Cartridge
diff --git a/src/emu/bus/wangpc/emb.c b/src/emu/bus/wangpc/emb.c
index d10072e6865..e53b8ea2308 100644
--- a/src/emu/bus/wangpc/emb.c
+++ b/src/emu/bus/wangpc/emb.c
@@ -4,9 +4,6 @@
 
     Wang PC-PM031-B Extended Memory Board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emb.h"
diff --git a/src/emu/bus/wangpc/emb.h b/src/emu/bus/wangpc/emb.h
index ff2eb2a97cb..169cb68a428 100644
--- a/src/emu/bus/wangpc/emb.h
+++ b/src/emu/bus/wangpc/emb.h
@@ -4,9 +4,6 @@
 
     Wang PC-PM031-B Extended Memory Board emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/lic.c b/src/emu/bus/wangpc/lic.c
index 0d7c3f370bf..cebc359a942 100644
--- a/src/emu/bus/wangpc/lic.c
+++ b/src/emu/bus/wangpc/lic.c
@@ -4,9 +4,6 @@
 
     Wang PC Network card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "lic.h"
diff --git a/src/emu/bus/wangpc/lic.h b/src/emu/bus/wangpc/lic.h
index af3b0a0213a..5fb1d792bcd 100644
--- a/src/emu/bus/wangpc/lic.h
+++ b/src/emu/bus/wangpc/lic.h
@@ -4,9 +4,6 @@
 
     Wang PC-PM070 Local Interconnect option card emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/lvc.c b/src/emu/bus/wangpc/lvc.c
index 329d225fc4e..fb0ef5e9325 100644
--- a/src/emu/bus/wangpc/lvc.c
+++ b/src/emu/bus/wangpc/lvc.c
@@ -4,9 +4,6 @@
 
     Wang PC Low-Resolution Video Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/wangpc/lvc.h b/src/emu/bus/wangpc/lvc.h
index 239f2f0d880..9f758f24c06 100644
--- a/src/emu/bus/wangpc/lvc.h
+++ b/src/emu/bus/wangpc/lvc.h
@@ -4,9 +4,6 @@
 
     Wang PC Low-Resolution Video Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/mcc.c b/src/emu/bus/wangpc/mcc.c
index 5fac3131f0d..35a664201b9 100644
--- a/src/emu/bus/wangpc/mcc.c
+++ b/src/emu/bus/wangpc/mcc.c
@@ -4,9 +4,6 @@
 
     Wang PC-PM043 Multiport Communications Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/wangpc/mcc.h b/src/emu/bus/wangpc/mcc.h
index 11efcc9417d..a87be116251 100644
--- a/src/emu/bus/wangpc/mcc.h
+++ b/src/emu/bus/wangpc/mcc.h
@@ -4,9 +4,6 @@
 
     Wang PC-PM043 Multiport Communications Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/mvc.c b/src/emu/bus/wangpc/mvc.c
index b3549e0dc29..9a2e74a0f4a 100644
--- a/src/emu/bus/wangpc/mvc.c
+++ b/src/emu/bus/wangpc/mvc.c
@@ -4,9 +4,6 @@
 
     Wang PC PM-001B Medium-Resolution Video Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/wangpc/mvc.h b/src/emu/bus/wangpc/mvc.h
index 16cfaa8e978..6521aee33a4 100644
--- a/src/emu/bus/wangpc/mvc.h
+++ b/src/emu/bus/wangpc/mvc.h
@@ -4,9 +4,6 @@
 
     Wang PC PM-001B Medium-Resolution Video Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/rtc.c b/src/emu/bus/wangpc/rtc.c
index 06c97f409c4..2f2ea7a073f 100644
--- a/src/emu/bus/wangpc/rtc.c
+++ b/src/emu/bus/wangpc/rtc.c
@@ -4,9 +4,6 @@
 
     Wang PC-PM040-B Remote Telecommunication controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "rtc.h"
diff --git a/src/emu/bus/wangpc/rtc.h b/src/emu/bus/wangpc/rtc.h
index 46c04e6ff6a..1162c743f23 100644
--- a/src/emu/bus/wangpc/rtc.h
+++ b/src/emu/bus/wangpc/rtc.h
@@ -4,9 +4,6 @@
 
     Wang PC-PM040-B Remote Telecommunication controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/tig.c b/src/emu/bus/wangpc/tig.c
index 6c2849eb89c..a2b7214c054 100644
--- a/src/emu/bus/wangpc/tig.c
+++ b/src/emu/bus/wangpc/tig.c
@@ -4,9 +4,6 @@
 
     Wang PC Text/Image/Graphics controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/bus/wangpc/tig.h b/src/emu/bus/wangpc/tig.h
index bf73f97148a..66b29c0ad3d 100644
--- a/src/emu/bus/wangpc/tig.h
+++ b/src/emu/bus/wangpc/tig.h
@@ -4,9 +4,6 @@
 
     Wang PC PM-001B Medium-Resolution Video Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wangpc/wangpc.c b/src/emu/bus/wangpc/wangpc.c
index ec3782f5cc6..d5773f8e283 100644
--- a/src/emu/bus/wangpc/wangpc.c
+++ b/src/emu/bus/wangpc/wangpc.c
@@ -4,9 +4,6 @@
 
     Wang Professional Computer bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "wangpc.h"
diff --git a/src/emu/bus/wangpc/wangpc.h b/src/emu/bus/wangpc/wangpc.h
index a0a24674c3a..2870a4e4ec5 100644
--- a/src/emu/bus/wangpc/wangpc.h
+++ b/src/emu/bus/wangpc/wangpc.h
@@ -4,9 +4,6 @@
 
     Wang Professional Computer bus emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
 
 
diff --git a/src/emu/bus/wangpc/wdc.c b/src/emu/bus/wangpc/wdc.c
index baee272af28..cfb0307473d 100644
--- a/src/emu/bus/wangpc/wdc.c
+++ b/src/emu/bus/wangpc/wdc.c
@@ -4,9 +4,6 @@
 
     Wang PC-PM001 Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "wdc.h"
diff --git a/src/emu/bus/wangpc/wdc.h b/src/emu/bus/wangpc/wdc.h
index ac0dab4f125..156dc4c10a9 100644
--- a/src/emu/bus/wangpc/wdc.h
+++ b/src/emu/bus/wangpc/wdc.h
@@ -4,9 +4,6 @@
 
     Wang PC-PM001 Winchester Disk Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/bus/wswan/rom.c b/src/emu/bus/wswan/rom.c
index 480df9bce35..687d6e617c8 100644
--- a/src/emu/bus/wswan/rom.c
+++ b/src/emu/bus/wswan/rom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
 
diff --git a/src/emu/bus/wswan/rom.h b/src/emu/bus/wswan/rom.h
index 7c64f8cda02..839dc2a2890 100644
--- a/src/emu/bus/wswan/rom.h
+++ b/src/emu/bus/wswan/rom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __WS_ROM_H
 #define __WS_ROM_H
 
diff --git a/src/emu/bus/wswan/slot.c b/src/emu/bus/wswan/slot.c
index 0ce55bac515..17ef023f1f8 100644
--- a/src/emu/bus/wswan/slot.c
+++ b/src/emu/bus/wswan/slot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 
     Bandai Wonderswan / Wonderswan Color cart emulation
diff --git a/src/emu/bus/wswan/slot.h b/src/emu/bus/wswan/slot.h
index 6e0c9182369..4f0294f51af 100644
--- a/src/emu/bus/wswan/slot.h
+++ b/src/emu/bus/wswan/slot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __WS_SLOT_H
 #define __WS_SLOT_H
 
diff --git a/src/emu/bus/x68k/x68k_neptunex.c b/src/emu/bus/x68k/x68k_neptunex.c
index dd2f2b875e3..7bf801e2277 100644
--- a/src/emu/bus/x68k/x68k_neptunex.c
+++ b/src/emu/bus/x68k/x68k_neptunex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68k_neptunex.c
  */
diff --git a/src/emu/bus/x68k/x68k_neptunex.h b/src/emu/bus/x68k/x68k_neptunex.h
index 277f902c74e..3f18ba08e0e 100644
--- a/src/emu/bus/x68k/x68k_neptunex.h
+++ b/src/emu/bus/x68k/x68k_neptunex.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68k_neptunex.h
  *
diff --git a/src/emu/bus/x68k/x68k_scsiext.c b/src/emu/bus/x68k/x68k_scsiext.c
index 9a7940a7597..cd4089d69c7 100644
--- a/src/emu/bus/x68k/x68k_scsiext.c
+++ b/src/emu/bus/x68k/x68k_scsiext.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68k_scsiext.c
  *
diff --git a/src/emu/bus/x68k/x68k_scsiext.h b/src/emu/bus/x68k/x68k_scsiext.h
index 74550ff8eb1..2eb841cc89e 100644
--- a/src/emu/bus/x68k/x68k_scsiext.h
+++ b/src/emu/bus/x68k/x68k_scsiext.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68k_scsiext.h
  *
diff --git a/src/emu/bus/x68k/x68kexp.c b/src/emu/bus/x68k/x68kexp.c
index 1930904dcc5..931f5846581 100644
--- a/src/emu/bus/x68k/x68kexp.c
+++ b/src/emu/bus/x68k/x68kexp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68kexp.c
  */
diff --git a/src/emu/bus/x68k/x68kexp.h b/src/emu/bus/x68k/x68kexp.h
index cabca04e8f0..f80d3379ded 100644
--- a/src/emu/bus/x68k/x68kexp.h
+++ b/src/emu/bus/x68k/x68kexp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * x68kexp.h
  *
diff --git a/src/emu/config.c b/src/emu/config.c
index 3a4b603432d..3c206159e66 100644
--- a/src/emu/config.c
+++ b/src/emu/config.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     config.c
diff --git a/src/emu/config.h b/src/emu/config.h
index 56702cd1c70..883328d5997 100644
--- a/src/emu/config.h
+++ b/src/emu/config.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     config.h
diff --git a/src/emu/cpu/8x300/8x300.c b/src/emu/cpu/8x300/8x300.c
index 517e205c5a2..3a359e4aacc 100644
--- a/src/emu/cpu/8x300/8x300.c
+++ b/src/emu/cpu/8x300/8x300.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * 8x300.c
  *
diff --git a/src/emu/cpu/8x300/8x300.h b/src/emu/cpu/8x300/8x300.h
index 116fef0119e..59dc37ca581 100644
--- a/src/emu/cpu/8x300/8x300.h
+++ b/src/emu/cpu/8x300/8x300.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * 8x300.h
  *
diff --git a/src/emu/cpu/8x300/8x300dasm.c b/src/emu/cpu/8x300/8x300dasm.c
index 40533fccdd7..7ca7745bf6f 100644
--- a/src/emu/cpu/8x300/8x300dasm.c
+++ b/src/emu/cpu/8x300/8x300dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * 8x300dasm.c
  *  Implementation of the Scientific Micro Systems SMS300 / Signetics 8X300 Microcontroller
diff --git a/src/emu/cpu/adsp2100/2100dasm.c b/src/emu/cpu/adsp2100/2100dasm.c
index ec71a7d0432..e669a7423de 100644
--- a/src/emu/cpu/adsp2100/2100dasm.c
+++ b/src/emu/cpu/adsp2100/2100dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "adsp2100.h"
 
diff --git a/src/emu/cpu/alph8201/8201dasm.c b/src/emu/cpu/alph8201/8201dasm.c
index 8b3b6d96a37..de636a8a343 100644
--- a/src/emu/cpu/alph8201/8201dasm.c
+++ b/src/emu/cpu/alph8201/8201dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
                          Alpha 8201/8301 Disassembler
 
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index 6fb73a1eb4a..6bae2398c86 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
                          Alpha8201 Emulator
 
diff --git a/src/emu/cpu/alph8201/alph8201.h b/src/emu/cpu/alph8201/alph8201.h
index 48f0f284a6a..ea9d42d12c0 100644
--- a/src/emu/cpu/alph8201/alph8201.h
+++ b/src/emu/cpu/alph8201/alph8201.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                      Alpha8201 Emulator                                  *
 	*                                                                          *
diff --git a/src/emu/cpu/alto2/a2curt.c b/src/emu/cpu/alto2/a2curt.c
index c721d83c328..c5d9353f768 100644
--- a/src/emu/cpu/alto2/a2curt.c
+++ b/src/emu/cpu/alto2/a2curt.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII cursor task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2curt.h b/src/emu/cpu/alto2/a2curt.h
index 3e2d840f1d4..937f1b4d450 100644
--- a/src/emu/cpu/alto2/a2curt.h
+++ b/src/emu/cpu/alto2/a2curt.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII cursor task (CURT)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2dht.c b/src/emu/cpu/alto2/a2dht.c
index 61f63b6a74e..3b70d371259 100644
--- a/src/emu/cpu/alto2/a2dht.c
+++ b/src/emu/cpu/alto2/a2dht.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display horizontal task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2dht.h b/src/emu/cpu/alto2/a2dht.h
index 2415e9133f1..615c3d7d86b 100644
--- a/src/emu/cpu/alto2/a2dht.h
+++ b/src/emu/cpu/alto2/a2dht.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display horizontal task (DHT)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2disk.c b/src/emu/cpu/alto2/a2disk.c
index d112420bf7e..1a8736962bb 100644
--- a/src/emu/cpu/alto2/a2disk.c
+++ b/src/emu/cpu/alto2/a2disk.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2disk.h b/src/emu/cpu/alto2/a2disk.h
index c1d44bd7a03..5fd994f654e 100644
--- a/src/emu/cpu/alto2/a2disk.h
+++ b/src/emu/cpu/alto2/a2disk.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk controller block
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2disp.c b/src/emu/cpu/alto2/a2disp.c
index 73ae8a603ff..3f902431efa 100644
--- a/src/emu/cpu/alto2/a2disp.c
+++ b/src/emu/cpu/alto2/a2disp.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/a2disp.h b/src/emu/cpu/alto2/a2disp.h
index 3eb27227bee..80454eb4896 100644
--- a/src/emu/cpu/alto2/a2disp.h
+++ b/src/emu/cpu/alto2/a2disp.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display block
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2dvt.c b/src/emu/cpu/alto2/a2dvt.c
index 124acf3b606..acb51d92e7c 100644
--- a/src/emu/cpu/alto2/a2dvt.c
+++ b/src/emu/cpu/alto2/a2dvt.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display vertical task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2dvt.h b/src/emu/cpu/alto2/a2dvt.h
index 1afe28fa53b..3b73ac7bf7e 100644
--- a/src/emu/cpu/alto2/a2dvt.h
+++ b/src/emu/cpu/alto2/a2dvt.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display vertical task (DVT)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2dwt.c b/src/emu/cpu/alto2/a2dwt.c
index 07c5f07ae65..19831e3fd46 100644
--- a/src/emu/cpu/alto2/a2dwt.c
+++ b/src/emu/cpu/alto2/a2dwt.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display word task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2dwt.h b/src/emu/cpu/alto2/a2dwt.h
index f4bdb91f890..74c6c94939b 100644
--- a/src/emu/cpu/alto2/a2dwt.h
+++ b/src/emu/cpu/alto2/a2dwt.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII display word task (DWT)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2emu.c b/src/emu/cpu/alto2/a2emu.c
index d62d6a6e523..fd30fa1d0f8 100644
--- a/src/emu/cpu/alto2/a2emu.c
+++ b/src/emu/cpu/alto2/a2emu.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII emulator task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2emu.h b/src/emu/cpu/alto2/a2emu.h
index d119e6538f4..344c7ff2c71 100644
--- a/src/emu/cpu/alto2/a2emu.h
+++ b/src/emu/cpu/alto2/a2emu.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII emulator task (EMU)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2ether.c b/src/emu/cpu/alto2/a2ether.c
index 7de3a30aa4b..32d8a716f49 100644
--- a/src/emu/cpu/alto2/a2ether.c
+++ b/src/emu/cpu/alto2/a2ether.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII ethernet task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/a2ether.h b/src/emu/cpu/alto2/a2ether.h
index 2082801e205..6bdbd24ce3e 100644
--- a/src/emu/cpu/alto2/a2ether.h
+++ b/src/emu/cpu/alto2/a2ether.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII ethernet task (ETHER)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2hw.c b/src/emu/cpu/alto2/a2hw.c
index d603c0aec47..cc8a77c3f54 100644
--- a/src/emu/cpu/alto2/a2hw.c
+++ b/src/emu/cpu/alto2/a2hw.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory mapped I/O hardware
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/a2hw.h b/src/emu/cpu/alto2/a2hw.h
index 1ec9a72e8d4..49d20ff5e30 100644
--- a/src/emu/cpu/alto2/a2hw.h
+++ b/src/emu/cpu/alto2/a2hw.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory mapped i/o stuff (HW)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2jkff.h b/src/emu/cpu/alto2/a2jkff.h
index 429a6454eb1..687313607b1 100644
--- a/src/emu/cpu/alto2/a2jkff.h
+++ b/src/emu/cpu/alto2/a2jkff.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII Dual J/K flip-flop 74109 emulation
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2kbd.c b/src/emu/cpu/alto2/a2kbd.c
index c677c48d0b9..fa1bb5f9596 100644
--- a/src/emu/cpu/alto2/a2kbd.c
+++ b/src/emu/cpu/alto2/a2kbd.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory mapped I/O keyboard
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2kbd.h b/src/emu/cpu/alto2/a2kbd.h
index 021b7b64333..b7bf6607ee2 100644
--- a/src/emu/cpu/alto2/a2kbd.h
+++ b/src/emu/cpu/alto2/a2kbd.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII keyboard hardware (KBD)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2ksec.c b/src/emu/cpu/alto2/a2ksec.c
index 53ed96e3a6d..b6ca5359dc6 100644
--- a/src/emu/cpu/alto2/a2ksec.c
+++ b/src/emu/cpu/alto2/a2ksec.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk sector task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2ksec.h b/src/emu/cpu/alto2/a2ksec.h
index ffca9c44208..e0660bf70b1 100644
--- a/src/emu/cpu/alto2/a2ksec.h
+++ b/src/emu/cpu/alto2/a2ksec.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk sector task (KSEC)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2kwd.c b/src/emu/cpu/alto2/a2kwd.c
index 14beeb122b0..1eb060258a8 100644
--- a/src/emu/cpu/alto2/a2kwd.c
+++ b/src/emu/cpu/alto2/a2kwd.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk word task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2kwd.h b/src/emu/cpu/alto2/a2kwd.h
index 577f4e85a0f..7bd7a824a3b 100644
--- a/src/emu/cpu/alto2/a2kwd.h
+++ b/src/emu/cpu/alto2/a2kwd.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII disk word task (KWD)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2mem.c b/src/emu/cpu/alto2/a2mem.c
index c878f09040b..b84653ebdd9 100644
--- a/src/emu/cpu/alto2/a2mem.c
+++ b/src/emu/cpu/alto2/a2mem.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2mem.h b/src/emu/cpu/alto2/a2mem.h
index 2e0e4fa896b..c450693a22b 100644
--- a/src/emu/cpu/alto2/a2mem.h
+++ b/src/emu/cpu/alto2/a2mem.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory block (MEM)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2mouse.c b/src/emu/cpu/alto2/a2mouse.c
index 5588063d5f0..0844d45de6d 100644
--- a/src/emu/cpu/alto2/a2mouse.c
+++ b/src/emu/cpu/alto2/a2mouse.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII mouse interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/a2mouse.h b/src/emu/cpu/alto2/a2mouse.h
index b7f56c29de6..29d5e88ca5b 100644
--- a/src/emu/cpu/alto2/a2mouse.h
+++ b/src/emu/cpu/alto2/a2mouse.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII mouse hardware (MOUSE)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2mrt.c b/src/emu/cpu/alto2/a2mrt.c
index 51d3a34b0bb..c57cd85728f 100644
--- a/src/emu/cpu/alto2/a2mrt.c
+++ b/src/emu/cpu/alto2/a2mrt.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory refresh task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2mrt.h b/src/emu/cpu/alto2/a2mrt.h
index 647f6e63666..20b00724fc9 100644
--- a/src/emu/cpu/alto2/a2mrt.h
+++ b/src/emu/cpu/alto2/a2mrt.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII memory refresh task (MRT)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2part.c b/src/emu/cpu/alto2/a2part.c
index 52c8f61d69f..ecf9da51ea5 100644
--- a/src/emu/cpu/alto2/a2part.c
+++ b/src/emu/cpu/alto2/a2part.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII parity task
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2part.h b/src/emu/cpu/alto2/a2part.h
index 510348eaddd..0bc8583bbbc 100644
--- a/src/emu/cpu/alto2/a2part.h
+++ b/src/emu/cpu/alto2/a2part.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII parity task (PART)
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2ram.c b/src/emu/cpu/alto2/a2ram.c
index d7f68343bcc..92986996270 100644
--- a/src/emu/cpu/alto2/a2ram.c
+++ b/src/emu/cpu/alto2/a2ram.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII RAM related functions
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/alto2/a2ram.h b/src/emu/cpu/alto2/a2ram.h
index e9f6cce327a..0077ded7a99 100644
--- a/src/emu/cpu/alto2/a2ram.h
+++ b/src/emu/cpu/alto2/a2ram.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII RAM related tasks
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifdef  ALTO2_DEFINE_CONSTANTS
 
diff --git a/src/emu/cpu/alto2/a2roms.c b/src/emu/cpu/alto2/a2roms.c
index c9bace9da2e..1b859aa07aa 100644
--- a/src/emu/cpu/alto2/a2roms.c
+++ b/src/emu/cpu/alto2/a2roms.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII PROM loading and decoding
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/a2roms.h b/src/emu/cpu/alto2/a2roms.h
index 438d5c67edf..f1ffba032da 100644
--- a/src/emu/cpu/alto2/a2roms.h
+++ b/src/emu/cpu/alto2/a2roms.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII RAM PROM loading and decoding
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifndef _CPU_A2ROMS_H_
 #define _CPU_A2ROMS_H_
diff --git a/src/emu/cpu/alto2/alto2cpu.c b/src/emu/cpu/alto2/alto2cpu.c
index a0299d95ec8..70cef3061b1 100644
--- a/src/emu/cpu/alto2/alto2cpu.c
+++ b/src/emu/cpu/alto2/alto2cpu.c
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII CPU core
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #include "alto2cpu.h"
 #include "a2roms.h"
diff --git a/src/emu/cpu/alto2/alto2cpu.h b/src/emu/cpu/alto2/alto2cpu.h
index 464ac5a594a..1e2640e6ac0 100644
--- a/src/emu/cpu/alto2/alto2cpu.h
+++ b/src/emu/cpu/alto2/alto2cpu.h
@@ -1,11 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Xerox AltoII CPU core interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
- *
  *****************************************************************************/
 #ifndef _CPU_ALTO2_H_
 #define _CPU_ALTO2_H_
diff --git a/src/emu/cpu/alto2/alto2dsm.c b/src/emu/cpu/alto2/alto2dsm.c
index 8c3796f9845..121ab50b398 100644
--- a/src/emu/cpu/alto2/alto2dsm.c
+++ b/src/emu/cpu/alto2/alto2dsm.c
@@ -1,9 +1,8 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************
  *   Xerox AltoII disassembler
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  **********************************************************/
 #include "alto2cpu.h"
 
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c
index d100f44c351..f66fe5fc40f 100644
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     am29000.c
diff --git a/src/emu/cpu/am29000/am29000.h b/src/emu/cpu/am29000/am29000.h
index 7e9d691fe91..53b00496391 100644
--- a/src/emu/cpu/am29000/am29000.h
+++ b/src/emu/cpu/am29000/am29000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     am29000.h
diff --git a/src/emu/cpu/am29000/am29dasm.c b/src/emu/cpu/am29000/am29dasm.c
index a5f4128e147..8d58533362a 100644
--- a/src/emu/cpu/am29000/am29dasm.c
+++ b/src/emu/cpu/am29000/am29dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     am29dasm.c
diff --git a/src/emu/cpu/am29000/am29ops.h b/src/emu/cpu/am29000/am29ops.h
index 5440bdd93ba..a839594a129 100644
--- a/src/emu/cpu/am29000/am29ops.h
+++ b/src/emu/cpu/am29000/am29ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     am29ops.h
diff --git a/src/emu/cpu/amis2000/amis2000.h b/src/emu/cpu/amis2000/amis2000.h
index ba565205b21..d04127eec16 100644
--- a/src/emu/cpu/amis2000/amis2000.h
+++ b/src/emu/cpu/amis2000/amis2000.h
@@ -83,7 +83,7 @@ protected:
 	virtual void execute_run();
 
 	// device_memory_interface overrides
-	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config :((spacenum == AS_DATA) ? &m_data_config : NULL); }
+	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL); }
 
 	// device_disasm_interface overrides
 	virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index 218fd05404f..4737379e383 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     cpu/apexc/apexc.c: APE(X)C CPU emulation
 
diff --git a/src/emu/cpu/apexc/apexc.h b/src/emu/cpu/apexc/apexc.h
index 8142246c486..77566f63a85 100644
--- a/src/emu/cpu/apexc/apexc.h
+++ b/src/emu/cpu/apexc/apexc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* register names for apexc_get_reg & apexc_set_reg */
 #pragma once
 
diff --git a/src/emu/cpu/apexc/apexcdsm.c b/src/emu/cpu/apexc/apexcdsm.c
index 276e0531e1e..a2c01ec5b0c 100644
--- a/src/emu/cpu/apexc/apexcdsm.c
+++ b/src/emu/cpu/apexc/apexcdsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     cpu/apexc/apexcsm.c : APE(X)C CPU disassembler
 
diff --git a/src/emu/cpu/arc/arc.c b/src/emu/cpu/arc/arc.c
index 86337afa966..ab0a395edbc 100644
--- a/src/emu/cpu/arc/arc.c
+++ b/src/emu/cpu/arc/arc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCtangent (A4) core
diff --git a/src/emu/cpu/arc/arc.h b/src/emu/cpu/arc/arc.h
index 93df62fa942..7d78124e060 100644
--- a/src/emu/cpu/arc/arc.h
+++ b/src/emu/cpu/arc/arc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCtangent (A4) core
diff --git a/src/emu/cpu/arc/arcdasm.c b/src/emu/cpu/arc/arcdasm.c
index e5381db23c0..ad62ebbe9f0 100644
--- a/src/emu/cpu/arc/arcdasm.c
+++ b/src/emu/cpu/arc/arcdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCtangent A4 disassembler
diff --git a/src/emu/cpu/arcompact/arcompact.c b/src/emu/cpu/arcompact/arcompact.c
index be1eaae4fd8..ea7b5c2a050 100644
--- a/src/emu/cpu/arcompact/arcompact.c
+++ b/src/emu/cpu/arcompact/arcompact.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact Core
diff --git a/src/emu/cpu/arcompact/arcompact.h b/src/emu/cpu/arcompact/arcompact.h
index f7b56cd010e..62373e45db3 100644
--- a/src/emu/cpu/arcompact/arcompact.h
+++ b/src/emu/cpu/arcompact/arcompact.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact Core
diff --git a/src/emu/cpu/arcompact/arcompact_common.c b/src/emu/cpu/arcompact/arcompact_common.c
index b03f27e19ff..6a322993678 100644
--- a/src/emu/cpu/arcompact/arcompact_common.c
+++ b/src/emu/cpu/arcompact/arcompact_common.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact Core
diff --git a/src/emu/cpu/arcompact/arcompact_common.h b/src/emu/cpu/arcompact/arcompact_common.h
index 9eca6c2a182..165c51d7baf 100644
--- a/src/emu/cpu/arcompact/arcompact_common.h
+++ b/src/emu/cpu/arcompact/arcompact_common.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact Core
diff --git a/src/emu/cpu/arcompact/arcompact_execute.c b/src/emu/cpu/arcompact/arcompact_execute.c
index 115114efc8a..a159a98e5ed 100644
--- a/src/emu/cpu/arcompact/arcompact_execute.c
+++ b/src/emu/cpu/arcompact/arcompact_execute.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "debugger.h"
diff --git a/src/emu/cpu/arcompact/arcompactdasm.c b/src/emu/cpu/arcompact/arcompactdasm.c
index f1ff19942a1..495dc4b0de2 100644
--- a/src/emu/cpu/arcompact/arcompactdasm.c
+++ b/src/emu/cpu/arcompact/arcompactdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact disassembler
diff --git a/src/emu/cpu/arcompact/arcompactdasm_dispatch.c b/src/emu/cpu/arcompact/arcompactdasm_dispatch.c
index b510cb28c41..2dcd743ef40 100644
--- a/src/emu/cpu/arcompact/arcompactdasm_dispatch.c
+++ b/src/emu/cpu/arcompact/arcompactdasm_dispatch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact disassembler
diff --git a/src/emu/cpu/arcompact/arcompactdasm_dispatch.h b/src/emu/cpu/arcompact/arcompactdasm_dispatch.h
index 5e30a2e8488..83e46bb558d 100644
--- a/src/emu/cpu/arcompact/arcompactdasm_dispatch.h
+++ b/src/emu/cpu/arcompact/arcompactdasm_dispatch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact disassembler
diff --git a/src/emu/cpu/arcompact/arcompactdasm_ops.c b/src/emu/cpu/arcompact/arcompactdasm_ops.c
index 842dafe3bd8..98bb0aeb00d 100644
--- a/src/emu/cpu/arcompact/arcompactdasm_ops.c
+++ b/src/emu/cpu/arcompact/arcompactdasm_ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************\
 
  ARCompact disassembler
diff --git a/src/emu/cpu/arcompact/arcompactdasm_ops.h b/src/emu/cpu/arcompact/arcompactdasm_ops.h
index d853899faa6..17dcdf2de81 100644
--- a/src/emu/cpu/arcompact/arcompactdasm_ops.h
+++ b/src/emu/cpu/arcompact/arcompactdasm_ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /************************************************************************************************************************************
 *                                                                                                                                   *
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index 77f1927f3e3..9af3b421b0b 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* arm.c
 
     ARM 2/3/6 Emulation (26 bit address bus)
diff --git a/src/emu/cpu/arm/arm.h b/src/emu/cpu/arm/arm.h
index 8a5cd9057fe..f1ff1b85f7f 100644
--- a/src/emu/cpu/arm/arm.h
+++ b/src/emu/cpu/arm/arm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ARM_H__
diff --git a/src/emu/cpu/arm/armdasm.c b/src/emu/cpu/arm/armdasm.c
index 8771c0ba74d..5b1ea7143f4 100644
--- a/src/emu/cpu/arm/armdasm.c
+++ b/src/emu/cpu/arm/armdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     ARM 2/3 disassembler
 
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 2f32785e62f..08354f0bd1a 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   arm7.c
diff --git a/src/emu/cpu/arm7/arm7.h b/src/emu/cpu/arm7/arm7.h
index 08fa9902ed9..ea1059fdfa3 100644
--- a/src/emu/cpu/arm7/arm7.h
+++ b/src/emu/cpu/arm7/arm7.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   arm7.h
diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h
index f0c25d1994f..3a0c77f2c11 100644
--- a/src/emu/cpu/arm7/arm7core.h
+++ b/src/emu/cpu/arm7/arm7core.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   arm7core.h
diff --git a/src/emu/cpu/arm7/arm7dasm.c b/src/emu/cpu/arm7/arm7dasm.c
index 463e6d89b40..a54f624e53e 100644
--- a/src/emu/cpu/arm7/arm7dasm.c
+++ b/src/emu/cpu/arm7/arm7dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   arm7dasm.c
diff --git a/src/emu/cpu/arm7/arm7help.h b/src/emu/cpu/arm7/arm7help.h
index 8c3ad96bdc4..1ef7d9826bc 100644
--- a/src/emu/cpu/arm7/arm7help.h
+++ b/src/emu/cpu/arm7/arm7help.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ARM7 core helper Macros / Functions */
 
 /* Macros that need to be defined according to the cpu implementation specific need */
diff --git a/src/emu/cpu/arm7/arm7ops.c b/src/emu/cpu/arm7/arm7ops.c
index f0766610777..eec5dab6942 100644
--- a/src/emu/cpu/arm7/arm7ops.c
+++ b/src/emu/cpu/arm7/arm7ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "arm7.h"
 #include "arm7core.h"
diff --git a/src/emu/cpu/arm7/arm7thmb.c b/src/emu/cpu/arm7/arm7thmb.c
index 2d1fdae2fbe..fe057976dbf 100644
--- a/src/emu/cpu/arm7/arm7thmb.c
+++ b/src/emu/cpu/arm7/arm7thmb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "arm7.h"
 #include "arm7core.h"
diff --git a/src/emu/cpu/avr8/avr8.h b/src/emu/cpu/avr8/avr8.h
index 1d42d081ada..2a5e04f1020 100644
--- a/src/emu/cpu/avr8/avr8.h
+++ b/src/emu/cpu/avr8/avr8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Atmel 8-bit AVR simulator
 
diff --git a/src/emu/cpu/avr8/avr8dasm.c b/src/emu/cpu/avr8/avr8dasm.c
index 219488299c6..a8290157c24 100644
--- a/src/emu/cpu/avr8/avr8dasm.c
+++ b/src/emu/cpu/avr8/avr8dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Atmel 8-bit AVR disassembler
 
diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c
index abdc706d001..c52c1d18299 100644
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@@ -6,9 +6,6 @@
 
     National Semiconductor COP400 Emulator.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************
 
     Type        ROM     RAM     G       D       IN
diff --git a/src/emu/cpu/cop400/cop400op.inc b/src/emu/cpu/cop400/cop400op.inc
index c72675c4d3a..1f1bf1bfade 100644
--- a/src/emu/cpu/cop400/cop400op.inc
+++ b/src/emu/cpu/cop400/cop400op.inc
@@ -6,9 +6,6 @@
 
     National Semiconductor COP400 Emulator.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/emu/cpu/cop400/cop410ds.c b/src/emu/cpu/cop400/cop410ds.c
index 7ffcb87fca9..638653151d0 100644
--- a/src/emu/cpu/cop400/cop410ds.c
+++ b/src/emu/cpu/cop400/cop410ds.c
@@ -6,9 +6,6 @@
 
     National Semiconductor COP410 Emulator.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/cop400/cop420ds.c b/src/emu/cpu/cop400/cop420ds.c
index 4ef1bbf5f14..007b9afc8c6 100644
--- a/src/emu/cpu/cop400/cop420ds.c
+++ b/src/emu/cpu/cop400/cop420ds.c
@@ -6,9 +6,6 @@
 
     National Semiconductor COP420 Emulator.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/cop400/cop440ds.c b/src/emu/cpu/cop400/cop440ds.c
index 96505a1613e..4af02d3c481 100644
--- a/src/emu/cpu/cop400/cop440ds.c
+++ b/src/emu/cpu/cop400/cop440ds.c
@@ -6,9 +6,6 @@
 
     National Semiconductor COP420 Emulator.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 63747781f07..f33e5869725 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -4,9 +4,6 @@
 
     RCA COSMAC CPU emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/emu/cpu/cosmac/cosmac.h
index 897c4f027ed..139ff858e57 100644
--- a/src/emu/cpu/cosmac/cosmac.h
+++ b/src/emu/cpu/cosmac/cosmac.h
@@ -4,9 +4,6 @@
 
     RCA COSMAC CPU emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vcc   1 |*    \_/     | 40  Vdd
diff --git a/src/emu/cpu/cp1610/1610dasm.c b/src/emu/cpu/cp1610/1610dasm.c
index e5585130fe2..80ff853a572 100644
--- a/src/emu/cpu/cp1610/1610dasm.c
+++ b/src/emu/cpu/cp1610/1610dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "cp1610.h"
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index a52c795ede9..656f9a563ea 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   cp1610.c
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h
index 712378a20d3..5f034774aba 100644
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   cp1610.h
diff --git a/src/emu/cpu/cubeqcpu/cubedasm.c b/src/emu/cpu/cubeqcpu/cubedasm.c
index b35e8ed29fe..c56668a138e 100644
--- a/src/emu/cpu/cubeqcpu/cubedasm.c
+++ b/src/emu/cpu/cubeqcpu/cubedasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cubedasm.c
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c
index d0bbe856df5..37bc5b027a3 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.c
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cubeqcpu.c
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.h b/src/emu/cpu/cubeqcpu/cubeqcpu.h
index ce19b86f559..83f13208f70 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.h
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cubeqcpu.h
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c
index 42913c5361d..314735d0880 100644
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dsp16.h
diff --git a/src/emu/cpu/dsp16/dsp16.h b/src/emu/cpu/dsp16/dsp16.h
index 4d093ef010e..7f08171f9a5 100644
--- a/src/emu/cpu/dsp16/dsp16.h
+++ b/src/emu/cpu/dsp16/dsp16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dsp16.h
diff --git a/src/emu/cpu/dsp16/dsp16dis.c b/src/emu/cpu/dsp16/dsp16dis.c
index 09d6e2d149a..bee69e5f444 100644
--- a/src/emu/cpu/dsp16/dsp16dis.c
+++ b/src/emu/cpu/dsp16/dsp16dis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "dsp16.h"
 
diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h
index a813de5570d..593e6fdb37e 100644
--- a/src/emu/cpu/dsp56k/dsp56def.h
+++ b/src/emu/cpu/dsp56k/dsp56def.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 ///////////////////////////////////////////
 // All the macros that are fit to print. //
 ///////////////////////////////////////////
diff --git a/src/emu/cpu/dsp56k/dsp56dsm.c b/src/emu/cpu/dsp56k/dsp56dsm.c
index 4a9aead9d67..8a3b79d4194 100644
--- a/src/emu/cpu/dsp56k/dsp56dsm.c
+++ b/src/emu/cpu/dsp56k/dsp56dsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dsp56dsm.c
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 2a5e94e135c..089eff44211 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dsp56k.c
diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h
index c2fd831515d..0199ffdade0 100644
--- a/src/emu/cpu/dsp56k/dsp56k.h
+++ b/src/emu/cpu/dsp56k/dsp56k.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dsp56k.h
diff --git a/src/emu/cpu/dsp56k/dsp56mem.c b/src/emu/cpu/dsp56k/dsp56mem.c
index 69c5811da84..698ec19c477 100644
--- a/src/emu/cpu/dsp56k/dsp56mem.c
+++ b/src/emu/cpu/dsp56k/dsp56mem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // This file contains functions which handle the On-Chip peripheral Memory Map
 // as well as the Host Interface and the SSI0/SSI1 Serial Interfaces.
 
diff --git a/src/emu/cpu/dsp56k/dsp56mem.h b/src/emu/cpu/dsp56k/dsp56mem.h
index 521846a8d65..4023127859d 100644
--- a/src/emu/cpu/dsp56k/dsp56mem.h
+++ b/src/emu/cpu/dsp56k/dsp56mem.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56_MEM_H__
 #define __DSP56_MEM_H__
 
diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c
index d00960a69ff..719b854161e 100644
--- a/src/emu/cpu/dsp56k/dsp56pcu.c
+++ b/src/emu/cpu/dsp56k/dsp56pcu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "dsp56pcu.h"
 #include "dsp56mem.h"
 
diff --git a/src/emu/cpu/dsp56k/dsp56pcu.h b/src/emu/cpu/dsp56k/dsp56pcu.h
index 360b08f4d61..5734213001a 100644
--- a/src/emu/cpu/dsp56k/dsp56pcu.h
+++ b/src/emu/cpu/dsp56k/dsp56pcu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56_PCU_H__
 #define __DSP56_PCU_H__
 
diff --git a/src/emu/cpu/dsp56k/inst.c b/src/emu/cpu/dsp56k/inst.c
index 1c69cfd21dc..1adf7de45b1 100644
--- a/src/emu/cpu/dsp56k/inst.c
+++ b/src/emu/cpu/dsp56k/inst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "inst.h"
 #include "emu.h"
 
diff --git a/src/emu/cpu/dsp56k/inst.h b/src/emu/cpu/dsp56k/inst.h
index fb9c55f89ad..3f2263e12c5 100644
--- a/src/emu/cpu/dsp56k/inst.h
+++ b/src/emu/cpu/dsp56k/inst.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56K_INSTRUCTION_H__
 #define __DSP56K_INSTRUCTION_H__
 
diff --git a/src/emu/cpu/dsp56k/opcode.c b/src/emu/cpu/dsp56k/opcode.c
index 7943736580c..d098ed4f86c 100644
--- a/src/emu/cpu/dsp56k/opcode.c
+++ b/src/emu/cpu/dsp56k/opcode.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>
 
 #include "opcode.h"
diff --git a/src/emu/cpu/dsp56k/opcode.h b/src/emu/cpu/dsp56k/opcode.h
index b258c0241a6..56772a41dc0 100644
--- a/src/emu/cpu/dsp56k/opcode.h
+++ b/src/emu/cpu/dsp56k/opcode.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56K_OPCODE_H__
 #define __DSP56K_OPCODE_H__
 
diff --git a/src/emu/cpu/dsp56k/pmove.c b/src/emu/cpu/dsp56k/pmove.c
index ce9c7776e87..d3d05319983 100644
--- a/src/emu/cpu/dsp56k/pmove.c
+++ b/src/emu/cpu/dsp56k/pmove.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pmove.h"
 
 namespace DSP56K
diff --git a/src/emu/cpu/dsp56k/pmove.h b/src/emu/cpu/dsp56k/pmove.h
index 16c9de1a555..1ba59015da2 100644
--- a/src/emu/cpu/dsp56k/pmove.h
+++ b/src/emu/cpu/dsp56k/pmove.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56K_PARALLEL_MOVE_H__
 #define __DSP56K_PARALLEL_MOVE_H__
 
diff --git a/src/emu/cpu/dsp56k/tables.c b/src/emu/cpu/dsp56k/tables.c
index a7db21acf44..d19a1c2c225 100644
--- a/src/emu/cpu/dsp56k/tables.c
+++ b/src/emu/cpu/dsp56k/tables.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/emu/cpu/dsp56k/tables.h b/src/emu/cpu/dsp56k/tables.h
index dbe877f1431..a29a7f29033 100644
--- a/src/emu/cpu/dsp56k/tables.h
+++ b/src/emu/cpu/dsp56k/tables.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DSP56K_OPS_H__
 #define __DSP56K_OPS_H__
 
diff --git a/src/emu/cpu/e0c6200/e0c6200.c b/src/emu/cpu/e0c6200/e0c6200.c
new file mode 100644
index 00000000000..9ee588455be
--- /dev/null
+++ b/src/emu/cpu/e0c6200/e0c6200.c
@@ -0,0 +1,811 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/*
+
+  Seiko Epson E0C6200 CPU core and E0C62 MCU family
+
+  References:
+  - 1998 MF297-06a E0C6200/E0C6200A Core CPU Manual
+  - 1998 MF1049-01a E0C6S46 Technical Manual
+
+  TODO:
+  - niks
+
+*/
+
+#include "e0c6200.h"
+#include "debugger.h"
+
+
+const device_type EPSON_E0C6S46 = &device_creator<e0c6s46_device>;
+
+
+// internal memory maps
+static ADDRESS_MAP_START(program_1k, AS_PROGRAM, 16, e0c6200_cpu_device)
+	AM_RANGE(0x0000, 0x03ff) AM_ROM
+ADDRESS_MAP_END
+
+
+static ADDRESS_MAP_START(data_64x4, AS_DATA, 8, e0c6200_cpu_device)
+	AM_RANGE(0x00, 0x3f) AM_RAM
+ADDRESS_MAP_END
+
+
+// device definitions
+e0c6s46_device::e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: e0c6200_cpu_device(mconfig, EPSON_E0C6S46, "E0C6S46", tag, owner, clock, 10, ADDRESS_MAP_NAME(program_1k), 6, ADDRESS_MAP_NAME(data_64x4), "e0c6s46", __FILE__)
+{ }
+
+
+// disasm
+void e0c6200_cpu_device::state_string_export(const device_state_entry &entry, std::string &str)
+{
+	switch (entry.index())
+	{
+		case STATE_GENFLAGS:
+			break;
+
+		default: break;
+	}
+}
+
+offs_t e0c6200_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options)
+{
+	extern CPU_DISASSEMBLE(e0c6200);
+	return CPU_DISASSEMBLE_NAME(e0c6200)(this, buffer, pc, oprom, opram, options);
+}
+
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void e0c6200_cpu_device::device_start()
+{
+	m_program = &space(AS_PROGRAM);
+	m_data = &space(AS_DATA);
+	m_prgmask = (1 << m_prgwidth) - 1;
+	m_datamask = (1 << m_datawidth) - 1;
+
+	// zerofill
+	m_op = 0;
+	m_prev_op = 0;
+	m_pc = 0;
+	m_prev_pc = 0;
+	m_npc = 0;
+	m_jpc = 0;
+	
+	m_a = 0;
+	m_b = 0;
+	m_xp = m_xh = m_xl = 0;
+	m_yp = m_yh = m_yl = 0;
+	m_sp = 0;
+	m_f = 0;
+
+	// register for savestates
+	save_item(NAME(m_op));
+	save_item(NAME(m_prev_op));
+	save_item(NAME(m_pc));
+	save_item(NAME(m_prev_pc));
+	save_item(NAME(m_npc));
+	save_item(NAME(m_jpc));
+	save_item(NAME(m_a));
+	save_item(NAME(m_b));
+	save_item(NAME(m_xp));
+	save_item(NAME(m_xh));
+	save_item(NAME(m_xl));
+	save_item(NAME(m_yp));
+	save_item(NAME(m_yh));
+	save_item(NAME(m_yl));
+	save_item(NAME(m_sp));
+	save_item(NAME(m_f));
+
+	// register state for debugger
+
+	m_icountptr = &m_icount;
+}
+
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void e0c6200_cpu_device::device_reset()
+{
+}
+
+
+
+//-------------------------------------------------
+//  execute
+//-------------------------------------------------
+
+void e0c6200_cpu_device::execute_one()
+{
+	// legend:
+	// X   = --.XH.XL 8-bit
+	// Y   = --.YH.YL 8-bit
+	// IX  = XP.XH.XL 12-bit index register
+	// IY  = YP.YH.YL 12-bit index register
+	// MX  = data memory at IX
+	// MY  = data memory at IY
+	// Mn  = data memory at 0-F, via 4-bit immediate param
+	// r/q = 2-bit param directing to A/B/MX/MY
+	// i   = 4-bit immediate param
+	// e   = 8-bit immediate param
+	// s   = 8-bit immediate branch destination
+	
+	switch (m_op & 0xf00)
+	{
+		// JP s: jump unconditional
+		case 0x000:
+			m_pc = m_jpc | (m_op & 0xff);
+			break;
+
+		// JP C,s: jump if carry
+		case 0x200:
+			if (m_f & 1) m_pc = m_jpc | (m_op & 0xff);
+			break;
+
+		// JP NC,s: jump if no carry
+		case 0x300:
+			if (~m_f & 1) m_pc = m_jpc | (m_op & 0xff);
+			break;
+
+		// JP Z,s: jump if zero
+		case 0x600:
+			if (m_f & 2) m_pc = m_jpc | (m_op & 0xff);
+			break;
+
+		// JP NZ,s: jump if not zero
+		case 0x700:
+			if (~m_f & 2) m_pc = m_jpc | (m_op & 0xff);
+			break;
+
+		// CALL s: call unconditional (on current bank)
+		case 0x400:
+			m_icount -= 2;
+			push_pc();
+			m_pc = (m_pc & 0x1000) | (m_jpc & 0x0f00) | (m_op & 0xff);
+			break;
+
+		// CALZ s: call zero page (on current bank)
+		case 0x500:
+			m_icount -= 2;
+			push_pc();
+			m_pc = (m_pc & 0x1000) | (m_op & 0xff);
+			break;
+
+		// RETD e: return from subroutine, then LBPX MX,e
+		case 0x100:
+			m_icount -= 7;
+			pop_pc();
+			// fall through!
+
+		// LBPX MX,e: load memory with 8-bit immediate data, increment X by 2
+		case 0x900:
+			write_mx(m_op & 0xf); inc_x();
+			write_mx(m_op >> 4 & 0xf); inc_x();
+			break;
+
+		// LD X,e: load X with 8-bit immediate data
+		case 0xb00:
+			m_xh = m_op >> 4 & 0xf;
+			m_xl = m_op & 0xf;
+			break;
+
+		// LD Y,e: load Y with 8-bit immediate data
+		case 0x800:
+			m_yh = m_op >> 4 & 0xf;
+			m_yl = m_op & 0xf;
+			break;
+
+
+		default:
+			switch (m_op)
+			{
+
+		// LD r,q: load register with register
+		case 0xec0: /* m_a = m_a; */ break;
+		case 0xec1: m_a = m_b; break;
+		case 0xec2: m_a = read_mx(); break;
+		case 0xec3: m_a = read_my(); break;
+		case 0xec4: m_b = m_a; break;
+		case 0xec5: /* m_b = m_b; */ break;
+		case 0xec6: m_b = read_mx(); break;
+		case 0xec7: m_b = read_my(); break;
+		case 0xec8: write_mx(m_a); break;
+		case 0xec9: write_mx(m_b); break;
+		case 0xeca: write_mx(read_mx()); break;
+		case 0xecb: write_mx(read_my()); break;
+		case 0xecc: write_my(m_a); break;
+		case 0xecd: write_my(m_b); break;
+		case 0xece: write_my(read_mx()); break;
+		case 0xecf: write_my(read_my()); break;
+
+		// LDPX r,q: LD r,q, then increment X
+		case 0xee0: /* m_a = m_a; */ inc_x(); break;
+		case 0xee1: m_a = m_b; inc_x(); break;
+		case 0xee2: m_a = read_mx(); inc_x(); break;
+		case 0xee3: m_a = read_my(); inc_x(); break;
+		case 0xee4: m_b = m_a; inc_x(); break;
+		case 0xee5: /* m_b = m_b; */ inc_x(); break;
+		case 0xee6: m_b = read_mx(); inc_x(); break;
+		case 0xee7: m_b = read_my(); inc_x(); break;
+		case 0xee8: write_mx(m_a); inc_x(); break;
+		case 0xee9: write_mx(m_b); inc_x(); break;
+		case 0xeea: write_mx(read_mx()); inc_x(); break;
+		case 0xeeb: write_mx(read_my()); inc_x(); break;
+		case 0xeec: write_my(m_a); inc_x(); break;
+		case 0xeed: write_my(m_b); inc_x(); break;
+		case 0xeee: write_my(read_mx()); inc_x(); break;
+		case 0xeef: write_my(read_my()); inc_x(); break;
+
+		// LDPY r,q: LD r,q, then increment Y
+		case 0xef0: /* m_a = m_a; */ inc_y(); break;
+		case 0xef1: m_a = m_b; inc_y(); break;
+		case 0xef2: m_a = read_mx(); inc_y(); break;
+		case 0xef3: m_a = read_my(); inc_y(); break;
+		case 0xef4: m_b = m_a; inc_y(); break;
+		case 0xef5: /* m_b = m_b; */ inc_y(); break;
+		case 0xef6: m_b = read_mx(); inc_y(); break;
+		case 0xef7: m_b = read_my(); inc_y(); break;
+		case 0xef8: write_mx(m_a); inc_y(); break;
+		case 0xef9: write_mx(m_b); inc_y(); break;
+		case 0xefa: write_mx(read_mx()); inc_y(); break;
+		case 0xefb: write_mx(read_my()); inc_y(); break;
+		case 0xefc: write_my(m_a); inc_y(); break;
+		case 0xefd: write_my(m_b); inc_y(); break;
+		case 0xefe: write_my(read_mx()); inc_y(); break;
+		case 0xeff: write_my(read_my()); inc_y(); break;
+
+		// LD Xphl/Yphl,r: load IX/IY with register
+		case 0xe80: m_xp = m_a; break;
+		case 0xe81: m_xp = m_b; break;
+		case 0xe82: m_xp = read_mx(); break;
+		case 0xe83: m_xp = read_my(); break;
+		case 0xe84: m_xh = m_a; break;
+		case 0xe85: m_xh = m_b; break;
+		case 0xe86: m_xh = read_mx(); break;
+		case 0xe87: m_xh = read_my(); break;
+		case 0xe88: m_xl = m_a; break;
+		case 0xe89: m_xl = m_b; break;
+		case 0xe8a: m_xl = read_mx(); break;
+		case 0xe8b: m_xl = read_my(); break;
+		case 0xe90: m_yp = m_a; break;
+		case 0xe91: m_yp = m_b; break;
+		case 0xe92: m_yp = read_mx(); break;
+		case 0xe93: m_yp = read_my(); break;
+		case 0xe94: m_yh = m_a; break;
+		case 0xe95: m_yh = m_b; break;
+		case 0xe96: m_yh = read_mx(); break;
+		case 0xe97: m_yh = read_my(); break;
+		case 0xe98: m_yl = m_a; break;
+		case 0xe99: m_yl = m_b; break;
+		case 0xe9a: m_yl = read_mx(); break;
+		case 0xe9b: m_yl = read_my(); break;
+
+		// LD r,Xphl/Yphl: load register with IX/IY
+		case 0xea0: m_a = m_xp; break;
+		case 0xea1: m_b = m_xp; break;
+		case 0xea2: write_mx(m_xp); break;
+		case 0xea3: write_my(m_xp); break;
+		case 0xea4: m_a = m_xh; break;
+		case 0xea5: m_b = m_xh; break;
+		case 0xea6: write_mx(m_xh); break;
+		case 0xea7: write_my(m_xh); break;
+		case 0xea8: m_a = m_xl; break;
+		case 0xea9: m_b = m_xl; break;
+		case 0xeaa: write_mx(m_xl); break;
+		case 0xeab: write_my(m_xl); break;
+		case 0xeb0: m_a = m_yp; break;
+		case 0xeb1: m_b = m_yp; break;
+		case 0xeb2: write_mx(m_yp); break;
+		case 0xeb3: write_my(m_yp); break;
+		case 0xeb4: m_a = m_yh; break;
+		case 0xeb5: m_b = m_yh; break;
+		case 0xeb6: write_mx(m_yh); break;
+		case 0xeb7: write_my(m_yh); break;
+		case 0xeb8: m_a = m_yl; break;
+		case 0xeb9: m_b = m_yl; break;
+		case 0xeba: write_mx(m_yl); break;
+		case 0xebb: write_my(m_yl); break;
+
+		// LD SPhl,r: load stackpointer with register
+		case 0xfe0: m_sp = (m_sp & 0xf0) | m_a; break;
+		case 0xfe1: m_sp = (m_sp & 0xf0) | m_b; break;
+		case 0xfe2: m_sp = (m_sp & 0xf0) | read_mx(); break;
+		case 0xfe3: m_sp = (m_sp & 0xf0) | read_my(); break;
+		case 0xff0: m_sp = (m_sp & 0x0f) | m_a << 4; break;
+		case 0xff1: m_sp = (m_sp & 0x0f) | m_b << 4; break;
+		case 0xff2: m_sp = (m_sp & 0x0f) | read_mx() << 4; break;
+		case 0xff3: m_sp = (m_sp & 0x0f) | read_my() << 4; break;
+
+		// LD r,SPhl: load register with stackpointer
+		case 0xfe4: m_a = m_sp >> 4 & 0xf; break;
+		case 0xfe5: m_b = m_sp >> 4 & 0xf; break;
+		case 0xfe6: write_mx(m_sp >> 4 & 0xf); break;
+		case 0xfe7: write_my(m_sp >> 4 & 0xf); break;
+		case 0xff4: m_a = m_sp & 0xf; break;
+		case 0xff5: m_b = m_sp & 0xf; break;
+		case 0xff6: write_mx(m_sp & 0xf); break;
+		case 0xff7: write_my(m_sp & 0xf); break;
+
+		// ADD r,q
+		case 0xa80:
+		case 0xa81:
+		case 0xa82:
+		case 0xa83:
+		case 0xa84:
+		case 0xa85:
+		case 0xa86:
+		case 0xa87:
+		case 0xa88:
+		case 0xa89:
+		case 0xa8a:
+		case 0xa8b:
+		case 0xa8c:
+		case 0xa8d:
+		case 0xa8e:
+		case 0xa8f:
+
+		// ADC r,q
+		case 0xa90:
+		case 0xa91:
+		case 0xa92:
+		case 0xa93:
+		case 0xa94:
+		case 0xa95:
+		case 0xa96:
+		case 0xa97:
+		case 0xa98:
+		case 0xa99:
+		case 0xa9a:
+		case 0xa9b:
+		case 0xa9c:
+		case 0xa9d:
+		case 0xa9e:
+		case 0xa9f:
+
+		// ACPX MX,r
+		case 0xf28:
+		case 0xf29:
+		case 0xf2a:
+		case 0xf2b:
+
+		// ACPY MY,
+		case 0xf2c:
+		case 0xf2d:
+		case 0xf2e:
+		case 0xf2f:
+
+		// SUB r,q
+		case 0xaa0:
+		case 0xaa1:
+		case 0xaa2:
+		case 0xaa3:
+		case 0xaa4:
+		case 0xaa5:
+		case 0xaa6:
+		case 0xaa7:
+		case 0xaa8:
+		case 0xaa9:
+		case 0xaaa:
+		case 0xaab:
+		case 0xaac:
+		case 0xaad:
+		case 0xaae:
+		case 0xaaf:
+
+		// SBC r,q
+		case 0xab0:
+		case 0xab1:
+		case 0xab2:
+		case 0xab3:
+		case 0xab4:
+		case 0xab5:
+		case 0xab6:
+		case 0xab7:
+		case 0xab8:
+		case 0xab9:
+		case 0xaba:
+		case 0xabb:
+		case 0xabc:
+		case 0xabd:
+		case 0xabe:
+		case 0xabf:
+
+		// SCPX MX,
+		case 0xf38:
+		case 0xf39:
+		case 0xf3a:
+		case 0xf3b:
+
+		// SCPY MY,
+		case 0xf3c:
+		case 0xf3d:
+		case 0xf3e:
+		case 0xf3f:
+
+		// CP r,q: SUB r,q, but discard result (D flag has no effect)
+		case 0xf00:
+		case 0xf01:
+		case 0xf02:
+		case 0xf03:
+		case 0xf04:
+		case 0xf05:
+		case 0xf06:
+		case 0xf07:
+		case 0xf08:
+		case 0xf09:
+		case 0xf0a:
+		case 0xf0b:
+		case 0xf0c:
+		case 0xf0d:
+		case 0xf0e:
+		case 0xf0f:
+
+		// AND r,q: logical AND register with register (affect flags: Z)
+		case 0xac0: m_icount -= 2; /* m_a &= m_a; */ set_zf(m_a); break;
+		case 0xac1: m_icount -= 2; m_a &= m_b; set_zf(m_a); break;
+		case 0xac2: m_icount -= 2; m_a &= read_mx(); set_zf(m_a); break;
+		case 0xac3: m_icount -= 2; m_a &= read_my(); set_zf(m_a); break;
+		case 0xac4: m_icount -= 2; m_b &= m_a; set_zf(m_b); break;
+		case 0xac5: m_icount -= 2; /* m_b &= m_b; */ set_zf(m_b); break;
+		case 0xac6: m_icount -= 2; m_b &= read_mx(); set_zf(m_b); break;
+		case 0xac7: m_icount -= 2; m_b &= read_my(); set_zf(m_b); break;
+		case 0xac8: m_icount -= 2; { UINT8 t = read_mx() & m_a; write_mx(t); set_zf(t); break; }
+		case 0xac9: m_icount -= 2; { UINT8 t = read_mx() & m_b; write_mx(t); set_zf(t); break; }
+		case 0xaca: m_icount -= 2; { UINT8 t = read_mx() & read_mx(); write_mx(t); set_zf(t); break; }
+		case 0xacb: m_icount -= 2; { UINT8 t = read_mx() & read_my(); write_mx(t); set_zf(t); break; }
+		case 0xacc: m_icount -= 2; { UINT8 t = read_my() & m_a; write_my(t); set_zf(t); break; }
+		case 0xacd: m_icount -= 2; { UINT8 t = read_my() & m_b; write_my(t); set_zf(t); break; }
+		case 0xace: m_icount -= 2; { UINT8 t = read_my() & read_mx(); write_my(t); set_zf(t); break; }
+		case 0xacf: m_icount -= 2; { UINT8 t = read_my() & read_my(); write_my(t); set_zf(t); break; }
+
+		// FAN r,q: AND r,q, but discard result
+		case 0xf10: m_icount -= 2; set_zf(m_a /* & m_a */); break;
+		case 0xf11: m_icount -= 2; set_zf(m_a & m_b); break;
+		case 0xf12: m_icount -= 2; set_zf(m_a & read_mx()); break;
+		case 0xf13: m_icount -= 2; set_zf(m_a & read_my()); break;
+		case 0xf14: m_icount -= 2; set_zf(m_b & m_a); break;
+		case 0xf15: m_icount -= 2; set_zf(m_b /* & m_b */); break;
+		case 0xf16: m_icount -= 2; set_zf(m_b & read_mx()); break;
+		case 0xf17: m_icount -= 2; set_zf(m_b & read_my()); break;
+		case 0xf18: m_icount -= 2; set_zf(read_mx() & m_a); break;
+		case 0xf19: m_icount -= 2; set_zf(read_mx() & m_b); break;
+		case 0xf1a: m_icount -= 2; set_zf(read_mx() & read_mx()); break;
+		case 0xf1b: m_icount -= 2; set_zf(read_mx() & read_my()); break;
+		case 0xf1c: m_icount -= 2; set_zf(read_my() & m_a); break;
+		case 0xf1d: m_icount -= 2; set_zf(read_my() & m_b); break;
+		case 0xf1e: m_icount -= 2; set_zf(read_my() & read_mx()); break;
+		case 0xf1f: m_icount -= 2; set_zf(read_my() & read_my()); break;
+
+		// OR r,q: logical OR register with register (affect flags: Z)
+		case 0xad0: m_icount -= 2; /* m_a |= m_a; */ set_zf(m_a); break;
+		case 0xad1: m_icount -= 2; m_a |= m_b; set_zf(m_a); break;
+		case 0xad2: m_icount -= 2; m_a |= read_mx(); set_zf(m_a); break;
+		case 0xad3: m_icount -= 2; m_a |= read_my(); set_zf(m_a); break;
+		case 0xad4: m_icount -= 2; m_b |= m_a; set_zf(m_b); break;
+		case 0xad5: m_icount -= 2; /* m_b |= m_b; */ set_zf(m_b); break;
+		case 0xad6: m_icount -= 2; m_b |= read_mx(); set_zf(m_b); break;
+		case 0xad7: m_icount -= 2; m_b |= read_my(); set_zf(m_b); break;
+		case 0xad8: m_icount -= 2; { UINT8 t = read_mx() | m_a; write_mx(t); set_zf(t); break; }
+		case 0xad9: m_icount -= 2; { UINT8 t = read_mx() | m_b; write_mx(t); set_zf(t); break; }
+		case 0xada: m_icount -= 2; { UINT8 t = read_mx() | read_mx(); write_mx(t); set_zf(t); break; }
+		case 0xadb: m_icount -= 2; { UINT8 t = read_mx() | read_my(); write_mx(t); set_zf(t); break; }
+		case 0xadc: m_icount -= 2; { UINT8 t = read_my() | m_a; write_my(t); set_zf(t); break; }
+		case 0xadd: m_icount -= 2; { UINT8 t = read_my() | m_b; write_my(t); set_zf(t); break; }
+		case 0xade: m_icount -= 2; { UINT8 t = read_my() | read_mx(); write_my(t); set_zf(t); break; }
+		case 0xadf: m_icount -= 2; { UINT8 t = read_my() | read_my(); write_my(t); set_zf(t); break; }
+
+		// XOR r,q: exclusive-OR register with register (affect flags: Z)
+		case 0xae0: m_icount -= 2; m_a ^= m_a; set_zf(m_a); break;
+		case 0xae1: m_icount -= 2; m_a ^= m_b; set_zf(m_a); break;
+		case 0xae2: m_icount -= 2; m_a ^= read_mx(); set_zf(m_a); break;
+		case 0xae3: m_icount -= 2; m_a ^= read_my(); set_zf(m_a); break;
+		case 0xae4: m_icount -= 2; m_b ^= m_a; set_zf(m_b); break;
+		case 0xae5: m_icount -= 2; m_b ^= m_b; set_zf(m_b); break;
+		case 0xae6: m_icount -= 2; m_b ^= read_mx(); set_zf(m_b); break;
+		case 0xae7: m_icount -= 2; m_b ^= read_my(); set_zf(m_b); break;
+		case 0xae8: m_icount -= 2; { UINT8 t = read_mx() ^ m_a; write_mx(t); set_zf(t); break; }
+		case 0xae9: m_icount -= 2; { UINT8 t = read_mx() ^ m_b; write_mx(t); set_zf(t); break; }
+		case 0xaea: m_icount -= 2; { UINT8 t = read_mx() ^ read_mx(); write_mx(t); set_zf(t); break; }
+		case 0xaeb: m_icount -= 2; { UINT8 t = read_mx() ^ read_my(); write_mx(t); set_zf(t); break; }
+		case 0xaec: m_icount -= 2; { UINT8 t = read_my() ^ m_a; write_my(t); set_zf(t); break; }
+		case 0xaed: m_icount -= 2; { UINT8 t = read_my() ^ m_b; write_my(t); set_zf(t); break; }
+		case 0xaee: m_icount -= 2; { UINT8 t = read_my() ^ read_mx(); write_my(t); set_zf(t); break; }
+		case 0xaef: m_icount -= 2; { UINT8 t = read_my() ^ read_my(); write_my(t); set_zf(t); break; }
+
+		// RLC r: rotate register left through carry (affect flags: C, Z)
+		case 0xaf0: m_icount -= 2;
+		case 0xaf5: m_icount -= 2;
+		case 0xafa: m_icount -= 2; read_mx();
+		case 0xaff: m_icount -= 2; read_my();
+
+		// RRC r: rotate register right through carry (affect flags: C, Z)
+		case 0xe8c:
+		case 0xe8d:
+		case 0xe8e:
+		case 0xe8f:
+
+		// INC SP: increment stackpointer
+		case 0xfdb:
+			m_sp++;
+			break;
+
+		// DEC SP: decrement stackpointer
+		case 0xfcb:
+			m_sp--;
+			break;
+
+		// PUSH r/Xphl/Yphl/F: push register to stack
+		case 0xfc0: push(m_a); break;
+		case 0xfc1: push(m_b); break;
+		case 0xfc2: push(read_mx()); break;
+		case 0xfc3: push(read_my()); break;
+		case 0xfc4: push(m_xp); break;
+		case 0xfc5: push(m_xh); break;
+		case 0xfc6: push(m_xl); break;
+		case 0xfc7: push(m_yp); break;
+		case 0xfc8: push(m_yh); break;
+		case 0xfc9: push(m_yl); break;
+		case 0xfca: push(m_f); break;
+
+		// POP r/Xphl/Yphl/F: pop value from stack
+		case 0xfd0: m_a = pop(); break;
+		case 0xfd1: m_b = pop(); break;
+		case 0xfd2: write_mx(pop()); break;
+		case 0xfd3: write_my(pop()); break;
+		case 0xfd4: m_xp = pop(); break;
+		case 0xfd5: m_xh = pop(); break;
+		case 0xfd6: m_xl = pop(); break;
+		case 0xfd7: m_yp = pop(); break;
+		case 0xfd8: m_yh = pop(); break;
+		case 0xfd9: m_yl = pop(); break;
+		case 0xfda: m_f = pop(); break;
+
+		// RETS: return from subroutine, then skip next instruction
+		case 0xfde:
+			m_icount -= 7;
+			pop_pc();
+			m_pc = (m_pc & 0x1000) | ((m_pc + 1) & 0x0fff);
+			break;
+
+		// RET: return from subroutine
+		case 0xfdf:
+			m_icount -= 2;
+			pop_pc();
+			break;
+
+		// JPBA: jump indirect using registers A and B
+		case 0xfe8:
+			m_pc = m_jpc | m_b << 4 | m_a;
+			break;
+
+		// HALT: halt (stop clock)
+		case 0xff8:
+			break;
+
+		// SLP: sleep (stop oscillation)
+		case 0xff9:
+			break;
+
+		// NOP5: no operation (5 clock cycles)
+		case 0xffb:
+			break;
+
+		// NOP7: no operation (7 clock cycles)
+		case 0xfff:
+			m_icount -= 2;
+			break;
+
+
+		default:
+			switch (m_op & 0xff0)
+			{
+
+		// LD r,i: load register with 4-bit immediate data
+		case 0xe00: m_a = m_op & 0xf; break;
+		case 0xe10: m_b = m_op & 0xf; break;
+		case 0xe20: write_mx(m_op & 0xf); break;
+		case 0xe30: write_my(m_op & 0xf); break;
+
+		// LDPX MX,i: LD MX,i, then increment X
+		case 0xe60:
+			write_mx(m_op & 0xf); inc_x();
+			break;
+
+		// LDPY MY,i: LD MY,i, then increment Y
+		case 0xe70:
+			write_my(m_op & 0xf); inc_y();
+			break;
+
+		// LD A,Mn: load A with memory
+		case 0xfa0:
+			m_a = read_mn();
+			break;
+
+		// LD B,Mn: load B with memory
+		case 0xfb0:
+			m_b = read_mn();
+			break;
+
+		// LD Mn,A: load memory with A
+		case 0xf80: 
+			write_mn(m_a);
+			break;
+
+		// LD Mn,B: load memory with B
+		case 0xf90:
+			write_mn(m_b);
+			break;
+
+		// INC Mn: increment memory (affect flags: C, Z)
+		case 0xf60:
+		{
+			m_icount -= 2;
+			UINT8 t = read_mn();
+			t = (t + 1) & 0xf;
+			write_mn(t);
+			m_f = (m_f & ~1) | ((t == 0) ? 1 : 0);
+			set_zf(t);
+			break;
+		}
+
+		// DEC Mn: decrement memory (affect flags: C, Z)
+		case 0xf70:
+		{
+			m_icount -= 2;
+			UINT8 t = read_mn();
+			t = (t - 1) & 0xf;
+			write_mn(t);
+			m_f = (m_f & ~1) | ((t == 0xf) ? 1 : 0);
+			set_zf(t);
+			break;
+		}
+
+		// ADD r,i
+		case 0xc00:
+		case 0xc10:
+		case 0xc20:
+		case 0xc30:
+
+		// ADC r,i
+		case 0xc40:
+		case 0xc50:
+		case 0xc60:
+		case 0xc70:
+
+
+		// ADC XH,i
+		case 0xa00:
+			break;
+
+		// ADC XL,i
+		case 0xa10:
+			break;
+
+		// ADC YH,i
+		case 0xa20:
+			break;
+
+		// ADC YL,i
+		case 0xa30:
+			break;
+
+
+
+		// SBC r,i
+		case 0xd40:
+		case 0xd50:
+		case 0xd60:
+		case 0xd70:
+
+
+		// CP r,i: SUB r,i, but discard result (D flag has no effect)
+		case 0xdc0:
+		case 0xdd0:
+		case 0xde0:
+		case 0xdf0:
+
+
+		// CP XH,i
+		case 0xa40:
+			break;
+
+		// CP XL,i
+		case 0xa50:
+			break;
+
+		// CP YH,i
+		case 0xa60:
+			break;
+
+		// CP YL,i
+		case 0xa70:
+			break;
+
+
+
+
+
+		// AND r,i: logical AND register with 4-bit immediate data (affect flags: Z)
+		case 0xc80: m_icount -= 2; m_a &= m_op & 0xf; set_zf(m_a); break;
+		case 0xc90: m_icount -= 2; m_b &= m_op & 0xf; set_zf(m_b); break;
+		case 0xca0: m_icount -= 2; { UINT8 t = read_mx() & (m_op & 0xf); write_mx(t); set_zf(t); break; }
+		case 0xcb0: m_icount -= 2; { UINT8 t = read_my() & (m_op & 0xf); write_my(t); set_zf(t); break; }
+
+		// FAN r,i: AND r,i, but discard result
+		case 0xd80: m_icount -= 2; set_zf(m_a & (m_op & 0xf)); break;
+		case 0xd90: m_icount -= 2; set_zf(m_b & (m_op & 0xf)); break;
+		case 0xda0: m_icount -= 2; set_zf(read_mx() & (m_op & 0xf)); break;
+		case 0xdb0: m_icount -= 2; set_zf(read_my() & (m_op & 0xf)); break;
+
+		// OR r,i: logical OR register with 4-bit immediate data (affect flags: Z)
+		case 0xcc0: m_icount -= 2; m_a |= m_op & 0xf; set_zf(m_a); break;
+		case 0xcd0: m_icount -= 2; m_b |= m_op & 0xf; set_zf(m_b); break;
+		case 0xce0: m_icount -= 2; { UINT8 t = read_mx() | (m_op & 0xf); write_mx(t); set_zf(t); break; }
+		case 0xcf0: m_icount -= 2; { UINT8 t = read_my() | (m_op & 0xf); write_my(t); set_zf(t); break; }
+
+		// XOR r,i: exclusive-OR register with 4-bit immediate data (affect flags: Z)
+		case 0xd00: m_icount -= 2; m_a ^= m_op & 0xf; set_zf(m_a); break;
+		case 0xd10: m_icount -= 2; m_b ^= m_op & 0xf; set_zf(m_b); break;
+		case 0xd20: m_icount -= 2; { UINT8 t = read_mx() ^ (m_op & 0xf); write_mx(t); set_zf(t); break; }
+		case 0xd30: m_icount -= 2; { UINT8 t = read_my() ^ (m_op & 0xf); write_my(t); set_zf(t); break; }
+
+		// SET F,i: set flag(s), this includes opcodes SCF, SZF, SDF, EI
+		case 0xf40:
+			m_icount -= 2;
+			m_f |= (m_op & 0xf);
+			break;
+
+		// RST F,i: reset flag(s), this includes opcodes RCF, RZF, RDF, DI
+		case 0xf50:
+			m_icount -= 2;
+			m_f &= (m_op & 0xf);
+			break;
+
+		// PSET p: page set, used to set page/bank before a jump instruction
+		case 0xe40: case 0xe50:
+			m_npc = m_op << 8 & 0x1f00;
+			break;
+
+
+		// illegal opcode
+		default:
+			logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc);
+			break;
+
+			} // 0xff0
+			break;
+
+			} // 0xfff
+			break;
+
+	} // 0xf00 (big switch)
+}
+
+void e0c6200_cpu_device::execute_run()
+{
+	while (m_icount > 0)
+	{
+		// remember previous state, prepare pset-longjump
+		m_prev_op = m_op;
+		m_prev_pc = m_pc;
+		m_jpc = ((m_prev_op & 0xfe0) == 0xe40) ? m_npc : (m_prev_pc & 0x1f00);
+		
+		// fetch next opcode
+		debugger_instruction_hook(this, m_pc);
+		m_op = m_program->read_word(m_pc << 1) & 0xfff;
+		m_pc = (m_pc & 0x1000) | ((m_pc + 1) & 0x0fff);
+		
+		// minimal opcode time is 5 clock cycles, opcodes take 5, 7, or 12 clock cycles
+		m_icount -= 5;
+		
+		// handle opcode
+		execute_one();
+	}
+}
diff --git a/src/emu/cpu/e0c6200/e0c6200.h b/src/emu/cpu/e0c6200/e0c6200.h
new file mode 100644
index 00000000000..fab5263f3a3
--- /dev/null
+++ b/src/emu/cpu/e0c6200/e0c6200.h
@@ -0,0 +1,113 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/*
+
+  Seiko Epson E0C6200 CPU core and E0C62 MCU family
+
+*/
+
+#ifndef _E06200_H_
+#define _E06200_H_
+
+#include "emu.h"
+
+
+class e0c6200_cpu_device : public cpu_device
+{
+public:
+	// construction/destruction
+	e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+		: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
+		, m_program_config("program", ENDIANNESS_BIG, 16, prgwidth, -1, program)
+		, m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data)
+		, m_prgwidth(prgwidth)
+		, m_datawidth(datawidth)
+	{ }
+
+protected:
+	// device-level overrides
+	virtual void device_start();
+	virtual void device_reset();
+
+	// device_execute_interface overrides
+	virtual UINT32 execute_min_cycles() const { return 5; }
+	virtual UINT32 execute_max_cycles() const { return 12; }
+	virtual UINT32 execute_input_lines() const { return 1; }
+	virtual void execute_run();
+	virtual void execute_one();
+
+	// device_memory_interface overrides
+	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL); }
+
+	// device_disasm_interface overrides
+	virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
+	virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
+	virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
+
+	void state_string_export(const device_state_entry &entry, std::string &str);
+
+	address_space_config m_program_config;
+	address_space_config m_data_config;
+	address_space *m_program;
+	address_space *m_data;
+
+	int m_prgwidth;
+	int m_datawidth;
+	int m_prgmask;
+	int m_datamask;
+	
+	UINT16 m_op;
+	UINT16 m_prev_op;
+	int m_icount;
+
+	UINT16 m_pc;            // 13-bit programcounter: 1-bit bank, 4-bit page, 8-bit 'step'
+	UINT16 m_prev_pc;
+	UINT16 m_npc;           // new bank/page prepared by pset
+	UINT16 m_jpc;           // actual bank/page destination for jumps
+	
+	// all work registers are 4-bit
+	UINT8 m_a;              // accumulator
+	UINT8 m_b;              // generic
+	UINT8 m_xp, m_xh, m_xl; // 12-bit index register when combined
+	UINT8 m_yp, m_yh, m_yl; // "
+	UINT8 m_sp;             // stackpointer (SPH, SPL)
+	UINT8 m_f;              // flags
+
+	// misc internal helpers
+	inline void set_zf(UINT8 data) { m_f = (m_f & ~2) | ((data & 0xf) ? 0 : 2); }
+	
+	// internal read/write (MX, MY, Mn/RP)
+	inline UINT8 read_mx() { return m_data->read_byte(m_xp << 8 | m_xh << 4 | m_xl) & 0xf; }
+	inline void write_mx(UINT8 data) { m_data->write_byte(m_xp << 8 | m_xh << 4 | m_xl, data); }
+	inline UINT8 read_my() { return m_data->read_byte(m_yp << 8 | m_yh << 4 | m_yl) & 0xf; }
+	inline void write_my(UINT8 data) { m_data->write_byte(m_yp << 8 | m_yh << 4 | m_yl, data); }
+	inline UINT8 read_mn() { return m_data->read_byte(m_op & 0xf) & 0xf; }
+	inline void write_mn(UINT8 data) { m_data->write_byte(m_op & 0xf, data); }
+
+	inline void inc_x() { m_xl++; m_xh = (m_xh + (m_xl >> 4 & 1)) & 0xf; m_xl &= 0xf; }
+	inline void inc_y() { m_yl++; m_yh = (m_yh + (m_yl >> 4 & 1)) & 0xf; m_yl &= 0xf; }
+
+	// common stack ops
+	inline void push(UINT8 data) { m_data->write_byte(--m_sp, data); }
+	inline UINT8 pop() { return m_data->read_byte(m_sp++) & 0xf; }
+	inline void push_pc() { push(m_pc >> 8 & 0xf); push(m_pc >> 4 & 0xf); push(m_pc & 0xf); }
+	inline void pop_pc() { UINT16 bank = m_pc & 0x1000; m_pc = pop(); m_pc |= pop() << 4; m_pc |= pop() << 8; m_pc |= bank; }
+	
+	// opcode handlers
+	//UINT8 op_rlc(UINT8 data);
+	//UINT8 op_rrc(UINT8 data);
+};
+
+
+class e0c6s46_device : public e0c6200_cpu_device
+{
+public:
+	e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+
+
+extern const device_type EPSON_E0C6S46;
+
+
+#endif /* _E06200_H_ */
diff --git a/src/emu/cpu/e0c6200/e0c6200d.c b/src/emu/cpu/e0c6200/e0c6200d.c
new file mode 100644
index 00000000000..b1f65071545
--- /dev/null
+++ b/src/emu/cpu/e0c6200/e0c6200d.c
@@ -0,0 +1,710 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/*
+
+  Seiko Epson E0C6200 disassembler
+
+*/
+
+#include "emu.h"
+#include "debugger.h"
+#include "e0c6200.h"
+
+// opcode mnemonics
+enum e_mnemonics
+{
+	em_JP, em_RETD, em_CALL, em_CALZ,
+	em_LD, em_LBPX, em_ADC, em_CP, em_ADD, em_SUB, em_SBC, em_AND, em_OR, em_XOR,
+	em_RLC, em_FAN, em_PSET, em_LDPX, em_LDPY, em_SET, em_RST, em_INC, em_DEC,
+	em_RRC, em_ACPX, em_ACPY, em_SCPX, em_SCPY, em_PUSH, em_POP,
+	em_RETS, em_RET, em_JPBA, em_HALT, em_SLP, em_NOP5, em_NOP7,
+	em_NOT, em_SCF, em_SZF, em_SDF, em_EI, em_DI, em_RDF, em_RZF, em_RCF, em_ILL
+};
+
+static const char *const em_name[] =
+{
+	"JP", "RETD", "CALL", "CALZ",
+	"LD", "LBPX", "ADC", "CP", "ADD", "SUB", "SBC", "AND", "OR", "XOR",
+	"RLC", "FAN", "PSET", "LDPX", "LDPY", "SET", "RST", "INC", "DEC",
+	"RRC", "ACPX", "ACPY", "SCPX", "SCPY", "PUSH", "POP",
+	"RETS", "RET", "JPBA", "HALT", "SLP", "NOP5", "NOP7",
+	"NOT", "SCF", "SZF", "SDF", "EI", "DI", "RDF", "RZF", "RCF", "?"
+};
+
+#define _OVER DASMFLAG_STEP_OVER
+#define _OUT  DASMFLAG_STEP_OUT
+
+static const UINT32 em_flags[] =
+{
+	0, _OUT, _OVER, _OVER,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0,
+	_OUT, _OUT, 0, _OVER, _OVER, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+
+// opcode params
+enum e_params
+{
+	ep_S, ep_E, ep_I, ep_R0, ep_R2, ep_R4, ep_Q,
+	ep_cC, ep_cNC, ep_cZ, ep_cNZ,
+	ep_A, ep_B, ep_X, ep_Y, ep_MX, ep_MY, ep_XP, ep_XH, ep_XL, ep_YP, ep_YH, ep_YL,
+	ep_P, ep_F, ep_MN, ep_SP, ep_SPH, ep_SPL
+};
+
+// 0-digit is number of bits per opcode parameter, 0 bits is literal,
+// 0x10-digit is for shift-right, 0x100-digit is special flag for r/q param
+static const UINT16 ep_bits[] =
+{
+	8, 8, 4, 0x102, 0x122, 0x142, 0x102,
+	0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	5, 0, 4, 0, 0, 0
+};
+
+// redirect for r/q param
+static const UINT8 ep_redirect_r[4] = { ep_A, ep_B, ep_MX, ep_MY };
+
+// literal opcode parameter
+static const char *const ep_name[] =
+{
+	" ", " ", " ", " ", " ", " ", " ",
+	"C", "NC", "Z", "NZ",
+	"A", "B", "X", "Y", "MX", "MY", "XP", "XH", "XL", "YP", "YH", "YL",
+	" ", "F", " ", "SP", "SPH", "SPL"
+};
+
+
+static char* decode_param(UINT16 opcode, int param, char* buffer)
+{
+	int bits = ep_bits[param] & 0xf;
+	int shift = ep_bits[param] >> 4 & 0xf;
+	UINT16 opmask = opcode >> shift & ((1 << bits) - 1);
+	
+	// redirect r/q to A/B/MX/MY
+	if (ep_bits[param] & 0x100)
+		param = ep_redirect_r[opmask];
+	
+	// literal param
+	if (ep_bits[param] == 0)
+	{
+		strcpy(buffer, ep_name[param]);
+		return buffer;
+	}
+	
+	// print value like how it's documented in the manual
+	char val[10];
+	if (bits > 4 || opmask > 9)
+		sprintf(val, "%02XH", opmask);
+	else
+		sprintf(val, "%d", opmask);
+	
+	if (param == ep_MN)
+		sprintf(buffer, "M%s", val);
+	else
+		strcpy(buffer, val);
+	
+	return buffer;
+}
+
+
+CPU_DISASSEMBLE(e0c6200)
+{
+	UINT16 op = (oprom[1] | oprom[0] << 8) & 0xfff;
+	
+	int m = -1;
+	int p1 = -1;
+	int p2 = -1;
+
+	// determine id for mnemonic and param(s)
+	switch (op & 0xf00)
+	{
+		// JP s
+		case 0x000:
+			m = em_JP; p1 = ep_S;
+			break;
+
+		// RETD e
+		case 0x100:
+			m = em_RETD; p1 = ep_E;
+			break;
+
+		// JP C,s
+		case 0x200:
+			m = em_JP; p1 = ep_cC; p2 = ep_S;
+			break;
+
+		// JP NC,s
+		case 0x300:
+			m = em_JP; p1 = ep_cNC; p2 = ep_S;
+			break;
+
+		// CALL s
+		case 0x400:
+			m = em_CALL; p1 = ep_S;
+			break;
+
+		// CALZ s
+		case 0x500:
+			m = em_CALZ; p1 = ep_S;
+			break;
+
+		// JP Z,s
+		case 0x600:
+			m = em_JP; p1 = ep_cZ; p2 = ep_S;
+			break;
+
+		// JP NZ,s
+		case 0x700:
+			m = em_JP; p1 = ep_cNZ; p2 = ep_S;
+			break;
+
+		// LD Y,e
+		case 0x800:
+			m = em_LD; p1 = ep_Y; p2 = ep_E;
+			break;
+
+		// LBPX MX,e
+		case 0x900:
+			m = em_LBPX; p1 = ep_MX; p2 = ep_E;
+			break;
+
+		// LD X,e
+		case 0xb00:
+			m = em_LD; p1 = ep_X; p2 = ep_E;
+			break;
+
+
+		default:
+			switch (op)
+			{
+
+		// RLC r
+		case 0xaf0: case 0xaf5: case 0xafa: case 0xaff:
+		m = em_RLC; p1 = ep_R0;
+		break;
+
+		// NOT r
+		case 0xd0f: case 0xd1f: case 0xd2f: case 0xd3f:
+			m = em_NOT; p1 = ep_R4;
+			break;
+
+		// LD XP,r
+		case 0xe80: case 0xe81: case 0xe82: case 0xe83:
+			m = em_LD; p1 = ep_XP; p2 = ep_R0;
+			break;
+
+		// LD XH,r
+		case 0xe84: case 0xe85: case 0xe86: case 0xe87:
+			m = em_LD; p1 = ep_XH; p2 = ep_R0;
+			break;
+
+		// LD XL,r
+		case 0xe88: case 0xe89: case 0xe8a: case 0xe8b:
+			m = em_LD; p1 = ep_XL; p2 = ep_R0;
+			break;
+
+		// RRC r
+		case 0xe8c: case 0xe8d: case 0xe8e: case 0xe8f:
+			m = em_RRC; p1 = ep_R0;
+			break;
+
+		// LD YP,r
+		case 0xe90: case 0xe91: case 0xe92: case 0xe93:
+			m = em_LD; p1 = ep_YP; p2 = ep_R0;
+			break;
+
+		// LD YH,r
+		case 0xe94: case 0xe95: case 0xe96: case 0xe97:
+			m = em_LD; p1 = ep_YH; p2 = ep_R0;
+			break;
+
+		// LD YL,r
+		case 0xe98: case 0xe99: case 0xe9a: case 0xe9b:
+			m = em_LD; p1 = ep_YL; p2 = ep_R0;
+			break;
+
+		// LD r,XP
+		case 0xea0: case 0xea1: case 0xea2: case 0xea3:
+			m = em_LD; p1 = ep_R0; p2 = ep_XP;
+			break;
+
+		// LD r,XH
+		case 0xea4: case 0xea5: case 0xea6: case 0xea7:
+			m = em_LD; p1 = ep_R0; p2 = ep_XH;
+			break;
+
+		// LD r,XL
+		case 0xea8: case 0xea9: case 0xeaa: case 0xeab:
+			m = em_LD; p1 = ep_R0; p2 = ep_XL;
+			break;
+
+		// LD r,YP
+		case 0xeb0: case 0xeb1: case 0xeb2: case 0xeb3:
+			m = em_LD; p1 = ep_R0; p2 = ep_YP;
+			break;
+
+		// LD r,YH
+		case 0xeb4: case 0xeb5: case 0xeb6: case 0xeb7:
+			m = em_LD; p1 = ep_R0; p2 = ep_YH;
+			break;
+
+		// LD r,YL
+		case 0xeb8: case 0xeb9: case 0xeba: case 0xebb:
+			m = em_LD; p1 = ep_R0; p2 = ep_YL;
+			break;
+
+		// INC X
+		case 0xee0:
+			m = em_INC; p1 = ep_X;
+			break;
+
+		// INC Y
+		case 0xef0:
+			m = em_INC; p1 = ep_Y;
+			break;
+
+		// ACPX MX,r
+		case 0xf28: case 0xf29: case 0xf2a: case 0xf2b:
+			m = em_ACPX; p1 = ep_MX; p2 = ep_R0;
+			break;
+
+		// ACPY MY,r
+		case 0xf2c: case 0xf2d: case 0xf2e: case 0xf2f:
+			m = em_ACPY; p1 = ep_MY; p2 = ep_R0;
+			break;
+
+		// SCPX MX,r
+		case 0xf38: case 0xf39: case 0xf3a: case 0xf3b:
+			m = em_SCPX; p1 = ep_MX; p2 = ep_R0;
+			break;
+
+		// SCPY MY,r
+		case 0xf3c: case 0xf3d: case 0xf3e: case 0xf3f:
+			m = em_SCPY; p1 = ep_MY; p2 = ep_R0;
+			break;
+
+		// SCF
+		case 0xf41:
+			m = em_SCF;
+			break;
+
+		// SZF
+		case 0xf42:
+			m = em_SZF;
+			break;
+
+		// SDF
+		case 0xf44:
+			m = em_SDF;
+			break;
+
+		// EI
+		case 0xf48:
+			m = em_EI;
+			break;
+
+		// DI
+		case 0xf57:
+			m = em_DI;
+			break;
+
+		// RDF
+		case 0xf5b:
+			m = em_RDF;
+			break;
+
+		// RZF
+		case 0xf5d:
+			m = em_RZF;
+			break;
+
+		// RCF
+		case 0xf5e:
+			m = em_RCF;
+			break;
+
+		// PUSH r
+		case 0xfc0: case 0xfc1: case 0xfc2: case 0xfc3:
+			m = em_PUSH; p1 = ep_R0;
+			break;
+
+		// PUSH XP
+		case 0xfc4:
+			m = em_PUSH; p1 = ep_XP;
+			break;
+
+		// PUSH XH
+		case 0xfc5:
+			m = em_PUSH; p1 = ep_XH;
+			break;
+
+		// PUSH XL
+		case 0xfc6:
+			m = em_PUSH; p1 = ep_XL;
+			break;
+
+		// PUSH YP
+		case 0xfc7:
+			m = em_PUSH; p1 = ep_YP;
+			break;
+
+		// PUSH YH
+		case 0xfc8:
+			m = em_PUSH; p1 = ep_YH;
+			break;
+
+		// PUSH YL
+		case 0xfc9:
+			m = em_PUSH; p1 = ep_YL;
+			break;
+
+		// PUSH F
+		case 0xfca:
+			m = em_PUSH; p1 = ep_F;
+			break;
+
+		// DEC SP
+		case 0xfcb:
+			m = em_DEC; p1 = ep_SP;
+			break;
+
+		// POP r
+		case 0xfd0: case 0xfd1: case 0xfd2: case 0xfd3:
+			m = em_POP; p1 = ep_R0;
+			break;
+
+		// POP XP
+		case 0xfd4:
+			m = em_POP; p1 = ep_XP;
+			break;
+
+		// POP XH
+		case 0xfd5:
+			m = em_POP; p1 = ep_XH;
+			break;
+
+		// POP XL
+		case 0xfd6:
+			m = em_POP; p1 = ep_XL;
+			break;
+
+		// POP YP
+		case 0xfd7:
+			m = em_POP; p1 = ep_YP;
+			break;
+
+		// POP YH
+		case 0xfd8:
+			m = em_POP; p1 = ep_YH;
+			break;
+
+		// POP YL
+		case 0xfd9:
+			m = em_POP; p1 = ep_YL;
+			break;
+
+		// POP F
+		case 0xfda:
+			m = em_POP; p1 = ep_F;
+			break;
+
+		// INC SP
+		case 0xfdb:
+			m = em_INC; p1 = ep_SP;
+			break;
+
+		// RETS
+		case 0xfde:
+			m = em_RETS;
+			break;
+
+		// RET
+		case 0xfdf:
+			m = em_RET;
+			break;
+
+		// LD SPH,r
+		case 0xfe0: case 0xfe1: case 0xfe2: case 0xfe3:
+			m = em_LD; p1 = ep_SPH; p2 = ep_R0;
+			break;
+
+		// LD r,SPH
+		case 0xfe4: case 0xfe5: case 0xfe6: case 0xfe7:
+			m = em_LD; p1 = ep_R0; p2 = ep_SPH;
+			break;
+
+		// JPBA
+		case 0xfe8:
+			m = em_JPBA;
+			break;
+
+		// LD SPL,r
+		case 0xff0: case 0xff1: case 0xff2: case 0xff3:
+			m = em_LD; p1 = ep_SPL; p2 = ep_R0;
+			break;
+
+		// LD r,SPL
+		case 0xff4: case 0xff5: case 0xff6: case 0xff7:
+			m = em_LD; p1 = ep_R0; p2 = ep_SPL;
+			break;
+
+		// HALT
+		case 0xff8:
+			m = em_HALT;
+			break;
+
+		// SLP
+		case 0xff9:
+			m = em_SLP;
+			break;
+
+		// NOP5
+		case 0xffb:
+			m = em_NOP5;
+			break;
+
+		// NOP7
+		case 0xfff:
+			m = em_NOP7;
+			break;
+
+
+		default:
+			switch (op & 0xff0)
+			{
+
+		// ADC XH,i
+		case 0xa00:
+			m = em_ADC; p1 = ep_XH; p2 = ep_I;
+			break;
+
+		// ADC XL,i
+		case 0xa10:
+			m = em_ADC; p1 = ep_XL; p2 = ep_I;
+			break;
+
+		// ADC YH,i
+		case 0xa20:
+			m = em_ADC; p1 = ep_YH; p2 = ep_I;
+			break;
+
+		// ADC YL,i
+		case 0xa30:
+			m = em_ADC; p1 = ep_YL; p2 = ep_I;
+			break;
+
+		// CP XH,i
+		case 0xa40:
+			m = em_CP; p1 = ep_XH; p2 = ep_I;
+			break;
+
+		// CP XL,i
+		case 0xa50:
+			m = em_CP; p1 = ep_XL; p2 = ep_I;
+			break;
+
+		// CP YH,i
+		case 0xa60:
+			m = em_CP; p1 = ep_YH; p2 = ep_I;
+			break;
+
+		// CP YL,i
+		case 0xa70:
+			m = em_CP; p1 = ep_YL; p2 = ep_I;
+			break;
+
+		// ADD r,q
+		case 0xa80:
+			m = em_ADD; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// ADC r,q
+		case 0xa90:
+			m = em_ADC; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// SUB r,q
+		case 0xaa0:
+			m = em_SUB; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// SBC r,q
+		case 0xab0:
+			m = em_SBC; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// AND r,q
+		case 0xac0:
+			m = em_AND; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// OR r,q
+		case 0xad0:
+			m = em_OR; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// XOR r,q
+		case 0xae0:
+			m = em_XOR; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// ADD r,i
+		case 0xc00: case 0xc10: case 0xc20: case 0xc30:
+			m = em_ADD; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// ADC r,i
+		case 0xc40: case 0xc50: case 0xc60: case 0xc70:
+			m = em_ADC; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// AND r,i
+		case 0xc80: case 0xc90: case 0xca0: case 0xcb0:
+			m = em_AND; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// OR r,i
+		case 0xcc0: case 0xcd0: case 0xce0: case 0xcf0:
+			m = em_OR; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// XOR r,i
+		case 0xd00: case 0xd10: case 0xd20: case 0xd30:
+			m = em_XOR; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// SBC r,i
+		case 0xd40: case 0xd50: case 0xd60: case 0xd70:
+			m = em_SBC; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// FAN r,i
+		case 0xd80: case 0xd90: case 0xda0: case 0xdb0:
+			m = em_FAN; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// CP r,i
+		case 0xdc0: case 0xdd0: case 0xde0: case 0xdf0:
+			m = em_CP; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// LD r,i
+		case 0xe00: case 0xe10: case 0xe20: case 0xe30:
+			m = em_LD; p1 = ep_R4; p2 = ep_I;
+			break;
+
+		// PSET p
+		case 0xe40: case 0xe50:
+			m = em_PSET; p1 = ep_P;
+			break;
+
+		// LDPX MX,i
+		case 0xe60:
+			m = em_LDPX; p1 = ep_MX; p2 = ep_I;
+			break;
+
+		// LDPY MY,i
+		case 0xe70:
+			m = em_LDPY; p1 = ep_MY; p2 = ep_I;
+			break;
+
+		// LD r,q
+		case 0xec0:
+			m = em_LD; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// LDPX r,q
+		case 0xee0:
+			m = em_LDPX; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// LDPY r,q
+		case 0xef0:
+			m = em_LDPY; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// CP r,q
+		case 0xf00:
+			m = em_CP; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// FAN r,q
+		case 0xf10:
+			m = em_FAN; p1 = ep_R2; p2 = ep_Q;
+			break;
+
+		// SET F,i
+		case 0xf40:
+			m = em_SET; p1 = ep_F; p2 = ep_I;
+			break;
+
+		// RST F,i
+		case 0xf50:
+			m = em_RST; p1 = ep_F; p2 = ep_I;
+			break;
+
+		// INC Mn
+		case 0xf60:
+			m = em_INC; p1 = ep_MN;
+			break;
+
+		// DEC Mn
+		case 0xf70:
+			m = em_DEC; p1 = ep_MN;
+			break;
+
+		// LD Mn,A
+		case 0xf80:
+			m = em_LD; p1 = ep_MN; p2 = ep_A;
+			break;
+
+		// LD Mn,B
+		case 0xf90:
+			m = em_LD; p1 = ep_MN; p2 = ep_B;
+			break;
+
+		// LD A,Mn
+		case 0xfa0:
+			m = em_LD; p1 = ep_A; p2 = ep_MN;
+			break;
+
+		// LD B,Mn
+		case 0xfb0:
+			m = em_LD; p1 = ep_B; p2 = ep_MN;
+			break;
+
+
+		// illegal opcode
+		default:
+			m = em_ILL;
+			break;
+
+			} // 0xff0
+			break;
+
+			} // 0xfff
+			break;
+
+	} // 0xf00 (big switch)
+
+
+	// fetch mnemonic
+	char *dst = buffer;
+	dst += sprintf(dst, "%-6s", em_name[m]);
+	
+	// fetch param(s)
+	char pbuffer[10];
+	if (p1 != -1)
+	{
+		dst += sprintf(dst, "%s", decode_param(op, p1, pbuffer));
+		if (p2 != -1)
+		{
+			dst += sprintf(dst, ",%s", decode_param(op, p2, pbuffer));
+		}
+	}
+	
+	return 1 | em_flags[m] | DASMFLAG_SUPPORTED;
+}
diff --git a/src/emu/cpu/e132xs/32xsdasm.c b/src/emu/cpu/e132xs/32xsdasm.c
index d572f425e1e..76eb3953092 100644
--- a/src/emu/cpu/e132xs/32xsdasm.c
+++ b/src/emu/cpu/e132xs/32xsdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Hyperstone disassembler
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index 613bc57a03f..3d07a33488f 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
  Hyperstone cpu emulator
  written by Pierpaolo Prazzoli
diff --git a/src/emu/cpu/e132xs/e132xs.h b/src/emu/cpu/e132xs/e132xs.h
index 2d8bc976cf8..a12feed7c25 100644
--- a/src/emu/cpu/e132xs/e132xs.h
+++ b/src/emu/cpu/e132xs/e132xs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __E132XS_H__
diff --git a/src/emu/cpu/es5510/es5510.c b/src/emu/cpu/es5510/es5510.c
index 6f5b53ae347..91f92bd25e5 100644
--- a/src/emu/cpu/es5510/es5510.c
+++ b/src/emu/cpu/es5510/es5510.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
  *
  *   es5510.c - Ensoniq ES5510 (ESP) emulation
diff --git a/src/emu/cpu/es5510/es5510.h b/src/emu/cpu/es5510/es5510.h
index 974c8511705..2db213496e4 100644
--- a/src/emu/cpu/es5510/es5510.h
+++ b/src/emu/cpu/es5510/es5510.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
  *
  *   es5510.h - Ensoniq ES5510 (ESP) driver
diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c
index 5bbcebeee08..a28254a8482 100644
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esrip.c
diff --git a/src/emu/cpu/esrip/esrip.h b/src/emu/cpu/esrip/esrip.h
index 2cf5b335aad..13ec36f778f 100644
--- a/src/emu/cpu/esrip/esrip.h
+++ b/src/emu/cpu/esrip/esrip.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esrip.h
diff --git a/src/emu/cpu/esrip/esripdsm.c b/src/emu/cpu/esrip/esripdsm.c
index 84f8882ad72..d9a2a641660 100644
--- a/src/emu/cpu/esrip/esripdsm.c
+++ b/src/emu/cpu/esrip/esripdsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esripdsm.c
diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c
index 6c5db98e721..0199c54b743 100644
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@@ -1,22 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   f8.c
  *   Portable F8 emulator (Fairchild 3850)
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *  This work is based on Frank Palazzolo's F8 emulation in a standalone
  *  Fairchild Channel F emulator and the 'Fairchild F3850 CPU' data sheets.
  *
diff --git a/src/emu/cpu/f8/f8.h b/src/emu/cpu/f8/f8.h
index e2045e42ff9..a478cf137b1 100644
--- a/src/emu/cpu/f8/f8.h
+++ b/src/emu/cpu/f8/f8.h
@@ -1,22 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   f8.h
  *   Portable Fairchild F8 emulator interface
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *****************************************************************************/
 
 #pragma once
diff --git a/src/emu/cpu/f8/f8dasm.c b/src/emu/cpu/f8/f8dasm.c
index a28a1b004c4..367d70377ff 100644
--- a/src/emu/cpu/f8/f8dasm.c
+++ b/src/emu/cpu/f8/f8dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "f8.h"
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index feedb58ef59..1e20780f636 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* =============================== COPYRIGHT ============================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/g65816/g65816.h b/src/emu/cpu/g65816/g65816.h
index 2f6973ab195..7f2cd9a2f98 100644
--- a/src/emu/cpu/g65816/g65816.h
+++ b/src/emu/cpu/g65816/g65816.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __G65816_H__
diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h
index 015d645d2da..faf94f44e59 100644
--- a/src/emu/cpu/g65816/g65816cm.h
+++ b/src/emu/cpu/g65816/g65816cm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __G65816CM_H__
diff --git a/src/emu/cpu/g65816/g65816ds.c b/src/emu/cpu/g65816/g65816ds.c
index 1228d7283ce..296e6ea6f37 100644
--- a/src/emu/cpu/g65816/g65816ds.c
+++ b/src/emu/cpu/g65816/g65816ds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* =============================== COPYRIGHT ============================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/g65816/g65816ds.h b/src/emu/cpu/g65816/g65816ds.h
index af86043726d..44c82ee7ae8 100644
--- a/src/emu/cpu/g65816/g65816ds.h
+++ b/src/emu/cpu/g65816/g65816ds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __G65816DS_H__
diff --git a/src/emu/cpu/g65816/g65816o0.c b/src/emu/cpu/g65816/g65816o0.c
index 38872d15915..8a3a9acbf4a 100644
--- a/src/emu/cpu/g65816/g65816o0.c
+++ b/src/emu/cpu/g65816/g65816o0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "g65816.h"
diff --git a/src/emu/cpu/g65816/g65816o1.c b/src/emu/cpu/g65816/g65816o1.c
index 8c31596c947..49b81ff9039 100644
--- a/src/emu/cpu/g65816/g65816o1.c
+++ b/src/emu/cpu/g65816/g65816o1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "g65816.h"
diff --git a/src/emu/cpu/g65816/g65816o2.c b/src/emu/cpu/g65816/g65816o2.c
index bc8c0103abd..149668e5b77 100644
--- a/src/emu/cpu/g65816/g65816o2.c
+++ b/src/emu/cpu/g65816/g65816o2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "g65816.h"
diff --git a/src/emu/cpu/g65816/g65816o3.c b/src/emu/cpu/g65816/g65816o3.c
index d2b8697efe6..9a25d11f868 100644
--- a/src/emu/cpu/g65816/g65816o3.c
+++ b/src/emu/cpu/g65816/g65816o3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "g65816.h"
diff --git a/src/emu/cpu/g65816/g65816o4.c b/src/emu/cpu/g65816/g65816o4.c
index a66ba011d38..17840ef3e23 100644
--- a/src/emu/cpu/g65816/g65816o4.c
+++ b/src/emu/cpu/g65816/g65816o4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "g65816.h"
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h
index 2efcbac5208..de0a278c6d5 100644
--- a/src/emu/cpu/g65816/g65816op.h
+++ b/src/emu/cpu/g65816/g65816op.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* ======================================================================== */
 /* ============================= CONFIGURATION ============================ */
diff --git a/src/emu/cpu/h6280/6280dasm.c b/src/emu/cpu/h6280/6280dasm.c
index cf40842aede..0414e0d0523 100644
--- a/src/emu/cpu/h6280/6280dasm.c
+++ b/src/emu/cpu/h6280/6280dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     6280dasm.c Hudsonsoft Hu6280 (HuC6280/Hu6280a) disassembler
diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c
index ec6a11f6775..e06912eedde 100644
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     h6280.c - Portable HuC6280 emulator
diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h
index 892be50308c..a075e9dcc92 100644
--- a/src/emu/cpu/h6280/h6280.h
+++ b/src/emu/cpu/h6280/h6280.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     h6280.h Portable Hu6280 emulator interface
diff --git a/src/emu/cpu/h8/h8.c b/src/emu/cpu/h8/h8.c
index cd2f7ecd17f..6346bab3267 100644
--- a/src/emu/cpu/h8/h8.c
+++ b/src/emu/cpu/h8/h8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8.h
diff --git a/src/emu/cpu/h8/h8.h b/src/emu/cpu/h8/h8.h
index b3a7a072ec9..af281d910b7 100644
--- a/src/emu/cpu/h8/h8.h
+++ b/src/emu/cpu/h8/h8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8.h
diff --git a/src/emu/cpu/h8/h83002.c b/src/emu/cpu/h8/h83002.c
index 840a50345cc..fbd5e53affc 100644
--- a/src/emu/cpu/h8/h83002.c
+++ b/src/emu/cpu/h8/h83002.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h83002.h"
 
diff --git a/src/emu/cpu/h8/h83002.h b/src/emu/cpu/h8/h83002.h
index f3d9745c321..c2ce8129a61 100644
--- a/src/emu/cpu/h8/h83002.h
+++ b/src/emu/cpu/h8/h83002.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h83002.h
diff --git a/src/emu/cpu/h8/h83006.c b/src/emu/cpu/h8/h83006.c
index 0cf662cc919..bbca3f00624 100644
--- a/src/emu/cpu/h8/h83006.c
+++ b/src/emu/cpu/h8/h83006.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h83006.h"
 
diff --git a/src/emu/cpu/h8/h83006.h b/src/emu/cpu/h8/h83006.h
index 9d2061dcd3e..7053d2fd26d 100644
--- a/src/emu/cpu/h8/h83006.h
+++ b/src/emu/cpu/h8/h83006.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h83006.h
diff --git a/src/emu/cpu/h8/h83008.c b/src/emu/cpu/h8/h83008.c
index b2cc89aa00f..6acea2cefda 100644
--- a/src/emu/cpu/h8/h83008.c
+++ b/src/emu/cpu/h8/h83008.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h83008.h"
 
diff --git a/src/emu/cpu/h8/h83008.h b/src/emu/cpu/h8/h83008.h
index 699f7453897..21e9c9ba406 100644
--- a/src/emu/cpu/h8/h83008.h
+++ b/src/emu/cpu/h8/h83008.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h83008.h
diff --git a/src/emu/cpu/h8/h83048.c b/src/emu/cpu/h8/h83048.c
index 2f4ef504199..b9ff505fdea 100644
--- a/src/emu/cpu/h8/h83048.c
+++ b/src/emu/cpu/h8/h83048.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h83048.h"
 
diff --git a/src/emu/cpu/h8/h83048.h b/src/emu/cpu/h8/h83048.h
index d3bcf295d11..10554c65975 100644
--- a/src/emu/cpu/h8/h83048.h
+++ b/src/emu/cpu/h8/h83048.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h83048.h
diff --git a/src/emu/cpu/h8/h83337.c b/src/emu/cpu/h8/h83337.c
index 2a4f261a517..928dbbcdb69 100644
--- a/src/emu/cpu/h8/h83337.c
+++ b/src/emu/cpu/h8/h83337.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h83337.h"
 
diff --git a/src/emu/cpu/h8/h83337.h b/src/emu/cpu/h8/h83337.h
index ed5467cd801..5cde8314efc 100644
--- a/src/emu/cpu/h8/h83337.h
+++ b/src/emu/cpu/h8/h83337.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h83337.h
diff --git a/src/emu/cpu/h8/h8_adc.c b/src/emu/cpu/h8/h8_adc.c
index 5925bf7e5fb..4ccd75891d3 100644
--- a/src/emu/cpu/h8/h8_adc.c
+++ b/src/emu/cpu/h8/h8_adc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_adc.h"
 
diff --git a/src/emu/cpu/h8/h8_adc.h b/src/emu/cpu/h8/h8_adc.h
index 314af72c24b..8d30c1c1cbb 100644
--- a/src/emu/cpu/h8/h8_adc.h
+++ b/src/emu/cpu/h8/h8_adc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_adc.h
diff --git a/src/emu/cpu/h8/h8_intc.c b/src/emu/cpu/h8/h8_intc.c
index 1aeddcaeefe..717437fbb9c 100644
--- a/src/emu/cpu/h8/h8_intc.c
+++ b/src/emu/cpu/h8/h8_intc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_intc.h"
 
diff --git a/src/emu/cpu/h8/h8_intc.h b/src/emu/cpu/h8/h8_intc.h
index bc28b26d604..2f47e618c59 100644
--- a/src/emu/cpu/h8/h8_intc.h
+++ b/src/emu/cpu/h8/h8_intc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_intc.h
diff --git a/src/emu/cpu/h8/h8_port.c b/src/emu/cpu/h8/h8_port.c
index db78d88e589..78dd0cd90a8 100644
--- a/src/emu/cpu/h8/h8_port.c
+++ b/src/emu/cpu/h8/h8_port.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_port.h"
 
diff --git a/src/emu/cpu/h8/h8_port.h b/src/emu/cpu/h8/h8_port.h
index 10df3d8a3e2..2db8636b55d 100644
--- a/src/emu/cpu/h8/h8_port.h
+++ b/src/emu/cpu/h8/h8_port.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_port.h
diff --git a/src/emu/cpu/h8/h8_sci.c b/src/emu/cpu/h8/h8_sci.c
index 0052adee626..df99d160113 100644
--- a/src/emu/cpu/h8/h8_sci.c
+++ b/src/emu/cpu/h8/h8_sci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_sci.h"
 
diff --git a/src/emu/cpu/h8/h8_sci.h b/src/emu/cpu/h8/h8_sci.h
index 67590e3bf4c..5abf3822186 100644
--- a/src/emu/cpu/h8/h8_sci.h
+++ b/src/emu/cpu/h8/h8_sci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_sci.h
diff --git a/src/emu/cpu/h8/h8_timer16.c b/src/emu/cpu/h8/h8_timer16.c
index 56f6089b3f4..019680f9358 100644
--- a/src/emu/cpu/h8/h8_timer16.c
+++ b/src/emu/cpu/h8/h8_timer16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_timer16.h"
 
diff --git a/src/emu/cpu/h8/h8_timer16.h b/src/emu/cpu/h8/h8_timer16.h
index 2f3c581fe55..b39a22804c0 100644
--- a/src/emu/cpu/h8/h8_timer16.h
+++ b/src/emu/cpu/h8/h8_timer16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_timer16.h
diff --git a/src/emu/cpu/h8/h8_timer8.c b/src/emu/cpu/h8/h8_timer8.c
index b6e0d478a3b..d18dff3e3b1 100644
--- a/src/emu/cpu/h8/h8_timer8.c
+++ b/src/emu/cpu/h8/h8_timer8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8_timer8.h"
 
diff --git a/src/emu/cpu/h8/h8_timer8.h b/src/emu/cpu/h8/h8_timer8.h
index fb73a7eb17e..be254e36e6f 100644
--- a/src/emu/cpu/h8/h8_timer8.h
+++ b/src/emu/cpu/h8/h8_timer8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8_timer8.h
diff --git a/src/emu/cpu/h8/h8h.c b/src/emu/cpu/h8/h8h.c
index 9f803bdde0f..6f8cfb2b493 100644
--- a/src/emu/cpu/h8/h8h.c
+++ b/src/emu/cpu/h8/h8h.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8h.h"
 
diff --git a/src/emu/cpu/h8/h8h.h b/src/emu/cpu/h8/h8h.h
index a5dee3990b1..9889ef62e07 100644
--- a/src/emu/cpu/h8/h8h.h
+++ b/src/emu/cpu/h8/h8h.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8h.h
diff --git a/src/emu/cpu/h8/h8s2000.c b/src/emu/cpu/h8/h8s2000.c
index c59eaa5ef09..2727fb1ce5d 100644
--- a/src/emu/cpu/h8/h8s2000.c
+++ b/src/emu/cpu/h8/h8s2000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2000.h"
 
diff --git a/src/emu/cpu/h8/h8s2000.h b/src/emu/cpu/h8/h8s2000.h
index 82a933acf8c..160f478a76e 100644
--- a/src/emu/cpu/h8/h8s2000.h
+++ b/src/emu/cpu/h8/h8s2000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2000.h
diff --git a/src/emu/cpu/h8/h8s2245.c b/src/emu/cpu/h8/h8s2245.c
index 77b50d617cf..1b15fe4c2d5 100644
--- a/src/emu/cpu/h8/h8s2245.c
+++ b/src/emu/cpu/h8/h8s2245.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2245.h"
 
diff --git a/src/emu/cpu/h8/h8s2245.h b/src/emu/cpu/h8/h8s2245.h
index d0b7108641c..44a717d0328 100644
--- a/src/emu/cpu/h8/h8s2245.h
+++ b/src/emu/cpu/h8/h8s2245.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2245.h
diff --git a/src/emu/cpu/h8/h8s2320.c b/src/emu/cpu/h8/h8s2320.c
index 5aca191a4c2..e935bfd95f4 100644
--- a/src/emu/cpu/h8/h8s2320.c
+++ b/src/emu/cpu/h8/h8s2320.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2320.h"
 
diff --git a/src/emu/cpu/h8/h8s2320.h b/src/emu/cpu/h8/h8s2320.h
index 0df2d0761a4..7e510535476 100644
--- a/src/emu/cpu/h8/h8s2320.h
+++ b/src/emu/cpu/h8/h8s2320.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2320.h
diff --git a/src/emu/cpu/h8/h8s2357.c b/src/emu/cpu/h8/h8s2357.c
index b03e54a7916..2caf7f7aa67 100644
--- a/src/emu/cpu/h8/h8s2357.c
+++ b/src/emu/cpu/h8/h8s2357.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2357.h"
 
diff --git a/src/emu/cpu/h8/h8s2357.h b/src/emu/cpu/h8/h8s2357.h
index b38f90e7737..9571bb07b7d 100644
--- a/src/emu/cpu/h8/h8s2357.h
+++ b/src/emu/cpu/h8/h8s2357.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2357.h
diff --git a/src/emu/cpu/h8/h8s2600.c b/src/emu/cpu/h8/h8s2600.c
index 79853f1327e..48960b1a1fc 100644
--- a/src/emu/cpu/h8/h8s2600.c
+++ b/src/emu/cpu/h8/h8s2600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2600.h"
 
diff --git a/src/emu/cpu/h8/h8s2600.h b/src/emu/cpu/h8/h8s2600.h
index 4f9ec062393..a038c21f907 100644
--- a/src/emu/cpu/h8/h8s2600.h
+++ b/src/emu/cpu/h8/h8s2600.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2600.h
diff --git a/src/emu/cpu/h8/h8s2655.c b/src/emu/cpu/h8/h8s2655.c
index 0d4d8c8bdb5..2ed63e685ac 100644
--- a/src/emu/cpu/h8/h8s2655.c
+++ b/src/emu/cpu/h8/h8s2655.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "h8s2655.h"
 
diff --git a/src/emu/cpu/h8/h8s2655.h b/src/emu/cpu/h8/h8s2655.h
index ca90c99d777..99a9946f64e 100644
--- a/src/emu/cpu/h8/h8s2655.h
+++ b/src/emu/cpu/h8/h8s2655.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     h8s2655.h
diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/emu/cpu/hcd62121/hcd62121.c
index f446b80f921..3209cc4e214 100644
--- a/src/emu/cpu/hcd62121/hcd62121.c
+++ b/src/emu/cpu/hcd62121/hcd62121.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hitachi hcd62121 cpu core emulation.
diff --git a/src/emu/cpu/hcd62121/hcd62121.h b/src/emu/cpu/hcd62121/hcd62121.h
index 60a5f35c101..5285cff01c1 100644
--- a/src/emu/cpu/hcd62121/hcd62121.h
+++ b/src/emu/cpu/hcd62121/hcd62121.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __HCD62121_H__
 #define __HCD62121_H__
 
diff --git a/src/emu/cpu/hcd62121/hcd62121_ops.h b/src/emu/cpu/hcd62121/hcd62121_ops.h
index ec68d8e51c6..b80ea574bf1 100644
--- a/src/emu/cpu/hcd62121/hcd62121_ops.h
+++ b/src/emu/cpu/hcd62121/hcd62121_ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define HCD62121_MSK                                                                        \
 		{                                                                                   \
diff --git a/src/emu/cpu/hcd62121/hcd62121d.c b/src/emu/cpu/hcd62121/hcd62121d.c
index 7cdb527b9e0..0777c8a237c 100644
--- a/src/emu/cpu/hcd62121/hcd62121d.c
+++ b/src/emu/cpu/hcd62121/hcd62121d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "debugger.h"
diff --git a/src/emu/cpu/hmcs40/hmcs40.h b/src/emu/cpu/hmcs40/hmcs40.h
index b5967a4d640..9e722f595a6 100644
--- a/src/emu/cpu/hmcs40/hmcs40.h
+++ b/src/emu/cpu/hmcs40/hmcs40.h
@@ -153,7 +153,7 @@ protected:
 	virtual void execute_run();
 
 	// device_memory_interface overrides
-	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config :((spacenum == AS_DATA) ? &m_data_config : NULL); }
+	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL); }
 
 	// device_disasm_interface overrides
 	virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
diff --git a/src/emu/cpu/i8085/8085dasm.c b/src/emu/cpu/i8085/8085dasm.c
index 9f84643415f..e68bdfac337 100644
--- a/src/emu/cpu/i8085/8085dasm.c
+++ b/src/emu/cpu/i8085/8085dasm.c
@@ -1,45 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   8085dasm.c
  *   Portable I8085A disassembler
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  *****************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index ef44db0284f..f510afc5dd9 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   i8085.c
@@ -37,44 +39,6 @@
  *     OUT (#),A      10      11     /
  *     EX (SP),HL     18      19    /
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  * Revisions:
  *
  * xx-xx-2002 Acho A. Tang
diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h
index 63b340ddadd..fced49784a4 100644
--- a/src/emu/cpu/i8085/i8085.h
+++ b/src/emu/cpu/i8085/i8085.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __I8085_H__
 #define __I8085_H__
 
diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/emu/cpu/i8085/i8085cpu.h
index 0c65dd1b82a..e21171c7ed7 100644
--- a/src/emu/cpu/i8085/i8085cpu.h
+++ b/src/emu/cpu/i8085/i8085cpu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************
  *
  *      Portable (hopefully ;-) 8085A emulator
diff --git a/src/emu/cpu/i8089/i8089.c b/src/emu/cpu/i8089/i8089.c
index 03d5d9d2856..9062ebbbe88 100644
--- a/src/emu/cpu/i8089/i8089.c
+++ b/src/emu/cpu/i8089/i8089.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i8089/i8089.h b/src/emu/cpu/i8089/i8089.h
index 4f325a7ac4e..010c8b8fbf9 100644
--- a/src/emu/cpu/i8089/i8089.h
+++ b/src/emu/cpu/i8089/i8089.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i8089/i8089_channel.c b/src/emu/cpu/i8089/i8089_channel.c
index 6b5839a4657..d7ffc592d2a 100644
--- a/src/emu/cpu/i8089/i8089_channel.c
+++ b/src/emu/cpu/i8089/i8089_channel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i8089/i8089_channel.h b/src/emu/cpu/i8089/i8089_channel.h
index c6691fb4ff2..ed3d7054b0e 100644
--- a/src/emu/cpu/i8089/i8089_channel.h
+++ b/src/emu/cpu/i8089/i8089_channel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i8089/i8089_dasm.c b/src/emu/cpu/i8089/i8089_dasm.c
index 2f8a90e53ef..d36b5af2246 100644
--- a/src/emu/cpu/i8089/i8089_dasm.c
+++ b/src/emu/cpu/i8089/i8089_dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i8089/i8089_ops.c b/src/emu/cpu/i8089/i8089_ops.c
index 9b8a0311248..deaa46fb0ad 100644
--- a/src/emu/cpu/i8089/i8089_ops.c
+++ b/src/emu/cpu/i8089/i8089_ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8089 I/O Processor
diff --git a/src/emu/cpu/i86/i186.c b/src/emu/cpu/i86/i186.c
index 52f43567902..9b1b3614c78 100644
--- a/src/emu/cpu/i86/i186.c
+++ b/src/emu/cpu/i86/i186.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Peripheral code from rmnimbus driver by Phill Harvey-Smith which is
 // based on the Leland sound driver by Aaron Giles and Paul Leaman
 
diff --git a/src/emu/cpu/i86/i186.h b/src/emu/cpu/i86/i186.h
index 1dcf7ebb9a7..dced2270b44 100644
--- a/src/emu/cpu/i86/i186.h
+++ b/src/emu/cpu/i86/i186.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef I186_H__
 #define I186_H__
 
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index 763794cb69a..47be9f2ab7e 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i286.h"
 #include "debugger.h"
 #include "i86inline.h"
diff --git a/src/emu/cpu/i86/i286.h b/src/emu/cpu/i86/i286.h
index 466c672ac78..46015b18165 100644
--- a/src/emu/cpu/i86/i286.h
+++ b/src/emu/cpu/i86/i286.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef I286_H_
 #define I286_H_
 
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 3809610d819..e32ec405139 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     NEC V20/V30/V33 emulator modified back to a 8086/80186 emulator
diff --git a/src/emu/cpu/i86/i86.h b/src/emu/cpu/i86/i86.h
index 8c0618e10d5..14100a7363d 100644
--- a/src/emu/cpu/i86/i86.h
+++ b/src/emu/cpu/i86/i86.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __I8086_H__
 #define __I8086_H__
 
diff --git a/src/emu/cpu/i86/i86inline.h b/src/emu/cpu/i86/i86inline.h
index 3998506ad72..05a8a2cd30f 100644
--- a/src/emu/cpu/i86/i86inline.h
+++ b/src/emu/cpu/i86/i86inline.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i86.h"
 
 #define CF      (m_CarryVal!=0)
diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c
index fb0d5d82c7c..6cb81d55b7e 100644
--- a/src/emu/cpu/i860/i860.c
+++ b/src/emu/cpu/i860/i860.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i860.c
diff --git a/src/emu/cpu/i860/i860.h b/src/emu/cpu/i860/i860.h
index dd2a1321be8..d0486c50fad 100644
--- a/src/emu/cpu/i860/i860.h
+++ b/src/emu/cpu/i860/i860.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i860.h
diff --git a/src/emu/cpu/i860/i860dasm.c b/src/emu/cpu/i860/i860dasm.c
index 5ab52d019ec..495a141637a 100644
--- a/src/emu/cpu/i860/i860dasm.c
+++ b/src/emu/cpu/i860/i860dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i860.h"
 
 /* Sub-group decoders */
diff --git a/src/emu/cpu/i860/i860dis.c b/src/emu/cpu/i860/i860dis.c
index a8edca03df2..6fcaf4d3ea8 100644
--- a/src/emu/cpu/i860/i860dis.c
+++ b/src/emu/cpu/i860/i860dis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i860dis.c
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index a704a964cd9..0c2788c0679 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "i960.h"
diff --git a/src/emu/cpu/i960/i960.h b/src/emu/cpu/i960/i960.h
index c8f791a73a7..d218e585423 100644
--- a/src/emu/cpu/i960/i960.h
+++ b/src/emu/cpu/i960/i960.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __I960_H__
diff --git a/src/emu/cpu/i960/i960dis.c b/src/emu/cpu/i960/i960dis.c
index 80acd100dea..0feb29affb9 100644
--- a/src/emu/cpu/i960/i960dis.c
+++ b/src/emu/cpu/i960/i960dis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Intel i960 disassembler
 
diff --git a/src/emu/cpu/i960/i960dis.h b/src/emu/cpu/i960/i960dis.h
index 3429a9f19d6..881e72d6fce 100644
--- a/src/emu/cpu/i960/i960dis.h
+++ b/src/emu/cpu/i960/i960dis.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __I960DIS_H__
 #define __I960DIS_H__
 
diff --git a/src/emu/cpu/ie15/ie15.c b/src/emu/cpu/ie15/ie15.c
index 03e1f0a91ee..53c73b544e2 100644
--- a/src/emu/cpu/ie15/ie15.c
+++ b/src/emu/cpu/ie15/ie15.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "ie15.h"
diff --git a/src/emu/cpu/ie15/ie15.h b/src/emu/cpu/ie15/ie15.h
index efaeb2bb167..71415898ce4 100644
--- a/src/emu/cpu/ie15/ie15.h
+++ b/src/emu/cpu/ie15/ie15.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __IE15_H__
 #define __IE15_H__
 
diff --git a/src/emu/cpu/ie15/ie15dasm.c b/src/emu/cpu/ie15/ie15dasm.c
index 4f1e7b40385..cf3c66debdd 100644
--- a/src/emu/cpu/ie15/ie15dasm.c
+++ b/src/emu/cpu/ie15/ie15dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #define OP(A)   oprom[(A) - PC]
diff --git a/src/emu/cpu/konami/konamops.c b/src/emu/cpu/konami/konamops.c
index 59e99cdc429..879e0e34a3b 100644
--- a/src/emu/cpu/konami/konamops.c
+++ b/src/emu/cpu/konami/konamops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 HNZVC
diff --git a/src/emu/cpu/konami/konamtbl.c b/src/emu/cpu/konami/konamtbl.c
index 52655c52dd8..6c6539f6c50 100644
--- a/src/emu/cpu/konami/konamtbl.c
+++ b/src/emu/cpu/konami/konamtbl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 INLINE void abx(konami_state *cpustate);
 INLINE void adca_di(konami_state *cpustate);
 INLINE void adca_ex(konami_state *cpustate);
diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/emu/cpu/lh5801/5801dasm.c
index 996d85c94ee..c542ff8a034 100644
--- a/src/emu/cpu/lh5801/5801dasm.c
+++ b/src/emu/cpu/lh5801/5801dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   disasm.c
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index de02d12e49d..e7e4718c25d 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   Copyright Peter Trauner, all rights reserved.
diff --git a/src/emu/cpu/lh5801/lh5801.h b/src/emu/cpu/lh5801/lh5801.h
index 9ad564b1bab..2d61506fe9e 100644
--- a/src/emu/cpu/lh5801/lh5801.h
+++ b/src/emu/cpu/lh5801/lh5801.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   cpustate->h
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c
index 4b34883c4b5..d89030e7377 100644
--- a/src/emu/cpu/lr35902/lr35902.c
+++ b/src/emu/cpu/lr35902/lr35902.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************/
 /**                                                         **/
 /**                        lr35902.c                        **/
diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/emu/cpu/lr35902/lr35902.h
index 6e466f58171..3aa1bda932b 100644
--- a/src/emu/cpu/lr35902/lr35902.h
+++ b/src/emu/cpu/lr35902/lr35902.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __LR35902_H__
diff --git a/src/emu/cpu/lr35902/lr35902d.c b/src/emu/cpu/lr35902/lr35902d.c
index b2922a97c45..f14ea6abd35 100644
--- a/src/emu/cpu/lr35902/lr35902d.c
+++ b/src/emu/cpu/lr35902/lr35902d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   lr35902d.c
diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c
index 454ee2a435e..67dd1c98ffc 100644
--- a/src/emu/cpu/m37710/m37710.c
+++ b/src/emu/cpu/m37710/m37710.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Mitsubishi M37702/37710 CPU Emulator
 
diff --git a/src/emu/cpu/m37710/m37710.h b/src/emu/cpu/m37710/m37710.h
index 118ea8af909..c465e8807db 100644
--- a/src/emu/cpu/m37710/m37710.h
+++ b/src/emu/cpu/m37710/m37710.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __M37710_H__
 #define __M37710_H__
 
diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/emu/cpu/m37710/m37710cm.h
index d2718dcf129..6be9feab4f0 100644
--- a/src/emu/cpu/m37710/m37710cm.h
+++ b/src/emu/cpu/m37710/m37710cm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M37710CM_H__
diff --git a/src/emu/cpu/m37710/m37710il.h b/src/emu/cpu/m37710/m37710il.h
index 96c818b8429..051b1b478d3 100644
--- a/src/emu/cpu/m37710/m37710il.h
+++ b/src/emu/cpu/m37710/m37710il.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M37710IL_H__
diff --git a/src/emu/cpu/m37710/m37710o0.c b/src/emu/cpu/m37710/m37710o0.c
index 1c356c63a76..09a00426973 100644
--- a/src/emu/cpu/m37710/m37710o0.c
+++ b/src/emu/cpu/m37710/m37710o0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "m37710cm.h"
diff --git a/src/emu/cpu/m37710/m37710o1.c b/src/emu/cpu/m37710/m37710o1.c
index 8d464b9a402..657b1e592e4 100644
--- a/src/emu/cpu/m37710/m37710o1.c
+++ b/src/emu/cpu/m37710/m37710o1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "m37710cm.h"
diff --git a/src/emu/cpu/m37710/m37710o2.c b/src/emu/cpu/m37710/m37710o2.c
index 960082b5ce7..5d431201903 100644
--- a/src/emu/cpu/m37710/m37710o2.c
+++ b/src/emu/cpu/m37710/m37710o2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "m37710cm.h"
diff --git a/src/emu/cpu/m37710/m37710o3.c b/src/emu/cpu/m37710/m37710o3.c
index 9e314924d10..af34425bdd6 100644
--- a/src/emu/cpu/m37710/m37710o3.c
+++ b/src/emu/cpu/m37710/m37710o3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "m37710cm.h"
diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h
index 756f2aa6e0d..87591dffc4f 100644
--- a/src/emu/cpu/m37710/m37710op.h
+++ b/src/emu/cpu/m37710/m37710op.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ============================= CONFIGURATION ============================ */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m37710/m7700ds.c b/src/emu/cpu/m37710/m7700ds.c
index eae9be9d293..4f28193357d 100644
--- a/src/emu/cpu/m37710/m7700ds.c
+++ b/src/emu/cpu/m37710/m7700ds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Mitsubishi 7700 Series CPU disassembler v1.1
diff --git a/src/emu/cpu/m37710/m7700ds.h b/src/emu/cpu/m37710/m7700ds.h
index 4df93f0c5ae..5f9d94a0bab 100644
--- a/src/emu/cpu/m37710/m7700ds.h
+++ b/src/emu/cpu/m37710/m7700ds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M7700DS_H__
diff --git a/src/emu/cpu/m6502/deco16.c b/src/emu/cpu/m6502/deco16.c
index b87122a4d6e..64acc5b2744 100644
--- a/src/emu/cpu/m6502/deco16.c
+++ b/src/emu/cpu/m6502/deco16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     deco16.c
diff --git a/src/emu/cpu/m6502/deco16.h b/src/emu/cpu/m6502/deco16.h
index 3e52820cd1e..5d70f8d06d3 100644
--- a/src/emu/cpu/m6502/deco16.h
+++ b/src/emu/cpu/m6502/deco16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     deco16.h
diff --git a/src/emu/cpu/m6502/m3745x.c b/src/emu/cpu/m6502/m3745x.c
index e1c709589b0..44f02c69ebe 100644
--- a/src/emu/cpu/m6502/m3745x.c
+++ b/src/emu/cpu/m6502/m3745x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Mitsubishi M3745x 8-bit microcontroller family
 */
diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h
index e6a3b35a0d7..d6bc1292b7f 100644
--- a/src/emu/cpu/m6502/m3745x.h
+++ b/src/emu/cpu/m6502/m3745x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M3745X_H__
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index 04756fc52ed..ead3e3c6aad 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m4510.c
diff --git a/src/emu/cpu/m6502/m4510.h b/src/emu/cpu/m6502/m4510.h
index 3a83b54e905..8349c672d91 100644
--- a/src/emu/cpu/m6502/m4510.h
+++ b/src/emu/cpu/m6502/m4510.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m4510.h
diff --git a/src/emu/cpu/m6502/m5074x.c b/src/emu/cpu/m6502/m5074x.c
index b3ffc1dee88..307216357ac 100644
--- a/src/emu/cpu/m6502/m5074x.c
+++ b/src/emu/cpu/m6502/m5074x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Mitsubishi M5074x 8-bit microcontroller family
 */
diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h
index b4192b1fce7..c04c35dc584 100644
--- a/src/emu/cpu/m6502/m5074x.h
+++ b/src/emu/cpu/m6502/m5074x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M5074X_H__
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 6368b6b991f..3cd2b7a1edd 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6502.c
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index db277522dc8..e65b64b0b95 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6502.h
diff --git a/src/emu/cpu/m6502/m6504.c b/src/emu/cpu/m6502/m6504.c
index f6f81636c87..f883e623f2f 100644
--- a/src/emu/cpu/m6502/m6504.c
+++ b/src/emu/cpu/m6502/m6504.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6504.c
diff --git a/src/emu/cpu/m6502/m6504.h b/src/emu/cpu/m6502/m6504.h
index 9c3a71bda01..3e995b4fbc6 100644
--- a/src/emu/cpu/m6502/m6504.h
+++ b/src/emu/cpu/m6502/m6504.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6504.h
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 81608f202a2..651429e2a14 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6509.c
diff --git a/src/emu/cpu/m6502/m6509.h b/src/emu/cpu/m6502/m6509.h
index 50070cfaa08..5e28961982b 100644
--- a/src/emu/cpu/m6502/m6509.h
+++ b/src/emu/cpu/m6502/m6509.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6509.h
diff --git a/src/emu/cpu/m6502/m6510.c b/src/emu/cpu/m6502/m6510.c
index 4822fbb18ad..720de46e34b 100644
--- a/src/emu/cpu/m6502/m6510.c
+++ b/src/emu/cpu/m6502/m6510.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6510.c
diff --git a/src/emu/cpu/m6502/m6510.h b/src/emu/cpu/m6502/m6510.h
index 9906f588074..ef1d701c54e 100644
--- a/src/emu/cpu/m6502/m6510.h
+++ b/src/emu/cpu/m6502/m6510.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6510.h
diff --git a/src/emu/cpu/m6502/m6510t.c b/src/emu/cpu/m6502/m6510t.c
index bf248a7cb03..aa8303760a5 100644
--- a/src/emu/cpu/m6502/m6510t.c
+++ b/src/emu/cpu/m6502/m6510t.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6510t.c
diff --git a/src/emu/cpu/m6502/m6510t.h b/src/emu/cpu/m6502/m6510t.h
index 0765f9e38c1..0d2c3593321 100644
--- a/src/emu/cpu/m6502/m6510t.h
+++ b/src/emu/cpu/m6502/m6510t.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6510t.h
diff --git a/src/emu/cpu/m6502/m65c02.c b/src/emu/cpu/m6502/m65c02.c
index c3990f9d1b1..a0bc32dba43 100644
--- a/src/emu/cpu/m6502/m65c02.c
+++ b/src/emu/cpu/m6502/m65c02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65c02.c
diff --git a/src/emu/cpu/m6502/m65c02.h b/src/emu/cpu/m6502/m65c02.h
index 1fa0d087667..b9a85947f13 100644
--- a/src/emu/cpu/m6502/m65c02.h
+++ b/src/emu/cpu/m6502/m65c02.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65c02.h
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index 0788683264a..cce81316b9c 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65ce02.c
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h
index df0f1fbd996..f2a50ba2413 100644
--- a/src/emu/cpu/m6502/m65ce02.h
+++ b/src/emu/cpu/m6502/m65ce02.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65ce02.h
diff --git a/src/emu/cpu/m6502/m65sc02.c b/src/emu/cpu/m6502/m65sc02.c
index 9624ad38dda..fafc3480699 100644
--- a/src/emu/cpu/m6502/m65sc02.c
+++ b/src/emu/cpu/m6502/m65sc02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65sc02.c
diff --git a/src/emu/cpu/m6502/m65sc02.h b/src/emu/cpu/m6502/m65sc02.h
index 5b37cc9cca9..db37304ad9d 100644
--- a/src/emu/cpu/m6502/m65sc02.h
+++ b/src/emu/cpu/m6502/m65sc02.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m65sc02.h
diff --git a/src/emu/cpu/m6502/m740.c b/src/emu/cpu/m6502/m740.c
index fc8b245b761..49e3e9464fa 100644
--- a/src/emu/cpu/m6502/m740.c
+++ b/src/emu/cpu/m6502/m740.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m740.c
diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h
index 232e661c755..8cb36d46f0e 100644
--- a/src/emu/cpu/m6502/m740.h
+++ b/src/emu/cpu/m6502/m740.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m740.h
diff --git a/src/emu/cpu/m6502/m7501.c b/src/emu/cpu/m6502/m7501.c
index e9324d020a1..b54db87604e 100644
--- a/src/emu/cpu/m6502/m7501.c
+++ b/src/emu/cpu/m6502/m7501.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m7501.c
diff --git a/src/emu/cpu/m6502/m7501.h b/src/emu/cpu/m6502/m7501.h
index f869dfc5234..bb0bf3c10f0 100644
--- a/src/emu/cpu/m6502/m7501.h
+++ b/src/emu/cpu/m6502/m7501.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m7501.h
diff --git a/src/emu/cpu/m6502/m8502.c b/src/emu/cpu/m6502/m8502.c
index 32c6ac41839..3c8f5cb2439 100644
--- a/src/emu/cpu/m6502/m8502.c
+++ b/src/emu/cpu/m6502/m8502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m8502.c
diff --git a/src/emu/cpu/m6502/m8502.h b/src/emu/cpu/m6502/m8502.h
index c44206e8bdf..7ccf3a07da0 100644
--- a/src/emu/cpu/m6502/m8502.h
+++ b/src/emu/cpu/m6502/m8502.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m8502.h
diff --git a/src/emu/cpu/m6502/n2a03.c b/src/emu/cpu/m6502/n2a03.c
index 2ed9055abc0..b31c760362b 100644
--- a/src/emu/cpu/m6502/n2a03.c
+++ b/src/emu/cpu/m6502/n2a03.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     m6502.c
diff --git a/src/emu/cpu/m6502/n2a03.h b/src/emu/cpu/m6502/n2a03.h
index c540d38f7ac..c82dc282407 100644
--- a/src/emu/cpu/m6502/n2a03.h
+++ b/src/emu/cpu/m6502/n2a03.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     n2a03.h
diff --git a/src/emu/cpu/m6502/r65c02.c b/src/emu/cpu/m6502/r65c02.c
index ce540b96c06..e8cc28a62b2 100644
--- a/src/emu/cpu/m6502/r65c02.c
+++ b/src/emu/cpu/m6502/r65c02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     r65c02.c
diff --git a/src/emu/cpu/m6502/r65c02.h b/src/emu/cpu/m6502/r65c02.h
index 255c2441cfa..ad388bb041f 100644
--- a/src/emu/cpu/m6502/r65c02.h
+++ b/src/emu/cpu/m6502/r65c02.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     r65c02.h
diff --git a/src/emu/cpu/m6800/6800dasm.c b/src/emu/cpu/m6800/6800dasm.c
index e19d680b84a..096261b89f8 100644
--- a/src/emu/cpu/m6800/6800dasm.c
+++ b/src/emu/cpu/m6800/6800dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *   A quick-hack 6803/6808 disassembler
  *
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index 56d456cfd81..425e3f41c5e 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** m6800: Portable 6800 class  emulator *************************************
 
     m68xx.c
diff --git a/src/emu/cpu/m6800/m6800.h b/src/emu/cpu/m6800/m6800.h
index dcd343c19f4..6695ef944fa 100644
--- a/src/emu/cpu/m6800/m6800.h
+++ b/src/emu/cpu/m6800/m6800.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** m6800: Portable 6800 class emulator *************************************/
 
 #pragma once
diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index 29665c107b5..a209c9d77eb 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __M68000_H__
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c
index 4b445a2c7a7..b7490a538a2 100644
--- a/src/emu/cpu/m68000/m68k_in.c
+++ b/src/emu/cpu/m68000/m68k_in.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 must fix:
     callm
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 5c86f9aedc9..1b36266b5d6 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ========================= LICENSING & COPYRIGHT ======================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index 460a5c42f66..469b42a6256 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ========================= LICENSING & COPYRIGHT ======================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m68000/m68kdasm.c b/src/emu/cpu/m68000/m68kdasm.c
index 644e7d47f99..149ce80ae78 100644
--- a/src/emu/cpu/m68000/m68kdasm.c
+++ b/src/emu/cpu/m68000/m68kdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ========================= LICENSING & COPYRIGHT ======================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/emu/cpu/m68000/m68kmake.c
index 1b1f1f50a1e..bcf83cc241d 100644
--- a/src/emu/cpu/m68000/m68kmake.c
+++ b/src/emu/cpu/m68000/m68kmake.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ========================= LICENSING & COPYRIGHT ======================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/emu/cpu/m68000/m68kmmu.h
index ea4cb3dc7ce..3ba2a163038 100644
--- a/src/emu/cpu/m68000/m68kmmu.h
+++ b/src/emu/cpu/m68000/m68kmmu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     m68kmmu.h - PMMU implementation for 68851/68030/68040
             HMMU implementation for 68020 (II and LC variants)
diff --git a/src/emu/cpu/m68000/m68kops.c b/src/emu/cpu/m68000/m68kops.c
index 436df1df763..59494ea70f7 100644
--- a/src/emu/cpu/m68000/m68kops.c
+++ b/src/emu/cpu/m68000/m68kops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "m68kcpu.h"
 extern void m68040_fpu_op0(m68000_base_device *m68k);
diff --git a/src/emu/cpu/m68000/m68kops.h b/src/emu/cpu/m68000/m68kops.h
index b8fe4367028..b2af540539e 100644
--- a/src/emu/cpu/m68000/m68kops.h
+++ b/src/emu/cpu/m68000/m68kops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* ============================ OPCODE HANDLERS =========================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index 1c7ed46056c..6b5b7bc0ed9 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** m6805: Portable 6805 emulator ******************************************
 
     m6805.c (Also supports hd68705 and hd63705 variants)
diff --git a/src/emu/cpu/m6805/m6805.h b/src/emu/cpu/m6805/m6805.h
index 8f40ed83c5b..d8301e203df 100644
--- a/src/emu/cpu/m6805/m6805.h
+++ b/src/emu/cpu/m6805/m6805.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** m6805: Portable 6805 emulator ******************************************/
 
 #pragma once
diff --git a/src/emu/cpu/m6809/6309dasm.c b/src/emu/cpu/m6809/6309dasm.c
index be7913053a0..c28b64e8612 100644
--- a/src/emu/cpu/m6809/6309dasm.c
+++ b/src/emu/cpu/m6809/6309dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     6309dasm.c - a 6309 opcode disassembler
diff --git a/src/emu/cpu/m6809/6809dasm.c b/src/emu/cpu/m6809/6809dasm.c
index 37d04c45631..82a35206e94 100644
--- a/src/emu/cpu/m6809/6809dasm.c
+++ b/src/emu/cpu/m6809/6809dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     6809dasm.c - a 6809 opcode disassembler
diff --git a/src/emu/cpu/m6809/hd6309.c b/src/emu/cpu/m6809/hd6309.c
index 0dbf5dc5f4d..36d904ac32b 100644
--- a/src/emu/cpu/m6809/hd6309.c
+++ b/src/emu/cpu/m6809/hd6309.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     hd6309.c
diff --git a/src/emu/cpu/m6809/hd6309.h b/src/emu/cpu/m6809/hd6309.h
index 10a591204b4..3f39afcbcf0 100644
--- a/src/emu/cpu/m6809/hd6309.h
+++ b/src/emu/cpu/m6809/hd6309.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     hd6309.h
diff --git a/src/emu/cpu/m6809/knmidasm.c b/src/emu/cpu/m6809/knmidasm.c
index 779307d8dab..27d934cca39 100644
--- a/src/emu/cpu/m6809/knmidasm.c
+++ b/src/emu/cpu/m6809/knmidasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "konami.h"
diff --git a/src/emu/cpu/m6809/konami.c b/src/emu/cpu/m6809/konami.c
index 3c85df6ebe2..6e7e0d407d4 100644
--- a/src/emu/cpu/m6809/konami.c
+++ b/src/emu/cpu/m6809/konami.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     konami.c
diff --git a/src/emu/cpu/m6809/konami.h b/src/emu/cpu/m6809/konami.h
index 47600969d7c..a52a10bddb3 100644
--- a/src/emu/cpu/m6809/konami.h
+++ b/src/emu/cpu/m6809/konami.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     konami.h
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index df89f3951bb..5845c41c956 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** m6809: Portable 6809 emulator ******************************************
 
     Copyright John Butler
diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h
index 805be7be9cf..dc05c19813a 100644
--- a/src/emu/cpu/m6809/m6809.h
+++ b/src/emu/cpu/m6809/m6809.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     m6809.h
diff --git a/src/emu/cpu/m6809/m6809inl.h b/src/emu/cpu/m6809/m6809inl.h
index a041cb9d403..771af8544f0 100644
--- a/src/emu/cpu/m6809/m6809inl.h
+++ b/src/emu/cpu/m6809/m6809inl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     m6809inl.h
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index 886f4a12496..b8bc390f0b6 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mb86233.c
diff --git a/src/emu/cpu/mb86233/mb86233.h b/src/emu/cpu/mb86233/mb86233.h
index d800e3ea49a..d0569d5fa42 100644
--- a/src/emu/cpu/mb86233/mb86233.h
+++ b/src/emu/cpu/mb86233/mb86233.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MB86233_H__
diff --git a/src/emu/cpu/mb86233/mb86233d.c b/src/emu/cpu/mb86233/mb86233d.c
index 4d81970e1af..0068ff7f3d2 100644
--- a/src/emu/cpu/mb86233/mb86233d.c
+++ b/src/emu/cpu/mb86233/mb86233d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "mb86233.h"
diff --git a/src/emu/cpu/mb86235/mb86235d.c b/src/emu/cpu/mb86235/mb86235d.c
index ff91cba6d2b..bcb8eda381b 100644
--- a/src/emu/cpu/mb86235/mb86235d.c
+++ b/src/emu/cpu/mb86235/mb86235d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "mb86235.h"
diff --git a/src/emu/cpu/mb88xx/mb88dasm.c b/src/emu/cpu/mb88xx/mb88dasm.c
index a0459a7cc20..5615baab2ae 100644
--- a/src/emu/cpu/mb88xx/mb88dasm.c
+++ b/src/emu/cpu/mb88xx/mb88dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     mb88dasm.c
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index 6015091562d..bc577eaf5ac 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mb88xx.c
diff --git a/src/emu/cpu/mb88xx/mb88xx.h b/src/emu/cpu/mb88xx/mb88xx.h
index 56ee148181e..0bb98c63c60 100644
--- a/src/emu/cpu/mb88xx/mb88xx.h
+++ b/src/emu/cpu/mb88xx/mb88xx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mb88xx.h
diff --git a/src/emu/cpu/mc68hc11/hc11dasm.c b/src/emu/cpu/mc68hc11/hc11dasm.c
index d45f40daecf..cd179bf1c33 100644
--- a/src/emu/cpu/mc68hc11/hc11dasm.c
+++ b/src/emu/cpu/mc68hc11/hc11dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Motorola M68HC11 disassembler
 
diff --git a/src/emu/cpu/mc68hc11/hc11ops.h b/src/emu/cpu/mc68hc11/hc11ops.h
index f2ea9d35a31..a1f1651cda1 100644
--- a/src/emu/cpu/mc68hc11/hc11ops.h
+++ b/src/emu/cpu/mc68hc11/hc11ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 const mc68hc11_cpu_device::hc11_opcode_list_struct mc68hc11_cpu_device::hc11_opcode_list[] =
 {
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.h b/src/emu/cpu/mc68hc11/mc68hc11.h
index dddd9f00a55..a95de65ad92 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.h
+++ b/src/emu/cpu/mc68hc11/mc68hc11.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MC68HC11_H__
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index 303745e444e..1c49a722ebe 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 EA pin - defined by architecture, must implement:
    1 means external access, bypassing internal ROM
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h
index 7bdc32e75e6..fc39b2b1004 100644
--- a/src/emu/cpu/mcs48/mcs48.h
+++ b/src/emu/cpu/mcs48/mcs48.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mcs48.c
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c
index f03c7decdf6..77fd65af9aa 100644
--- a/src/emu/cpu/mcs51/mcs51.c
+++ b/src/emu/cpu/mcs51/mcs51.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   i8051.c
diff --git a/src/emu/cpu/mcs51/mcs51.h b/src/emu/cpu/mcs51/mcs51.h
index d02bb02797d..7efd657a23b 100644
--- a/src/emu/cpu/mcs51/mcs51.h
+++ b/src/emu/cpu/mcs51/mcs51.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   mcs51.h
diff --git a/src/emu/cpu/mcs51/mcs51dasm.c b/src/emu/cpu/mcs51/mcs51dasm.c
index 25ba45998d8..da2c1abb505 100644
--- a/src/emu/cpu/mcs51/mcs51dasm.c
+++ b/src/emu/cpu/mcs51/mcs51dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   i8051dasm.c
diff --git a/src/emu/cpu/mcs96/i8x9x.c b/src/emu/cpu/mcs96/i8x9x.c
index e86fa598248..f224f0b0915 100644
--- a/src/emu/cpu/mcs96/i8x9x.c
+++ b/src/emu/cpu/mcs96/i8x9x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8x9x.h
diff --git a/src/emu/cpu/mcs96/i8x9x.h b/src/emu/cpu/mcs96/i8x9x.h
index f82fb64dace..3a1831c0a89 100644
--- a/src/emu/cpu/mcs96/i8x9x.h
+++ b/src/emu/cpu/mcs96/i8x9x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8x9x.h
diff --git a/src/emu/cpu/mcs96/i8xc196.c b/src/emu/cpu/mcs96/i8xc196.c
index 8b7b9922907..9a91649e2e4 100644
--- a/src/emu/cpu/mcs96/i8xc196.c
+++ b/src/emu/cpu/mcs96/i8xc196.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8xc196.h
diff --git a/src/emu/cpu/mcs96/i8xc196.h b/src/emu/cpu/mcs96/i8xc196.h
index f3c4714d500..6d753c7cb02 100644
--- a/src/emu/cpu/mcs96/i8xc196.h
+++ b/src/emu/cpu/mcs96/i8xc196.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8xc196.h
diff --git a/src/emu/cpu/mcs96/mcs96.c b/src/emu/cpu/mcs96/mcs96.c
index b905c2db8b1..8a36ec558c4 100644
--- a/src/emu/cpu/mcs96/mcs96.c
+++ b/src/emu/cpu/mcs96/mcs96.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mcs96.h
diff --git a/src/emu/cpu/mcs96/mcs96.h b/src/emu/cpu/mcs96/mcs96.h
index 4858d455ce6..531f8dc1c54 100644
--- a/src/emu/cpu/mcs96/mcs96.h
+++ b/src/emu/cpu/mcs96/mcs96.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mcs96.h
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 85e450d5646..59b1c65735d 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Implementation for the Nintendo Minx CPU.
 
diff --git a/src/emu/cpu/minx/minx.h b/src/emu/cpu/minx/minx.h
index eb7dbe5e9e9..6d0f44d9eab 100644
--- a/src/emu/cpu/minx/minx.h
+++ b/src/emu/cpu/minx/minx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MINX_H__
diff --git a/src/emu/cpu/minx/minxd.c b/src/emu/cpu/minx/minxd.c
index ebcaf789531..af99481da9b 100644
--- a/src/emu/cpu/minx/minxd.c
+++ b/src/emu/cpu/minx/minxd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************
 
   Nintendo Minx CPU disassembly
diff --git a/src/emu/cpu/minx/minxfunc.h b/src/emu/cpu/minx/minxfunc.h
index 312071d3d7b..5755a4bf2a5 100644
--- a/src/emu/cpu/minx/minxfunc.h
+++ b/src/emu/cpu/minx/minxfunc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 UINT8 minx_cpu_device::ADD8( UINT8 arg1, UINT8 arg2 )
 {
 	UINT32 res = arg1 + arg2;
diff --git a/src/emu/cpu/minx/minxopce.h b/src/emu/cpu/minx/minxopce.h
index 4bd2b7821e0..796a7737a8b 100644
--- a/src/emu/cpu/minx/minxopce.h
+++ b/src/emu/cpu/minx/minxopce.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 void minx_cpu_device::execute_one_ce()
 {
diff --git a/src/emu/cpu/minx/minxopcf.h b/src/emu/cpu/minx/minxopcf.h
index b908a11b963..92277d06970 100644
--- a/src/emu/cpu/minx/minxopcf.h
+++ b/src/emu/cpu/minx/minxopcf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 void minx_cpu_device::execute_one_cf()
 {
diff --git a/src/emu/cpu/minx/minxops.h b/src/emu/cpu/minx/minxops.h
index ca11a3258dc..8143d753aa8 100644
--- a/src/emu/cpu/minx/minxops.h
+++ b/src/emu/cpu/minx/minxops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 void minx_cpu_device::execute_one()
 {
diff --git a/src/emu/cpu/mips/mips3com.h b/src/emu/cpu/mips/mips3com.h
index a3e26a11df3..5c456fadb5e 100644
--- a/src/emu/cpu/mips/mips3com.h
+++ b/src/emu/cpu/mips/mips3com.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mips3com.h
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 4456a65e70e..a4aa746b7bf 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Panasonic MN10200 emulator
 
diff --git a/src/emu/cpu/mn10200/mn10200.h b/src/emu/cpu/mn10200/mn10200.h
index d5e072e3844..853b470462a 100644
--- a/src/emu/cpu/mn10200/mn10200.h
+++ b/src/emu/cpu/mn10200/mn10200.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Panasonic MN10200 emulator
 
diff --git a/src/emu/cpu/mn10200/mn102dis.c b/src/emu/cpu/mn10200/mn102dis.c
index bb07f0bcefd..88cecda2ee3 100644
--- a/src/emu/cpu/mn10200/mn102dis.c
+++ b/src/emu/cpu/mn10200/mn102dis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include <stdio.h>
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index de109bfa176..bde0f3e8811 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     NEC V20/V30/V33 emulator
diff --git a/src/emu/cpu/nec/nec.h b/src/emu/cpu/nec/nec.h
index 8321fcde1af..1ec2365728d 100644
--- a/src/emu/cpu/nec/nec.h
+++ b/src/emu/cpu/nec/nec.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ASG 971222 -- rewrote this interface */
 #ifndef __NEC_H_
 #define __NEC_H_
diff --git a/src/emu/cpu/nec/necdasm.c b/src/emu/cpu/nec/necdasm.c
index 4c89a67b678..74f8a0dcdf5 100644
--- a/src/emu/cpu/nec/necdasm.c
+++ b/src/emu/cpu/nec/necdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    NEC V-series Disassembler
 
diff --git a/src/emu/cpu/nec/necea.h b/src/emu/cpu/nec/necea.h
index 7d4078a3c12..76b38655da7 100644
--- a/src/emu/cpu/nec/necea.h
+++ b/src/emu/cpu/nec/necea.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 UINT32 nec_common_device::EA_000() { m_EO=Wreg(BW)+Wreg(IX); m_EA=DefaultBase(DS0)+m_EO; return m_EA; }
 UINT32 nec_common_device::EA_001() { m_EO=Wreg(BW)+Wreg(IY); m_EA=DefaultBase(DS0)+m_EO; return m_EA; }
diff --git a/src/emu/cpu/nec/necinstr.h b/src/emu/cpu/nec/necinstr.h
index 0e2c83549f5..7a639a4fbd6 100644
--- a/src/emu/cpu/nec/necinstr.h
+++ b/src/emu/cpu/nec/necinstr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 const nec_common_device::nec_ophandler nec_common_device::s_nec_instruction[256] =
 {
diff --git a/src/emu/cpu/nec/necmacro.h b/src/emu/cpu/nec/necmacro.h
index 43249e6ac80..b465fdeb373 100644
--- a/src/emu/cpu/nec/necmacro.h
+++ b/src/emu/cpu/nec/necmacro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* parameter x = result, y = source 1, z = source 2 */
 
 #define SetTF(x)        (m_TF = (x))
diff --git a/src/emu/cpu/nec/necmodrm.h b/src/emu/cpu/nec/necmodrm.h
index 5049d9c4c95..3d1d9e9fd41 100644
--- a/src/emu/cpu/nec/necmodrm.h
+++ b/src/emu/cpu/nec/necmodrm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static struct {
 	struct {
 		WREGS w[256];
diff --git a/src/emu/cpu/nec/necpriv.h b/src/emu/cpu/nec/necpriv.h
index bf5a4c8a7f8..94cda31e977 100644
--- a/src/emu/cpu/nec/necpriv.h
+++ b/src/emu/cpu/nec/necpriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Cpu types, steps of 8 to help the cycle count calculation */
 #define V33_TYPE 0
 #define V30_TYPE 8
diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c
index b4cb319e7f8..866d9f15358 100644
--- a/src/emu/cpu/nec/v25.c
+++ b/src/emu/cpu/nec/v25.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     NEC V25/V35 emulator
diff --git a/src/emu/cpu/nec/v25.h b/src/emu/cpu/nec/v25.h
index be67e7fe7c9..07cb9b5dbf8 100644
--- a/src/emu/cpu/nec/v25.h
+++ b/src/emu/cpu/nec/v25.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ASG 971222 -- rewrote this interface */
 #ifndef __NEC_V25_H_
 #define __NEC_V25_H_
diff --git a/src/emu/cpu/nec/v25instr.h b/src/emu/cpu/nec/v25instr.h
index b2cec9d3f09..10287c20f3d 100644
--- a/src/emu/cpu/nec/v25instr.h
+++ b/src/emu/cpu/nec/v25instr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const v25_common_device::nec_ophandler v25_common_device::s_nec_instruction[256] =
 {
 	&v25_common_device::i_add_br8,      /* 0x00 */
diff --git a/src/emu/cpu/nec/v25priv.h b/src/emu/cpu/nec/v25priv.h
index 939ad618a7c..ce9cad4ce00 100644
--- a/src/emu/cpu/nec/v25priv.h
+++ b/src/emu/cpu/nec/v25priv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Cpu types, steps of 8 to help the cycle count calculation */
 #define V33_TYPE 0
 #define V30_TYPE 8
diff --git a/src/emu/cpu/nec/v25sfr.c b/src/emu/cpu/nec/v25sfr.c
index 39f36fcad89..92218186024 100644
--- a/src/emu/cpu/nec/v25sfr.c
+++ b/src/emu/cpu/nec/v25sfr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     NEC V25/V35 special function registers and internal ram access
diff --git a/src/emu/cpu/nec/v53.c b/src/emu/cpu/nec/v53.c
index bbec2d042e3..a187cc34f6f 100644
--- a/src/emu/cpu/nec/v53.c
+++ b/src/emu/cpu/nec/v53.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* V53 */
 
 // V33 / V33A cores with onboard peripherals
diff --git a/src/emu/cpu/nec/v53.h b/src/emu/cpu/nec/v53.h
index 05611e5503f..8c4db1b443d 100644
--- a/src/emu/cpu/nec/v53.h
+++ b/src/emu/cpu/nec/v53.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* V53 */
 
 #include "nec.h"
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index c31313cf7b8..b6ce4e44c3f 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Note: Original Java source written by:
  *
diff --git a/src/emu/cpu/pdp1/pdp1.h b/src/emu/cpu/pdp1/pdp1.h
index d6b7fe1f2eb..f675f8cc251 100644
--- a/src/emu/cpu/pdp1/pdp1.h
+++ b/src/emu/cpu/pdp1/pdp1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __PDP1_H__
diff --git a/src/emu/cpu/pdp1/pdp1dasm.c b/src/emu/cpu/pdp1/pdp1dasm.c
index fccbc2664d9..97e589f3951 100644
--- a/src/emu/cpu/pdp1/pdp1dasm.c
+++ b/src/emu/cpu/pdp1/pdp1dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/pdp1/pdp1.h"
 
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c
index 7c7c0152f85..13ec6a98c37 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     TX-0 emulator
 
diff --git a/src/emu/cpu/pdp1/tx0.h b/src/emu/cpu/pdp1/tx0.h
index 46f639e2e81..cd4d781f135 100644
--- a/src/emu/cpu/pdp1/tx0.h
+++ b/src/emu/cpu/pdp1/tx0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TX0_H__
diff --git a/src/emu/cpu/pdp1/tx0dasm.c b/src/emu/cpu/pdp1/tx0dasm.c
index cbffead5fe8..295aa99e420 100644
--- a/src/emu/cpu/pdp1/tx0dasm.c
+++ b/src/emu/cpu/pdp1/tx0dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/pdp1/tx0.h"
 
diff --git a/src/emu/cpu/pic16c5x/16c5xdsm.c b/src/emu/cpu/pic16c5x/16c5xdsm.c
index d4710ae745c..2aa28acb6f9 100644
--- a/src/emu/cpu/pic16c5x/16c5xdsm.c
+++ b/src/emu/cpu/pic16c5x/16c5xdsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                      Microchip PIC16C5x Emulator                         *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c5x/dis16c5x.c b/src/emu/cpu/pic16c5x/dis16c5x.c
index 95a5183a515..54976af6f6f 100644
--- a/src/emu/cpu/pic16c5x/dis16c5x.c
+++ b/src/emu/cpu/pic16c5x/dis16c5x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                      Microchip PIC16C5x Emulator                         *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index 78be71b5499..5dd109380a4 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                      Microchip PIC16C5x Emulator                         *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/emu/cpu/pic16c5x/pic16c5x.h
index 41b1bb9ebd8..3c441680c08 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.h
+++ b/src/emu/cpu/pic16c5x/pic16c5x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                      Microchip PIC16C5x Emulator                         *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c62x/16c62xdsm.c b/src/emu/cpu/pic16c62x/16c62xdsm.c
index fe655417d73..ce10d92d2c4 100644
--- a/src/emu/cpu/pic16c62x/16c62xdsm.c
+++ b/src/emu/cpu/pic16c62x/16c62xdsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                  Microchip PIC16C62X Emulator                            *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c62x/dis16c62x.c b/src/emu/cpu/pic16c62x/dis16c62x.c
index 93aab3f5078..93b2e42963b 100644
--- a/src/emu/cpu/pic16c62x/dis16c62x.c
+++ b/src/emu/cpu/pic16c62x/dis16c62x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                  Microchip PIC16C62X Emulator                            *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c
index 4f6fa19fc75..2083faf8691 100644
--- a/src/emu/cpu/pic16c62x/pic16c62x.c
+++ b/src/emu/cpu/pic16c62x/pic16c62x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                  Microchip PIC16C62X Emulator                            *
 	*                                                                          *
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.h b/src/emu/cpu/pic16c62x/pic16c62x.h
index 55c6f963728..720e8003390 100644
--- a/src/emu/cpu/pic16c62x/pic16c62x.h
+++ b/src/emu/cpu/pic16c62x/pic16c62x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                  Microchip PIC16C62X Emulator                            *
 	*                                                                          *
diff --git a/src/emu/cpu/powerpc/drc_ops.c b/src/emu/cpu/powerpc/drc_ops.c
index b496d05b8d0..f88ff50ac89 100644
--- a/src/emu/cpu/powerpc/drc_ops.c
+++ b/src/emu/cpu/powerpc/drc_ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* PowerPC common opcodes */
 
 // it really seems like this should be elsewhere - like maybe the floating point checks can hang out someplace else
diff --git a/src/emu/cpu/powerpc/drc_ops.h b/src/emu/cpu/powerpc/drc_ops.h
index f06748bfec1..6fc3df335bf 100644
--- a/src/emu/cpu/powerpc/drc_ops.h
+++ b/src/emu/cpu/powerpc/drc_ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static const PPC_OPCODE ppcdrc_opcode_common[] =
 {
 	/*code  subcode         handler                 */
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c
index 02462efdaec..1310bc72e6b 100644
--- a/src/emu/cpu/powerpc/ppc.c
+++ b/src/emu/cpu/powerpc/ppc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IBM/Motorola PowerPC 4xx/6xx Emulator */
 
 #include <setjmp.h>
diff --git a/src/emu/cpu/powerpc/ppc_dasm.c b/src/emu/cpu/powerpc/ppc_dasm.c
index a20f4e2c8bb..922cc9b01a5 100644
--- a/src/emu/cpu/powerpc/ppc_dasm.c
+++ b/src/emu/cpu/powerpc/ppc_dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * disasm.c
  *
diff --git a/src/emu/cpu/powerpc/ppc_ops.h b/src/emu/cpu/powerpc/ppc_ops.h
index b2e6ff8c90d..4b9a687590f 100644
--- a/src/emu/cpu/powerpc/ppc_ops.h
+++ b/src/emu/cpu/powerpc/ppc_ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __PPC_OPS_H__
diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h
index 980d8114043..0551cd56181 100644
--- a/src/emu/cpu/powerpc/ppccom.h
+++ b/src/emu/cpu/powerpc/ppccom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ppccom.h
diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c
index 3a942aa6cca..bd04a900030 100644
--- a/src/emu/cpu/pps4/pps4.c
+++ b/src/emu/cpu/pps4/pps4.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller <pullmoll@t-online.de>
+// copyright-holders:Juergen Buchmueller
 
 /*****************************************************************************
  *
diff --git a/src/emu/cpu/pps4/pps4.h b/src/emu/cpu/pps4/pps4.h
index d459591a7c0..8c115745cbb 100644
--- a/src/emu/cpu/pps4/pps4.h
+++ b/src/emu/cpu/pps4/pps4.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller <pullmoll@t-online.de>
+// copyright-holders:Juergen Buchmueller
 #ifndef __PPS4_H__
 #define __PPS4_H__
 
diff --git a/src/emu/cpu/pps4/pps4dasm.c b/src/emu/cpu/pps4/pps4dasm.c
index 6a06b498232..4ee5079ee91 100644
--- a/src/emu/cpu/pps4/pps4dasm.c
+++ b/src/emu/cpu/pps4/pps4dasm.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller <pullmoll@t-online.de>
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   pps4dasm.c
diff --git a/src/emu/cpu/psx/dismips.c b/src/emu/cpu/psx/dismips.c
index f8583dbaed1..9ff658cb2f9 100644
--- a/src/emu/cpu/psx/dismips.c
+++ b/src/emu/cpu/psx/dismips.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * standalone MIPS disassembler by smf
  *
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 49ad29975b1..187d4d1ca69 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Nintendo/SGI Reality Signal Processor (RSP) emulator
 
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index dba8ff38b7b..83d19accee1 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rsp.h
diff --git a/src/emu/cpu/rsp/rsp_dasm.c b/src/emu/cpu/rsp/rsp_dasm.c
index 8d384e86a74..1b2458fd633 100644
--- a/src/emu/cpu/rsp/rsp_dasm.c
+++ b/src/emu/cpu/rsp/rsp_dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Nintendo/SGI RSP Disassembler
 
diff --git a/src/emu/cpu/rsp/rspcp2.c b/src/emu/cpu/rsp/rspcp2.c
index 681d503c878..8eac9416b4c 100644
--- a/src/emu/cpu/rsp/rspcp2.c
+++ b/src/emu/cpu/rsp/rspcp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2.c
diff --git a/src/emu/cpu/rsp/rspcp2.h b/src/emu/cpu/rsp/rspcp2.h
index 9b8c8d206a4..20a028c53d2 100644
--- a/src/emu/cpu/rsp/rspcp2.h
+++ b/src/emu/cpu/rsp/rspcp2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2.h
diff --git a/src/emu/cpu/rsp/rspcp2d.c b/src/emu/cpu/rsp/rspcp2d.c
index 75f5daae1a6..f3ca534b132 100644
--- a/src/emu/cpu/rsp/rspcp2d.c
+++ b/src/emu/cpu/rsp/rspcp2d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2d.c
diff --git a/src/emu/cpu/rsp/rspcp2d.h b/src/emu/cpu/rsp/rspcp2d.h
index 3fcb3572820..067bb1a357d 100644
--- a/src/emu/cpu/rsp/rspcp2d.h
+++ b/src/emu/cpu/rsp/rspcp2d.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2d.h
diff --git a/src/emu/cpu/rsp/rspcp2s.c b/src/emu/cpu/rsp/rspcp2s.c
index 376d27b0a23..c233ad4e9fd 100644
--- a/src/emu/cpu/rsp/rspcp2s.c
+++ b/src/emu/cpu/rsp/rspcp2s.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2s.c
diff --git a/src/emu/cpu/rsp/rspcp2s.h b/src/emu/cpu/rsp/rspcp2s.h
index 4b164c5aefe..fd5a5b1c99f 100644
--- a/src/emu/cpu/rsp/rspcp2s.h
+++ b/src/emu/cpu/rsp/rspcp2s.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspcp2s.h
diff --git a/src/emu/cpu/rsp/rspdiv.h b/src/emu/cpu/rsp/rspdiv.h
index 7f492c6f7fb..4507c85f37f 100644
--- a/src/emu/cpu/rsp/rspdiv.h
+++ b/src/emu/cpu/rsp/rspdiv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static const UINT16 rsp_divtable[1024] =
 {
 	0xffff,
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index f684717f7d4..7a76b4b8445 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspdrc.c
diff --git a/src/emu/cpu/rsp/rspfe.c b/src/emu/cpu/rsp/rspfe.c
index bd610bca661..b8ac8c5e67c 100644
--- a/src/emu/cpu/rsp/rspfe.c
+++ b/src/emu/cpu/rsp/rspfe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspfe.c
diff --git a/src/emu/cpu/rsp/rspfe.h b/src/emu/cpu/rsp/rspfe.h
index cd59f9ee6e8..19d7f9cfda5 100644
--- a/src/emu/cpu/rsp/rspfe.h
+++ b/src/emu/cpu/rsp/rspfe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rspfe.h
diff --git a/src/emu/cpu/s2650/2650dasm.c b/src/emu/cpu/s2650/2650dasm.c
index ca5de74fbd6..924ae522e68 100644
--- a/src/emu/cpu/s2650/2650dasm.c
+++ b/src/emu/cpu/s2650/2650dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
  *
  *  Portable Signetics 2650 disassembler
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index e2f6c289fb3..abdbe04a1c5 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -1,9 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*************************************************************************
  *
  *      Portable Signetics 2650 cpu emulation
  *
- *      Written by Juergen Buchmueller for use with MAME
- *
  *  Version 1.2
  *  - changed to clock cycle counts from machine cycles
  *  - replaced cycle table with inline code (M_RET conditional case)
diff --git a/src/emu/cpu/s2650/s2650.h b/src/emu/cpu/s2650/s2650.h
index 703058d1fca..a84b77f1f7b 100644
--- a/src/emu/cpu/s2650/s2650.h
+++ b/src/emu/cpu/s2650/s2650.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __S2650_H__
diff --git a/src/emu/cpu/s2650/s2650cpu.h b/src/emu/cpu/s2650/s2650cpu.h
index 9813778322f..c4ff88f7aff 100644
--- a/src/emu/cpu/s2650/s2650cpu.h
+++ b/src/emu/cpu/s2650/s2650cpu.h
@@ -1,9 +1,9 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*******************************************************
  *
  *      Portable Signetics 2650 cpu emulation
  *
- *      Written by Juergen Buchmueller for use with MAME
- *
  *******************************************************/
 
 #define PMSK    0x1fff          /* mask page offset */
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index cf82e50ac50..dd5410c504f 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   saturn.c
diff --git a/src/emu/cpu/saturn/saturn.h b/src/emu/cpu/saturn/saturn.h
index cd9705cbbcd..a382017c1f7 100644
--- a/src/emu/cpu/saturn/saturn.h
+++ b/src/emu/cpu/saturn/saturn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   cpustate->h
diff --git a/src/emu/cpu/saturn/saturnds.c b/src/emu/cpu/saturn/saturnds.c
index 76ed7b1defa..008cbb99412 100644
--- a/src/emu/cpu/saturn/saturnds.c
+++ b/src/emu/cpu/saturn/saturnds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   saturnds.c
diff --git a/src/emu/cpu/sc61860/readpc.c b/src/emu/cpu/sc61860/readpc.c
index 96e3002947d..f977a223370 100644
--- a/src/emu/cpu/sc61860/readpc.c
+++ b/src/emu/cpu/sc61860/readpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #if 0
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index 6d887ffe916..d7b580e12ea 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sc61860.c
diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h
index e4c4c7e7a9c..12449d271c1 100644
--- a/src/emu/cpu/sc61860/sc61860.h
+++ b/src/emu/cpu/sc61860/sc61860.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sc61860.h
diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/emu/cpu/sc61860/scdasm.c
index 4b113079967..06214f11206 100644
--- a/src/emu/cpu/sc61860/scdasm.c
+++ b/src/emu/cpu/sc61860/scdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   scdasm.c
diff --git a/src/emu/cpu/scudsp/scudsp.h b/src/emu/cpu/scudsp/scudsp.h
index a1ccb3a5ee1..7d062554cef 100644
--- a/src/emu/cpu/scudsp/scudsp.h
+++ b/src/emu/cpu/scudsp/scudsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * Sega SCUDSP emulator
diff --git a/src/emu/cpu/scudsp/scudspdasm.c b/src/emu/cpu/scudsp/scudspdasm.c
index 01736b70c00..6ce7fb2ee7d 100644
--- a/src/emu/cpu/scudsp/scudspdasm.c
+++ b/src/emu/cpu/scudsp/scudspdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "scudsp.h"
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 7dc842ad789..a396cc51866 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "se3208.h"
diff --git a/src/emu/cpu/se3208/se3208.h b/src/emu/cpu/se3208/se3208.h
index 9be2316cc87..fd839995858 100644
--- a/src/emu/cpu/se3208/se3208.h
+++ b/src/emu/cpu/se3208/se3208.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 enum
 {
diff --git a/src/emu/cpu/se3208/se3208dis.c b/src/emu/cpu/se3208/se3208dis.c
index 44d09376df9..d83a89bfad3 100644
--- a/src/emu/cpu/se3208/se3208dis.c
+++ b/src/emu/cpu/se3208/se3208dis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "se3208.h"
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index fb7161acffd..9e7c5a467a1 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -1,23 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   sh2.c
  *   Portable Hitachi SH-2 (SH7600 family) emulator
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>,
- *   all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *  This work is based on <tiraniddo@hotmail.com> C/C++ implementation of
  *  the SH-2 CPU core and was adapted to the MAME CPU core requirements.
  *  Thanks also go to Chuck Mason <chukjr@sundail.net> and Olivier Galibert
diff --git a/src/emu/cpu/sh2/sh2.h b/src/emu/cpu/sh2/sh2.h
index 495ff2540ab..a91ac1e781d 100644
--- a/src/emu/cpu/sh2/sh2.h
+++ b/src/emu/cpu/sh2/sh2.h
@@ -1,23 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   sh2.h
  *   Portable Hitachi SH-2 (SH7600 family) emulator interface
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>,
- *   all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *  This work is based on <tiraniddo@hotmail.com> C/C++ implementation of
  *  the SH-2 CPU core and was heavily changed to the MAME CPU requirements.
  *  Thanks also go to Chuck Mason <chukjr@sundail.net> and Olivier Galibert
diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h
index f92407e6d27..ad54b229d41 100644
--- a/src/emu/cpu/sh2/sh2comn.h
+++ b/src/emu/cpu/sh2/sh2comn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sh2common.h
diff --git a/src/emu/cpu/sh2/sh2dasm.c b/src/emu/cpu/sh2/sh2dasm.c
index 30562f1983a..01502b9bff8 100644
--- a/src/emu/cpu/sh2/sh2dasm.c
+++ b/src/emu/cpu/sh2/sh2dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "sh2.h"
diff --git a/src/emu/cpu/sh4/sh3comn.c b/src/emu/cpu/sh4/sh3comn.c
index be535d2e74d..59701e1e746 100644
--- a/src/emu/cpu/sh4/sh3comn.c
+++ b/src/emu/cpu/sh4/sh3comn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Handlers for SH3 internals */
 
 #include "emu.h"
diff --git a/src/emu/cpu/sh4/sh3comn.h b/src/emu/cpu/sh4/sh3comn.h
index b8af0584038..122a88ab06c 100644
--- a/src/emu/cpu/sh4/sh3comn.h
+++ b/src/emu/cpu/sh4/sh3comn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SH3COMN_H__
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index 3b294fcf503..b121f8a2f6e 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sh4.c
diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h
index 5a621b8cfc7..00329b3b93f 100644
--- a/src/emu/cpu/sh4/sh4.h
+++ b/src/emu/cpu/sh4/sh4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sh4->h
diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c
index fa5b4caf19d..3c842f982a3 100644
--- a/src/emu/cpu/sh4/sh4comn.c
+++ b/src/emu/cpu/sh4/sh4comn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sh4comn.c
diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h
index 5a04b37402f..81f43753357 100644
--- a/src/emu/cpu/sh4/sh4comn.h
+++ b/src/emu/cpu/sh4/sh4comn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   sh4comn.h
diff --git a/src/emu/cpu/sh4/sh4dasm.c b/src/emu/cpu/sh4/sh4dasm.c
index 1de54946a12..63e57f9d709 100644
--- a/src/emu/cpu/sh4/sh4dasm.c
+++ b/src/emu/cpu/sh4/sh4dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "sh4.h"
diff --git a/src/emu/cpu/sh4/sh4dmac.c b/src/emu/cpu/sh4/sh4dmac.c
index 3c1edf91493..7de37e2863d 100644
--- a/src/emu/cpu/sh4/sh4dmac.c
+++ b/src/emu/cpu/sh4/sh4dmac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* SHA3/4 DMA Controller */
 
 #include "emu.h"
diff --git a/src/emu/cpu/sh4/sh4dmac.h b/src/emu/cpu/sh4/sh4dmac.h
index cfabd19e658..f9f2d4986ac 100644
--- a/src/emu/cpu/sh4/sh4dmac.h
+++ b/src/emu/cpu/sh4/sh4dmac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* SHA3/4 DMA Controller */
 
 /* bit definitions */
diff --git a/src/emu/cpu/sh4/sh4regs.h b/src/emu/cpu/sh4/sh4regs.h
index 8fc26a207b6..4be51f681fa 100644
--- a/src/emu/cpu/sh4/sh4regs.h
+++ b/src/emu/cpu/sh4/sh4regs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SH4REGS_H__
diff --git a/src/emu/cpu/sh4/sh4tmu.c b/src/emu/cpu/sh4/sh4tmu.c
index 6c906143e70..2908dc2366e 100644
--- a/src/emu/cpu/sh4/sh4tmu.c
+++ b/src/emu/cpu/sh4/sh4tmu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* SH3/4 Timer Unit */
 
 #include "emu.h"
diff --git a/src/emu/cpu/sh4/sh4tmu.h b/src/emu/cpu/sh4/sh4tmu.h
index 84840d24e4c..6bf0f506cf9 100644
--- a/src/emu/cpu/sh4/sh4tmu.h
+++ b/src/emu/cpu/sh4/sh4tmu.h
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 /* SH3/4 Timer Unit */
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index 7505535ff64..9c3f5ec7878 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Analog Devices ADSP-2106x SHARC emulator v2.0
 
    Written by Ville Linde
diff --git a/src/emu/cpu/sharc/sharc.h b/src/emu/cpu/sharc/sharc.h
index f5ab26bce85..13e1d1d826c 100644
--- a/src/emu/cpu/sharc/sharc.h
+++ b/src/emu/cpu/sharc/sharc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SHARC_H__
diff --git a/src/emu/cpu/sharc/sharcdsm.c b/src/emu/cpu/sharc/sharcdsm.c
index 320bd56746a..299ce438a6b 100644
--- a/src/emu/cpu/sharc/sharcdsm.c
+++ b/src/emu/cpu/sharc/sharcdsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Analog Devices ADSP-2106x SHARC Disassembler
 
diff --git a/src/emu/cpu/sharc/sharcdsm.h b/src/emu/cpu/sharc/sharcdsm.h
index 602eba427f8..2dcdf575345 100644
--- a/src/emu/cpu/sharc/sharcdsm.h
+++ b/src/emu/cpu/sharc/sharcdsm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static const char ureg_names[256][16] =
 {
 	"R0",       "R1",       "R2",       "R3",       "R4",       "R5",       "R6",       "R7",
diff --git a/src/emu/cpu/sharc/sharcops.h b/src/emu/cpu/sharc/sharcops.h
index a4a46576333..e8e6ea8c1d6 100644
--- a/src/emu/cpu/sharc/sharcops.h
+++ b/src/emu/cpu/sharc/sharcops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 const adsp21062_device::SHARC_OP adsp21062_device::s_sharc_opcode_table[] =
 {
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index 0e8b6bea10f..87284d70c27 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Implementation for Sharp sm8500 cpu. There is hardly any information available
   on this cpu. Currently we've only found documentation on the microcontroller
diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/emu/cpu/sm8500/sm8500.h
index 0c56e82b7a2..41f9505d2d7 100644
--- a/src/emu/cpu/sm8500/sm8500.h
+++ b/src/emu/cpu/sm8500/sm8500.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SM8500_H__
diff --git a/src/emu/cpu/sm8500/sm8500d.c b/src/emu/cpu/sm8500/sm8500d.c
index 2aa5366f804..1e7a0f95f55 100644
--- a/src/emu/cpu/sm8500/sm8500d.c
+++ b/src/emu/cpu/sm8500/sm8500d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 sm8500d.c
diff --git a/src/emu/cpu/sm8500/sm85ops.h b/src/emu/cpu/sm8500/sm85ops.h
index 100c67ce171..8d066153879 100644
--- a/src/emu/cpu/sm8500/sm85ops.h
+++ b/src/emu/cpu/sm8500/sm85ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define ARG_R   r1 = mem_readbyte( m_PC++ );
 
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index 0e385bb06ef..48224c2ff1e 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* =============================== COPYRIGHT ============================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/spc700/spc700.h b/src/emu/cpu/spc700/spc700.h
index 192ec9ba6fe..c2f1e42bf17 100644
--- a/src/emu/cpu/spc700/spc700.h
+++ b/src/emu/cpu/spc700/spc700.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SPC700_H__
diff --git a/src/emu/cpu/spc700/spc700ds.c b/src/emu/cpu/spc700/spc700ds.c
index a599b8d7c7d..002d4fe0425 100644
--- a/src/emu/cpu/spc700/spc700ds.c
+++ b/src/emu/cpu/spc700/spc700ds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ======================================================================== */
 /* =============================== COPYRIGHT ============================== */
 /* ======================================================================== */
diff --git a/src/emu/cpu/spc700/spc700ds.h b/src/emu/cpu/spc700/spc700ds.h
index 8dcbf56b629..c642cb4727d 100644
--- a/src/emu/cpu/spc700/spc700ds.h
+++ b/src/emu/cpu/spc700/spc700ds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SPC700DS_H__
diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c
index 0bd4133a563..2dab6fffc59 100644
--- a/src/emu/cpu/ssem/ssem.c
+++ b/src/emu/cpu/ssem/ssem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Manchester Small-Scale Experimental Machine (SSEM) emulator
 
diff --git a/src/emu/cpu/ssem/ssem.h b/src/emu/cpu/ssem/ssem.h
index 251c7a29fd3..b1cb9347632 100644
--- a/src/emu/cpu/ssem/ssem.h
+++ b/src/emu/cpu/ssem/ssem.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Manchester Small-Scale Experimental Machine (SSEM) emulator
 
diff --git a/src/emu/cpu/ssem/ssemdasm.c b/src/emu/cpu/ssem/ssemdasm.c
index 4b746ac0fce..14cd7acef04 100644
--- a/src/emu/cpu/ssem/ssemdasm.c
+++ b/src/emu/cpu/ssem/ssemdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Manchester Small-Scale Experimental Machine (SSEM) disassembler
 
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index a50aee5bfe0..e28b78b913f 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Samsung SSP1601 DSP emulator
  *
diff --git a/src/emu/cpu/ssp1601/ssp1601.h b/src/emu/cpu/ssp1601/ssp1601.h
index 0c06d2785f0..c482c3ff318 100644
--- a/src/emu/cpu/ssp1601/ssp1601.h
+++ b/src/emu/cpu/ssp1601/ssp1601.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SSP1601_H__
diff --git a/src/emu/cpu/ssp1601/ssp1601d.c b/src/emu/cpu/ssp1601/ssp1601d.c
index 438294cd6a6..8c8fddb9305 100644
--- a/src/emu/cpu/ssp1601/ssp1601d.c
+++ b/src/emu/cpu/ssp1601/ssp1601d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  SSP1601 disassembler
diff --git a/src/emu/cpu/superfx/sfx_dasm.c b/src/emu/cpu/superfx/sfx_dasm.c
index 60078e7787d..2e451233e7f 100644
--- a/src/emu/cpu/superfx/sfx_dasm.c
+++ b/src/emu/cpu/superfx/sfx_dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "superfx.h"
 
diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c
index ec1f1e27aad..913078e6a1c 100644
--- a/src/emu/cpu/superfx/superfx.c
+++ b/src/emu/cpu/superfx/superfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "superfx.h"
diff --git a/src/emu/cpu/superfx/superfx.h b/src/emu/cpu/superfx/superfx.h
index 99991a4d226..7fcb374560c 100644
--- a/src/emu/cpu/superfx/superfx.h
+++ b/src/emu/cpu/superfx/superfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __SUPERFX_H__
 #define __SUPERFX_H__
 
diff --git a/src/emu/cpu/t11/t11.h b/src/emu/cpu/t11/t11.h
index 2d7aa2aa180..554c7f09861 100644
--- a/src/emu/cpu/t11/t11.h
+++ b/src/emu/cpu/t11/t11.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** T-11: Portable DEC T-11 emulator ******************************************/
 
 #pragma once
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 118d7a93168..65c970f9c9c 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
     Toshiba TLCS-90 Series MCU's
diff --git a/src/emu/cpu/tlcs90/tlcs90.h b/src/emu/cpu/tlcs90/tlcs90.h
index 77f4f82d750..cde0ef474a8 100644
--- a/src/emu/cpu/tlcs90/tlcs90.h
+++ b/src/emu/cpu/tlcs90/tlcs90.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TLCS90_H__
diff --git a/src/emu/cpu/tlcs900/dasm900.c b/src/emu/cpu/tlcs900/dasm900.c
index f3597934e05..0cebddcf549 100644
--- a/src/emu/cpu/tlcs900/dasm900.c
+++ b/src/emu/cpu/tlcs900/dasm900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 Toshiba TLCS-900/H disassembly
diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c
index 05126275cc8..1d6e2c39058 100644
--- a/src/emu/cpu/tlcs900/tlcs900.c
+++ b/src/emu/cpu/tlcs900/tlcs900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 Toshiba TLCS-900/H emulation
diff --git a/src/emu/cpu/tlcs900/tlcs900.h b/src/emu/cpu/tlcs900/tlcs900.h
index 11b61e532f1..ca02d801313 100644
--- a/src/emu/cpu/tlcs900/tlcs900.h
+++ b/src/emu/cpu/tlcs900/tlcs900.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TLCS900_H__
 #define __TLCS900_H__
 
diff --git a/src/emu/cpu/tms0980/tms0980.h b/src/emu/cpu/tms0980/tms0980.h
index a291c95de92..15caeedeedb 100644
--- a/src/emu/cpu/tms0980/tms0980.h
+++ b/src/emu/cpu/tms0980/tms0980.h
@@ -90,7 +90,7 @@ protected:
 	virtual void execute_run();
 
 	// device_memory_interface overrides
-	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config :((spacenum == AS_DATA) ? &m_data_config : NULL); }
+	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL); }
 
 	// device_disasm_interface overrides
 	virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
diff --git a/src/emu/cpu/tms32010/32010dsm.c b/src/emu/cpu/tms32010/32010dsm.c
index 44362d1a855..e3ed2864d10 100644
--- a/src/emu/cpu/tms32010/32010dsm.c
+++ b/src/emu/cpu/tms32010/32010dsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                Texas Instruments TMS32010 DSP Disassembler               *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32010/dis32010.c b/src/emu/cpu/tms32010/dis32010.c
index 1e388734493..2e20e696d6d 100644
--- a/src/emu/cpu/tms32010/dis32010.c
+++ b/src/emu/cpu/tms32010/dis32010.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*               Texas Instruments TMS32010 DSP Disassembler                *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c
index 28361c39e49..f9afd70fe87 100644
--- a/src/emu/cpu/tms32010/tms32010.c
+++ b/src/emu/cpu/tms32010/tms32010.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                 Texas Instruments TMS32010 DSP Emulator                  *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32010/tms32010.h b/src/emu/cpu/tms32010/tms32010.h
index 0b9448112f3..a13adf8a0ff 100644
--- a/src/emu/cpu/tms32010/tms32010.h
+++ b/src/emu/cpu/tms32010/tms32010.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                 Texas Instruments TMS32010 DSP Emulator                  *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32025/32025dsm.c b/src/emu/cpu/tms32025/32025dsm.c
index 7499da4e210..14fb2c8c585 100644
--- a/src/emu/cpu/tms32025/32025dsm.c
+++ b/src/emu/cpu/tms32025/32025dsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*              Texas Instruments TMS320x25 DSP Disassembler                *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32025/dis32025.c b/src/emu/cpu/tms32025/dis32025.c
index 15f04ccbecd..ae9a8a649d2 100644
--- a/src/emu/cpu/tms32025/dis32025.c
+++ b/src/emu/cpu/tms32025/dis32025.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*              Texas Instruments TMS320x25 DSP Disassembler                *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c
index 5e237b2f35d..e41ebac8ae0 100644
--- a/src/emu/cpu/tms32025/tms32025.c
+++ b/src/emu/cpu/tms32025/tms32025.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                Texas Instruments TMS320x25 DSP Emulator                  *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32025/tms32025.h b/src/emu/cpu/tms32025/tms32025.h
index 60d6cba9643..6d1b6ffce55 100644
--- a/src/emu/cpu/tms32025/tms32025.h
+++ b/src/emu/cpu/tms32025/tms32025.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/**************************************************************************\
 	*                Texas Instruments TMS320x25 DSP Emulator                  *
 	*                                                                          *
diff --git a/src/emu/cpu/tms32051/32051ops.c b/src/emu/cpu/tms32051/32051ops.c
index 65d712d453d..ae4ca615ade 100644
--- a/src/emu/cpu/tms32051/32051ops.c
+++ b/src/emu/cpu/tms32051/32051ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // stack is LIFO and is 8 levels deep, there is no stackpointer on the real chip
 void tms32051_device::PUSH_STACK(UINT16 pc)
 {
diff --git a/src/emu/cpu/tms32051/32051ops.h b/src/emu/cpu/tms32051/32051ops.h
index 1fe85e638fd..489ab5f30ff 100644
--- a/src/emu/cpu/tms32051/32051ops.h
+++ b/src/emu/cpu/tms32051/32051ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const tms32051_device::opcode_func tms32051_device::s_opcode_table[256] =
 {
 	/* 0x00 - 0x0f */
diff --git a/src/emu/cpu/tms32051/dis32051.c b/src/emu/cpu/tms32051/dis32051.c
index 336d9aec561..321d40da12d 100644
--- a/src/emu/cpu/tms32051/dis32051.c
+++ b/src/emu/cpu/tms32051/dis32051.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index 2347ddf0632..f3d5f50dc41 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Texas Instruments TMS320C51 DSP Emulator
 
diff --git a/src/emu/cpu/tms32051/tms32051.h b/src/emu/cpu/tms32051/tms32051.h
index ee1630311ef..6c425e5b021 100644
--- a/src/emu/cpu/tms32051/tms32051.h
+++ b/src/emu/cpu/tms32051/tms32051.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS32051_H__
diff --git a/src/emu/cpu/tms32082/dis_mp.c b/src/emu/cpu/tms32082/dis_mp.c
index 0bcb5a79788..289206d6f6d 100644
--- a/src/emu/cpu/tms32082/dis_mp.c
+++ b/src/emu/cpu/tms32082/dis_mp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // TMS32082 MP Disassembler
 
 #include "emu.h"
diff --git a/src/emu/cpu/tms32082/dis_pp.c b/src/emu/cpu/tms32082/dis_pp.c
index cd63a3c2559..c11abd076e7 100644
--- a/src/emu/cpu/tms32082/dis_pp.c
+++ b/src/emu/cpu/tms32082/dis_pp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // TMS32082 PP Disassembler
 
 #include "emu.h"
diff --git a/src/emu/cpu/tms32082/mp_ops.c b/src/emu/cpu/tms32082/mp_ops.c
index 9f518c48089..582bbfa71ea 100644
--- a/src/emu/cpu/tms32082/mp_ops.c
+++ b/src/emu/cpu/tms32082/mp_ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // TMS320C82 Master Processor core execution
 
 #include "emu.h"
diff --git a/src/emu/cpu/tms32082/tms32082.c b/src/emu/cpu/tms32082/tms32082.c
index 742694aa7f9..e3d78550e64 100644
--- a/src/emu/cpu/tms32082/tms32082.c
+++ b/src/emu/cpu/tms32082/tms32082.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Texas Instruments TMS320C82 DSP Emulator
 
diff --git a/src/emu/cpu/tms32082/tms32082.h b/src/emu/cpu/tms32082/tms32082.h
index 9c496e73904..c67f7049cd3 100644
--- a/src/emu/cpu/tms32082/tms32082.h
+++ b/src/emu/cpu/tms32082/tms32082.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS32082_H__
diff --git a/src/emu/cpu/tms34010/34010dsm.c b/src/emu/cpu/tms34010/34010dsm.c
index b0643d6b4ee..3d80b837bfb 100644
--- a/src/emu/cpu/tms34010/34010dsm.c
+++ b/src/emu/cpu/tms34010/34010dsm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *   A TMS34010 disassembler
  *
diff --git a/src/emu/cpu/tms34010/34010fld.c b/src/emu/cpu/tms34010/34010fld.c
index 4dbe2fde4ca..750bd9ea8c1 100644
--- a/src/emu/cpu/tms34010/34010fld.c
+++ b/src/emu/cpu/tms34010/34010fld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c
index 93e7ecd3283..8b56dc31c86 100644
--- a/src/emu/cpu/tms34010/34010gfx.c
+++ b/src/emu/cpu/tms34010/34010gfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms34010/34010ops.c b/src/emu/cpu/tms34010/34010ops.c
index b91018c08dd..43d2e211a40 100644
--- a/src/emu/cpu/tms34010/34010ops.c
+++ b/src/emu/cpu/tms34010/34010ops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms34010/34010ops.h b/src/emu/cpu/tms34010/34010ops.h
index f811659c11c..c31fd3e2b90 100644
--- a/src/emu/cpu/tms34010/34010ops.h
+++ b/src/emu/cpu/tms34010/34010ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms34010/34010tbl.c b/src/emu/cpu/tms34010/34010tbl.c
index 63fde238d3b..0d82877914e 100644
--- a/src/emu/cpu/tms34010/34010tbl.c
+++ b/src/emu/cpu/tms34010/34010tbl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** TMS34010: Portable TMS34010 emulator ***********************************
 
     Copyright Alex Pasadyn/Zsolt Vasvari
diff --git a/src/emu/cpu/tms34010/dis34010.c b/src/emu/cpu/tms34010/dis34010.c
index e15f59f54da..2e8751e9a36 100644
--- a/src/emu/cpu/tms34010/dis34010.c
+++ b/src/emu/cpu/tms34010/dis34010.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* This program is based on DIS68k by Aaron Giles */
 
 #include "emu.h"
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 54084f631f8..c38237771af 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h
index e46fbe29783..9f7e8f5694f 100644
--- a/src/emu/cpu/tms34010/tms34010.h
+++ b/src/emu/cpu/tms34010/tms34010.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMS34010: Portable Texas Instruments TMS34010 emulator
diff --git a/src/emu/cpu/tms7000/7000dasm.c b/src/emu/cpu/tms7000/7000dasm.c
index 33f49cb52d9..8ba2996572c 100644
--- a/src/emu/cpu/tms7000/7000dasm.c
+++ b/src/emu/cpu/tms7000/7000dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "tms7000.h"
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 9eb1b3ee271..e878e3ee80f 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   tms7000.c
diff --git a/src/emu/cpu/tms7000/tms7000.h b/src/emu/cpu/tms7000/tms7000.h
index 2f30ce144ae..2de1a4900c5 100644
--- a/src/emu/cpu/tms7000/tms7000.h
+++ b/src/emu/cpu/tms7000/tms7000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   tms7000.h (c header file)
diff --git a/src/emu/cpu/ucom4/ucom4.h b/src/emu/cpu/ucom4/ucom4.h
index 5c4cd18eac4..5e2bff9a62c 100644
--- a/src/emu/cpu/ucom4/ucom4.h
+++ b/src/emu/cpu/ucom4/ucom4.h
@@ -144,7 +144,7 @@ protected:
 	virtual void execute_run();
 
 	// device_memory_interface overrides
-	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config :((spacenum == AS_DATA) ? &m_data_config : NULL); }
+	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL); }
 
 	// device_disasm_interface overrides
 	virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
diff --git a/src/emu/cpu/unsp/unsp.c b/src/emu/cpu/unsp/unsp.c
index fd1d8ef89fc..ec50b97b472 100644
--- a/src/emu/cpu/unsp/unsp.c
+++ b/src/emu/cpu/unsp/unsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************\
 *
 *   SunPlus u'nSP core
diff --git a/src/emu/cpu/unsp/unsp.h b/src/emu/cpu/unsp/unsp.h
index 6f04b0c0b90..a8287caa863 100644
--- a/src/emu/cpu/unsp/unsp.h
+++ b/src/emu/cpu/unsp/unsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************\
 *
 *   SunPlus u'nSP emulator
diff --git a/src/emu/cpu/unsp/unspdasm.c b/src/emu/cpu/unsp/unspdasm.c
index 602a98a24ba..831b21f8f57 100644
--- a/src/emu/cpu/unsp/unspdasm.c
+++ b/src/emu/cpu/unsp/unspdasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************\
 *
 *   SunPlus u'nSP disassembler
diff --git a/src/emu/cpu/upd7725/dasm7725.c b/src/emu/cpu/upd7725/dasm7725.c
index ef6996fc33a..7c7ccb43603 100644
--- a/src/emu/cpu/upd7725/dasm7725.c
+++ b/src/emu/cpu/upd7725/dasm7725.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dasm7725.c
diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c
index 20cf81d20b2..544d1e6c689 100644
--- a/src/emu/cpu/upd7725/upd7725.c
+++ b/src/emu/cpu/upd7725/upd7725.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     upd7725.c
diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h
index 904e3771386..ae72f94180c 100644
--- a/src/emu/cpu/upd7725/upd7725.h
+++ b/src/emu/cpu/upd7725/upd7725.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     upd7725.h
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index cf1ded0c32b..f22ccb07b4f 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -1,46 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   upd7810.c
  *   Portable uPD7810/11, 7810H/11H, 78C10/C11/C14 emulator V0.3
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  *  This work is based on the
  *  "NEC Electronics User's Manual, April 1987"
  *
diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h
index adbfc21e733..db83f60bf22 100644
--- a/src/emu/cpu/upd7810/upd7810.h
+++ b/src/emu/cpu/upd7810/upd7810.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __UPD7810_H__
diff --git a/src/emu/cpu/upd7810/upd7810_dasm.c b/src/emu/cpu/upd7810/upd7810_dasm.c
index 2ed2760f8bd..63e7291ff5e 100644
--- a/src/emu/cpu/upd7810/upd7810_dasm.c
+++ b/src/emu/cpu/upd7810/upd7810_dasm.c
@@ -1,7 +1,8 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Portable uPD7810/11, 7810H/11H, 78C10/C11/C14 disassembler
- *   Copyright Juergen Buchmueller, all rights reserved.
  *
  *   NS20030112: added 7807.
  *
diff --git a/src/emu/cpu/upd7810/upd7810_macros.h b/src/emu/cpu/upd7810/upd7810_macros.h
index 59f5791baea..3a02e209b2f 100644
--- a/src/emu/cpu/upd7810/upd7810_macros.h
+++ b/src/emu/cpu/upd7810/upd7810_macros.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     uPD7810/11, 7810H/11H, 78C10/C11/C14 private use macros
diff --git a/src/emu/cpu/upd7810/upd7810_opcodes.c b/src/emu/cpu/upd7810/upd7810_opcodes.c
index e3f8e16ee8c..ab4589222c1 100644
--- a/src/emu/cpu/upd7810/upd7810_opcodes.c
+++ b/src/emu/cpu/upd7810/upd7810_opcodes.c
@@ -1,7 +1,8 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Portable uPD7810/11, 7810H/11H, 78C10/C11/C14 emulator V0.2
- *   Copyright Juergen Buchmueller, all rights reserved.
  *
  *   7810ops.inc  - opcode functions
  *
diff --git a/src/emu/cpu/upd7810/upd7810_table.c b/src/emu/cpu/upd7810/upd7810_table.c
index 3e60916a771..f150af4fc2f 100644
--- a/src/emu/cpu/upd7810/upd7810_table.c
+++ b/src/emu/cpu/upd7810/upd7810_table.c
@@ -1,7 +1,8 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   Portable uPD7810/11, 7810H/11H, 78C10/C11/C14 emulator V0.2
- *   Copyright Juergen Buchmueller, all rights reserved.
  *
  *   7810tbl.inc  - function pointer tables
  *
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index c8fc839c856..cd448721df9 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     NEC V20/V30/V33 emulator modified to a v30mz emulator
diff --git a/src/emu/cpu/v30mz/v30mz.h b/src/emu/cpu/v30mz/v30mz.h
index 40deaf1fa43..d34eed59121 100644
--- a/src/emu/cpu/v30mz/v30mz.h
+++ b/src/emu/cpu/v30mz/v30mz.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __V30MZ_H__
 #define __V30MZ_H__
 
diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c
index 6bd5fc3690e..8fc54ad3b9b 100644
--- a/src/emu/cpu/v60/v60.c
+++ b/src/emu/cpu/v60/v60.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // V60.C
 // Undiscover the beast!
 // Main hacking and coding by Farfetch'd
diff --git a/src/emu/cpu/v60/v60.h b/src/emu/cpu/v60/v60.h
index 7c5b8c2e758..c0fc53d7ea1 100644
--- a/src/emu/cpu/v60/v60.h
+++ b/src/emu/cpu/v60/v60.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __V60_H__
diff --git a/src/emu/cpu/v60/v60d.c b/src/emu/cpu/v60/v60d.c
index 98f953f3761..aa73fc7b722 100644
--- a/src/emu/cpu/v60/v60d.c
+++ b/src/emu/cpu/v60/v60d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "debugger.h"
diff --git a/src/emu/cpu/v810/v810.h b/src/emu/cpu/v810/v810.h
index b2b87b7d247..1c51045ce3b 100644
--- a/src/emu/cpu/v810/v810.h
+++ b/src/emu/cpu/v810/v810.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __V810_H__
diff --git a/src/emu/cpu/v810/v810dasm.c b/src/emu/cpu/v810/v810dasm.c
index 1ffcc26bd8c..00620f83670 100644
--- a/src/emu/cpu/v810/v810dasm.c
+++ b/src/emu/cpu/v810/v810dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************
     NEC V810 (upd70732) disassembler
   Tomasz Slanina - analog[at]op.pl
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c
index 05a6ff6e5eb..60fea4491c6 100644
--- a/src/emu/cpu/z180/z180.c
+++ b/src/emu/cpu/z180/z180.c
@@ -1,46 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z180.c
  *   Portable Z180 emulator V0.3
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  *****************************************************************************/
 
 /*****************************************************************************
diff --git a/src/emu/cpu/z180/z180.h b/src/emu/cpu/z180/z180.h
index 53479149502..a95105bcbcb 100644
--- a/src/emu/cpu/z180/z180.h
+++ b/src/emu/cpu/z180/z180.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __Z180_H__
diff --git a/src/emu/cpu/z180/z180dasm.c b/src/emu/cpu/z180/z180dasm.c
index 39fcaee8f3c..5c83ed212b2 100644
--- a/src/emu/cpu/z180/z180dasm.c
+++ b/src/emu/cpu/z180/z180dasm.c
@@ -1,46 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z180dasm.c
  *   Portable Z8x180 disassembler
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  *****************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/z180/z180ops.h b/src/emu/cpu/z180/z180ops.h
index d3adcb7d039..62fa3d9cd50 100644
--- a/src/emu/cpu/z180/z180ops.h
+++ b/src/emu/cpu/z180/z180ops.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************
  * Enter HALT state; write 1 to fake port on first execution
  ***************************************************************/
diff --git a/src/emu/cpu/z180/z180tbl.h b/src/emu/cpu/z180/z180tbl.h
index c115eadc851..b8b2b3bbca3 100644
--- a/src/emu/cpu/z180/z180tbl.h
+++ b/src/emu/cpu/z180/z180tbl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* tmp1 value for ini/inir/outi/otir for [C.1-0][io.1-0] */
 static const UINT8 irep_tmp1[4][4] = {
 	{0,0,1,0},{0,1,0,1},{1,0,1,1},{0,1,1,0}
diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c
index 47cc5531b65..ca7b63367ff 100644
--- a/src/emu/cpu/z8/z8.c
+++ b/src/emu/cpu/z8/z8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Zilog Z8 Single-Chip MCU emulation
diff --git a/src/emu/cpu/z8/z8.h b/src/emu/cpu/z8/z8.h
index c9a653d58d3..e680ed738df 100644
--- a/src/emu/cpu/z8/z8.h
+++ b/src/emu/cpu/z8/z8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Zilog Z8 Single-Chip MCU emulation
diff --git a/src/emu/cpu/z8/z8dasm.c b/src/emu/cpu/z8/z8dasm.c
index 285a970a8b3..587431b7e5a 100644
--- a/src/emu/cpu/z8/z8dasm.c
+++ b/src/emu/cpu/z8/z8dasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "debugger.h"
 #include "z8.h"
diff --git a/src/emu/cpu/z80/kl5c80a12.c b/src/emu/cpu/z80/kl5c80a12.c
index ddf40bd8612..b7302a60ef2 100644
--- a/src/emu/cpu/z80/kl5c80a12.c
+++ b/src/emu/cpu/z80/kl5c80a12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kawasaki LSI
diff --git a/src/emu/cpu/z80/kl5c80a12.h b/src/emu/cpu/z80/kl5c80a12.h
index 6f6683ecb59..fa83a267138 100644
--- a/src/emu/cpu/z80/kl5c80a12.h
+++ b/src/emu/cpu/z80/kl5c80a12.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kawasaki LSI
diff --git a/src/emu/cpu/z80/tmpz84c011.c b/src/emu/cpu/z80/tmpz84c011.c
index 61bf67762e5..c887a088bb3 100644
--- a/src/emu/cpu/z80/tmpz84c011.c
+++ b/src/emu/cpu/z80/tmpz84c011.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba TMPZ84C011, MPUZ80/TLCS-Z80 ASSP Family
diff --git a/src/emu/cpu/z80/tmpz84c011.h b/src/emu/cpu/z80/tmpz84c011.h
index 57224e54914..22d71e2b403 100644
--- a/src/emu/cpu/z80/tmpz84c011.h
+++ b/src/emu/cpu/z80/tmpz84c011.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba TMPZ84C011, MPUZ80/TLCS-Z80 ASSP Family
diff --git a/src/emu/cpu/z80/tmpz84c015.c b/src/emu/cpu/z80/tmpz84c015.c
index 40970912d14..af2a66fcd75 100644
--- a/src/emu/cpu/z80/tmpz84c015.c
+++ b/src/emu/cpu/z80/tmpz84c015.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba TMPZ84C015, MPUZ80/TLCS-Z80 ASSP Family
diff --git a/src/emu/cpu/z80/tmpz84c015.h b/src/emu/cpu/z80/tmpz84c015.h
index 412f47556c9..99b84a49338 100644
--- a/src/emu/cpu/z80/tmpz84c015.h
+++ b/src/emu/cpu/z80/tmpz84c015.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba TMPZ84C015, MPUZ80/TLCS-Z80 ASSP Family
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index 13f4a59ab6a..df11378ffac 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -1,22 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z80.c
  *   Portable Z80 emulator V3.9
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *   TODO:
  *    - Interrupt mode 0 should be able to execute arbitrary opcodes
  *    - If LD A,I or LD A,R is interrupted, P/V flag gets reset, even if IFF2
diff --git a/src/emu/cpu/z80/z80.h b/src/emu/cpu/z80/z80.h
index 6c8d216c135..777990a58e1 100644
--- a/src/emu/cpu/z80/z80.h
+++ b/src/emu/cpu/z80/z80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __Z80_H__
diff --git a/src/emu/cpu/z80/z80daisy.c b/src/emu/cpu/z80/z80daisy.c
index b44f2767386..25cb0fbe049 100644
--- a/src/emu/cpu/z80/z80daisy.c
+++ b/src/emu/cpu/z80/z80daisy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     z80daisy.c
diff --git a/src/emu/cpu/z80/z80daisy.h b/src/emu/cpu/z80/z80daisy.h
index 7d527248988..158df274718 100644
--- a/src/emu/cpu/z80/z80daisy.h
+++ b/src/emu/cpu/z80/z80daisy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     z80daisy.h
diff --git a/src/emu/cpu/z80/z80dasm.c b/src/emu/cpu/z80/z80dasm.c
index 00485bab86a..ebb965db26e 100644
--- a/src/emu/cpu/z80/z80dasm.c
+++ b/src/emu/cpu/z80/z80dasm.c
@@ -1,22 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z80dasm.c
  *   Portable Z80 disassembler
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *****************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/z8000/8000dasm.c b/src/emu/cpu/z8000/8000dasm.c
index 9aada81559d..537a021c1d5 100644
--- a/src/emu/cpu/z8000/8000dasm.c
+++ b/src/emu/cpu/z8000/8000dasm.c
@@ -1,47 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   8000dasm.c
  *   Portable Z8000(2) emulator
  *   Z8000 disassembler; requires the z8000_exec table to be initialized
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  *****************************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/cpu/z8000/makedab.c b/src/emu/cpu/z8000/makedab.c
index cebce6e42c5..d293c74cfb6 100644
--- a/src/emu/cpu/z8000/makedab.c
+++ b/src/emu/cpu/z8000/makedab.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>
 
 #define CF  0x100
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index fc410a5595c..efa3f13462d 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -1,46 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z8000.c
  *   Portable Z8000(2) emulator
  *   Z8000 MAME interface
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   You can contact me at juergen@mame.net or pullmoll@stop1984.com
- *
- *   - This source code is released as freeware for non-commercial purposes
- *     as part of the M.A.M.E. (Multiple Arcade Machine Emulator) project.
- *     The licensing terms of MAME apply to this piece of code for the MAME
- *     project and derviative works, as defined by the MAME license. You
- *     may opt to make modifications, improvements or derivative works under
- *     that same conditions, and the MAME project may opt to keep
- *     modifications, improvements or derivatives under their terms exclusively.
- *
- *   - Alternatively you can choose to apply the terms of the "GPL" (see
- *     below) to this - and only this - piece of code or your derivative works.
- *     Note that in no case your choice can have any impact on any other
- *     source code of the MAME project, or binary, or executable, be it closely
- *     or losely related to this piece of code.
- *
- *  -  At your choice you are also free to remove either licensing terms from
- *     this file and continue to use it under only one of the two licenses. Do this
- *     if you think that licenses are not compatible (enough) for you, or if you
- *     consider either license 'too restrictive' or 'too free'.
- *
- *  -  GPL (GNU General Public License)
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version 2
- *     of the License, or (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  *     TODO:
  *     - make the z8001 opcodes to be dynamic (i.e. to take segmented mode flag into account and use the non-segmented mode)
  *     - dissassembler doesn't work at all with the z8001
diff --git a/src/emu/cpu/z8000/z8000.h b/src/emu/cpu/z8000/z8000.h
index 5eacb5c8e85..b3966030ede 100644
--- a/src/emu/cpu/z8000/z8000.h
+++ b/src/emu/cpu/z8000/z8000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __Z8000_H__
diff --git a/src/emu/cpu/z8000/z8000cpu.h b/src/emu/cpu/z8000/z8000cpu.h
index 9b7cfc6a8e9..1a3f9e52b0f 100644
--- a/src/emu/cpu/z8000/z8000cpu.h
+++ b/src/emu/cpu/z8000/z8000cpu.h
@@ -1,24 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller,Ernesto Corvi
 /*****************************************************************************
  *
  *   z8000cpu.h
  *   Portable Z8000(2) emulator
  *   Macros and types used in z8000.c / z8000ops.inc / z8000tbl.inc
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   Bug fixes and MSB_FIRST compliance Ernesto Corvi.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *****************************************************************************/
 
 /**************************************************************************
diff --git a/src/emu/cpu/z8000/z8000dab.h b/src/emu/cpu/z8000/z8000dab.h
index bee36eedaee..4da6c4e22bf 100644
--- a/src/emu/cpu/z8000/z8000dab.h
+++ b/src/emu/cpu/z8000/z8000dab.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************
  * Result table for Z8000 DAB instruction
  *
diff --git a/src/emu/cpu/z8000/z8000ops.inc b/src/emu/cpu/z8000/z8000ops.inc
index cfb83557fae..6dae8772a2e 100644
--- a/src/emu/cpu/z8000/z8000ops.inc
+++ b/src/emu/cpu/z8000/z8000ops.inc
@@ -1,25 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /*****************************************************************************
  *
  *   z8000ops.inc
  *   Portable Z8000(2) emulator
  *   Opcode functions
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   Bug fixes and MSB_FIRST compliance Ernesto Corvi.
- *   Bug fixes and segmented mode support Christian Groessler.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *****************************************************************************/
 
 /******************************************
diff --git a/src/emu/cpu/z8000/z8000tbl.inc b/src/emu/cpu/z8000/z8000tbl.inc
index ef650b79a84..ad66cb8c421 100644
--- a/src/emu/cpu/z8000/z8000tbl.inc
+++ b/src/emu/cpu/z8000/z8000tbl.inc
@@ -1,24 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller,Ernesto Corvi
 /*****************************************************************************
  *
  *   z8000tbl.inc
  *   Portable Z8000(2) emulator
  *   Opcode table (including mnemonics) and initialization
  *
- *   Copyright Juergen Buchmueller, all rights reserved.
- *   Bug fixes and MSB_FIRST compliance Ernesto Corvi.
- *
- *   - This source code is released as freeware for non-commercial purposes.
- *   - You are free to use and redistribute this code in modified or
- *     unmodified form, provided you list me in the credits.
- *   - If you modify this source code, you must add a notice to each modified
- *     source file that it has been changed.  If you're a nice person, you
- *     will clearly mark each change too.  :)
- *   - If you wish to use this for commercial purposes, please contact me at
- *     pullmoll@t-online.de
- *   - The author of this copywritten work reserves the right to change the
- *     terms of its usage and license at any time, including retroactively
- *   - This entire notice must remain in the source code.
- *
  *****************************************************************************/
 
 static const Z8000_init table[] = {
diff --git a/src/emu/crsshair.c b/src/emu/crsshair.c
index 07461db520d..2e5ae8e2649 100644
--- a/src/emu/crsshair.c
+++ b/src/emu/crsshair.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     crsshair.c
diff --git a/src/emu/crsshair.h b/src/emu/crsshair.h
index e572e2f35ee..b88e51d7827 100644
--- a/src/emu/crsshair.h
+++ b/src/emu/crsshair.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     crsshair.h
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index 50155dacbe0..16cbb3c0216 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugcmd.c
diff --git a/src/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h
index 058267622bb..71f76802411 100644
--- a/src/emu/debug/debugcmd.h
+++ b/src/emu/debug/debugcmd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugcmd.h
diff --git a/src/emu/debug/debugcon.c b/src/emu/debug/debugcon.c
index 669ce24c92e..8490faa9701 100644
--- a/src/emu/debug/debugcon.c
+++ b/src/emu/debug/debugcon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugcon.c
diff --git a/src/emu/debug/debugcon.h b/src/emu/debug/debugcon.h
index 62161c133ee..f4e24dca86e 100644
--- a/src/emu/debug/debugcon.h
+++ b/src/emu/debug/debugcon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugcon.h
diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c
index 1949f4b6665..4691a93a364 100644
--- a/src/emu/debug/debughlp.c
+++ b/src/emu/debug/debughlp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debughlp.c
diff --git a/src/emu/debug/debughlp.h b/src/emu/debug/debughlp.h
index b921e564b90..fb72b56586c 100644
--- a/src/emu/debug/debughlp.h
+++ b/src/emu/debug/debughlp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debughlp.h
diff --git a/src/emu/debug/textbuf.c b/src/emu/debug/textbuf.c
index 712c9500593..423e35e64f5 100644
--- a/src/emu/debug/textbuf.c
+++ b/src/emu/debug/textbuf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     textbuf.c
diff --git a/src/emu/debug/textbuf.h b/src/emu/debug/textbuf.h
index 151a9b0c06c..945c486bdd2 100644
--- a/src/emu/debug/textbuf.h
+++ b/src/emu/debug/textbuf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     textbuf.h
diff --git a/src/emu/debugger.c b/src/emu/debugger.c
index 07656f6178e..8a8afd3fef2 100644
--- a/src/emu/debugger.c
+++ b/src/emu/debugger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugger.c
diff --git a/src/emu/debugger.h b/src/emu/debugger.h
index 03fc80b748f..99bdb6f5505 100644
--- a/src/emu/debugger.h
+++ b/src/emu/debugger.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     debugger.h
diff --git a/src/emu/digfx.c b/src/emu/digfx.c
index 6b854f046ef..f8d64896d7e 100644
--- a/src/emu/digfx.c
+++ b/src/emu/digfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     digfx.c
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index 976a7f581c9..5b314e2b288 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     digfx.h
diff --git a/src/emu/dinetwork.c b/src/emu/dinetwork.c
index cd8f0b3a71c..feab87bf8b0 100644
--- a/src/emu/dinetwork.c
+++ b/src/emu/dinetwork.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "osdnet.h"
 
diff --git a/src/emu/dinetwork.h b/src/emu/dinetwork.h
index 2b4b2b8517c..27611e326a2 100644
--- a/src/emu/dinetwork.h
+++ b/src/emu/dinetwork.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DINETWORK_H__
 #define __DINETWORK_H__
 
diff --git a/src/emu/diserial.c b/src/emu/diserial.c
index 46748b5e692..c93d826960b 100644
--- a/src/emu/diserial.c
+++ b/src/emu/diserial.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /***************************************************************************
 
diff --git a/src/emu/diserial.h b/src/emu/diserial.h
index 0212bb1b80e..8a6a0bfb065 100644
--- a/src/emu/diserial.h
+++ b/src/emu/diserial.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __EMU_H__
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index 27ab70a88ce..579fa1c6058 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     drawgfx.c
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h
index b7949b3a9e6..288e727609d 100644
--- a/src/emu/drawgfx.h
+++ b/src/emu/drawgfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     drawgfx.h
diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h
index a0c3fab720c..6c236da48b9 100644
--- a/src/emu/drawgfxm.h
+++ b/src/emu/drawgfxm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     drawgfxm.h
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
index 8164e358610..048baf52b45 100644
--- a/src/emu/drivers/xtal.h
+++ b/src/emu/drivers/xtal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     xtal.h
diff --git a/src/emu/emucore.c b/src/emu/emucore.c
index 6588afd6a65..4930cd44add 100644
--- a/src/emu/emucore.c
+++ b/src/emu/emucore.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     emucore.c
diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index bffac6e0bf6..9cd60b18583 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     emucore.h
diff --git a/src/emu/hashfile.c b/src/emu/hashfile.c
index 7b9bde5c346..81bf805b8d0 100644
--- a/src/emu/hashfile.c
+++ b/src/emu/hashfile.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     hashfile.c
diff --git a/src/emu/hashfile.h b/src/emu/hashfile.h
index 9bc3c402592..c842a507efc 100644
--- a/src/emu/hashfile.h
+++ b/src/emu/hashfile.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     hashfile.h
diff --git a/src/emu/image.c b/src/emu/image.c
index f17f2feb6c0..974755b4db7 100644
--- a/src/emu/image.c
+++ b/src/emu/image.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     image.c
diff --git a/src/emu/image.h b/src/emu/image.h
index a37012841b0..1cc91990934 100644
--- a/src/emu/image.h
+++ b/src/emu/image.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     image.h
diff --git a/src/emu/imagedev/bitbngr.c b/src/emu/imagedev/bitbngr.c
index dbd5f3dae11..0514eb04899 100644
--- a/src/emu/imagedev/bitbngr.c
+++ b/src/emu/imagedev/bitbngr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bitbngr.c
diff --git a/src/emu/imagedev/bitbngr.h b/src/emu/imagedev/bitbngr.h
index 895eacd70dd..c3822b7bea0 100644
--- a/src/emu/imagedev/bitbngr.h
+++ b/src/emu/imagedev/bitbngr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bitbngr.h
diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c
index 5d204aa4613..c392a112b0e 100644
--- a/src/emu/imagedev/cassette.c
+++ b/src/emu/imagedev/cassette.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cassette.c
diff --git a/src/emu/imagedev/cassette.h b/src/emu/imagedev/cassette.h
index ac6842aadf8..eb6cc423207 100644
--- a/src/emu/imagedev/cassette.h
+++ b/src/emu/imagedev/cassette.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cassette.h
diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c
index d153e889b41..f223edb9463 100644
--- a/src/emu/imagedev/chd_cd.c
+++ b/src/emu/imagedev/chd_cd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     Code to interface the image code with CHD-CD core.
diff --git a/src/emu/imagedev/chd_cd.h b/src/emu/imagedev/chd_cd.h
index 49bad527ffb..3b296225fc6 100644
--- a/src/emu/imagedev/chd_cd.h
+++ b/src/emu/imagedev/chd_cd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     chd_cd.h
diff --git a/src/emu/imagedev/diablo.c b/src/emu/imagedev/diablo.c
index 6dbaa941f4a..d7d499ec523 100644
--- a/src/emu/imagedev/diablo.c
+++ b/src/emu/imagedev/diablo.c
@@ -1,9 +1,7 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************
  *   DIABLO drive image to hard disk interface
- *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  **********************************************************/
 
 #include "emu.h"
diff --git a/src/emu/imagedev/diablo.h b/src/emu/imagedev/diablo.h
index caa3fc01d8b..11e0ffe091c 100644
--- a/src/emu/imagedev/diablo.h
+++ b/src/emu/imagedev/diablo.h
@@ -1,9 +1,7 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************
  *   DIABLO drive image to hard disk interface
- *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  **********************************************************/
 
 #ifndef _IMAGEDEV_DIABLO_H_
diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c
index d3fb79073ee..dc4d4e8b803 100644
--- a/src/emu/imagedev/flopdrv.c
+++ b/src/emu/imagedev/flopdrv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     This code handles the floppy drives.
     All FDD actions should be performed using these functions.
diff --git a/src/emu/imagedev/flopdrv.h b/src/emu/imagedev/flopdrv.h
index dc80796f550..967bf2cdb9e 100644
--- a/src/emu/imagedev/flopdrv.h
+++ b/src/emu/imagedev/flopdrv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* flopdrv provides simple emulation of a disc drive */
 /* the 8271, upd765 and wd179x use this */
 
diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c
index ea7e126e177..c8f5de6ddd7 100644
--- a/src/emu/imagedev/floppy.c
+++ b/src/emu/imagedev/floppy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
 
diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h
index b2acc7091dc..b644e19365b 100644
--- a/src/emu/imagedev/floppy.h
+++ b/src/emu/imagedev/floppy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     floppy.h
diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c
index 9f88760f1d7..305c65dc537 100644
--- a/src/emu/imagedev/harddriv.c
+++ b/src/emu/imagedev/harddriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     Code to interface the image code with harddisk core.
diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h
index 84c2a37e1ff..6db65e23f99 100644
--- a/src/emu/imagedev/harddriv.h
+++ b/src/emu/imagedev/harddriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     harddriv.h
diff --git a/src/emu/imagedev/midiin.c b/src/emu/imagedev/midiin.c
index 1a6f7064a5e..bdbb62addaf 100644
--- a/src/emu/imagedev/midiin.c
+++ b/src/emu/imagedev/midiin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiin.c
diff --git a/src/emu/imagedev/midiin.h b/src/emu/imagedev/midiin.h
index 5d3a864e60a..f3474c0b057 100644
--- a/src/emu/imagedev/midiin.h
+++ b/src/emu/imagedev/midiin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiin.h
diff --git a/src/emu/imagedev/midiout.c b/src/emu/imagedev/midiout.c
index 94eaa2643f3..ae9f98cc655 100644
--- a/src/emu/imagedev/midiout.c
+++ b/src/emu/imagedev/midiout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiout.c
diff --git a/src/emu/imagedev/midiout.h b/src/emu/imagedev/midiout.h
index f41e6ca3782..6ec378448f9 100644
--- a/src/emu/imagedev/midiout.h
+++ b/src/emu/imagedev/midiout.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     midiout.h
diff --git a/src/emu/imagedev/printer.c b/src/emu/imagedev/printer.c
index 85f239239e8..951f71ef341 100644
--- a/src/emu/imagedev/printer.c
+++ b/src/emu/imagedev/printer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     printer.c
diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h
index d5cf197dcfa..1d959ffb2f5 100644
--- a/src/emu/imagedev/printer.h
+++ b/src/emu/imagedev/printer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     printer.h
diff --git a/src/emu/imagedev/snapquik.c b/src/emu/imagedev/snapquik.c
index 6853f75973e..dc78f316723 100644
--- a/src/emu/imagedev/snapquik.c
+++ b/src/emu/imagedev/snapquik.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     snapquik.h
diff --git a/src/emu/imagedev/snapquik.h b/src/emu/imagedev/snapquik.h
index fcee39909b1..33b8275a394 100644
--- a/src/emu/imagedev/snapquik.h
+++ b/src/emu/imagedev/snapquik.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     snapquik.h
diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h
index 09751221393..849fea74d61 100644
--- a/src/emu/inpttype.h
+++ b/src/emu/inpttype.h
@@ -20,10 +20,10 @@
 	typelist.append(*global_alloc(input_type_entry(IPT_##_type, IPG_##_group, (_player == 0) ? _player : (_player) - 1, (_player == 0) ? #_type : ("P" #_player "_" #_type), _name, _seq, _decseq, _incseq)));
 
 /* These input port macros expand to a great deal of code and break compilers */
-#if defined(__GNUC__) && __GNUC__ == 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 4)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4 || (__GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 4))))
+#pragma GCC push_options
 #pragma GCC optimize ("O1")
-#endif
-#ifdef _MSC_VER
+#elif defined(_MSC_VER)
 #pragma optimize("", off)
 #endif
 
@@ -829,6 +829,8 @@ void construct_core_types(simple_list<input_type_entry> &typelist)
 	construct_core_types_OSD(typelist);
 	construct_core_types_invalid(typelist);
 }
-#ifdef _MSC_VER
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4 || (__GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 4))))
+#pragma GCC pop_options
+#elif defined(_MSC_VER)
 #pragma optimize("", on)
 #endif
diff --git a/src/emu/machine/40105.c b/src/emu/machine/40105.c
index f3edd88a931..e2f059dfed0 100644
--- a/src/emu/machine/40105.c
+++ b/src/emu/machine/40105.c
@@ -4,9 +4,6 @@
 
     CMOS 40105 FIFO Register emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "40105.h"
diff --git a/src/emu/machine/40105.h b/src/emu/machine/40105.h
index 4498582282c..bc632c8cdca 100644
--- a/src/emu/machine/40105.h
+++ b/src/emu/machine/40105.h
@@ -4,9 +4,6 @@
 
     CMOS 40105 FIFO Register emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/53c7xx.c b/src/emu/machine/53c7xx.c
index 76bc1536bbc..5810a1b7422 100644
--- a/src/emu/machine/53c7xx.c
+++ b/src/emu/machine/53c7xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     53c7xx.c
diff --git a/src/emu/machine/53c7xx.h b/src/emu/machine/53c7xx.h
index 89431c5d5c1..88e38da461e 100644
--- a/src/emu/machine/53c7xx.h
+++ b/src/emu/machine/53c7xx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     53c7xx.h
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c
index c4caed09d83..6dba031ead0 100644
--- a/src/emu/machine/53c810.c
+++ b/src/emu/machine/53c810.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* LSI Logic LSI53C810A PCI to SCSI I/O Processor */
 
 #include "emu.h"
diff --git a/src/emu/machine/53c810.h b/src/emu/machine/53c810.h
index c8ee4f80dce..41c59572379 100644
--- a/src/emu/machine/53c810.h
+++ b/src/emu/machine/53c810.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef LSI53C810_H
 #define LSI53C810_H
 
diff --git a/src/emu/machine/64h156.c b/src/emu/machine/64h156.c
index 5232f51bc33..e0d509cb8c0 100644
--- a/src/emu/machine/64h156.c
+++ b/src/emu/machine/64h156.c
@@ -4,9 +4,6 @@
 
     Commodore 64H156 Gate Array emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/64h156.h b/src/emu/machine/64h156.h
index 8995786b9fe..d21ce389dd0 100644
--- a/src/emu/machine/64h156.h
+++ b/src/emu/machine/64h156.h
@@ -6,9 +6,6 @@
 
     Used in 1541B/1541C/1541-II/1551/1571
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   TEST   1 |*    \_/     | 40  _BYTE
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index 2f38ffc9a1f..c147c558daf 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 6522 VIA interface and emulation
diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h
index 7b484ec2d48..3b6bfbbfcd5 100644
--- a/src/emu/machine/6522via.h
+++ b/src/emu/machine/6522via.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 6522 VIA interface and emulation
diff --git a/src/emu/machine/6525tpi.c b/src/emu/machine/6525tpi.c
index 4589ff23ea7..353dbdeea2d 100644
--- a/src/emu/machine/6525tpi.c
+++ b/src/emu/machine/6525tpi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     mos tri port interface 6525
     mos triple interface adapter 6523
diff --git a/src/emu/machine/6525tpi.h b/src/emu/machine/6525tpi.h
index 40dadbd4ee9..0d9a9efbe4a 100644
--- a/src/emu/machine/6525tpi.h
+++ b/src/emu/machine/6525tpi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * machine/tpi6525.h
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 745a2722ca9..1120b075a0b 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   RIOT 6532 emulation
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index 49dc2bfc000..37b382d479e 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   RIOT 6532 emulation
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 5e546d8a7b1..655e1ae162d 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Motorola 6821 PIA interface and emulation
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index 0f379f18474..ec366883319 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Motorola 6821 PIA interface and emulation
diff --git a/src/emu/machine/68307.c b/src/emu/machine/68307.c
index 1f65b7cccde..9f22b67a7d0 100644
--- a/src/emu/machine/68307.c
+++ b/src/emu/machine/68307.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 */
 
 #include "68307.h"
diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h
index 35cf8fc4362..aa665eeeb0a 100644
--- a/src/emu/machine/68307.h
+++ b/src/emu/machine/68307.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 */
 
 
diff --git a/src/emu/machine/68307bus.c b/src/emu/machine/68307bus.c
index 8b7dc4cc54e..dbc2999c7c0 100644
--- a/src/emu/machine/68307bus.c
+++ b/src/emu/machine/68307bus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 MBUS module */
 /* all ports on this are 8-bit? */
 
diff --git a/src/emu/machine/68307bus.h b/src/emu/machine/68307bus.h
index 6eb206ae9d8..4c25936e5da 100644
--- a/src/emu/machine/68307bus.h
+++ b/src/emu/machine/68307bus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/m68000/m68000.h"
 
 #define m68307BUS_MADR (0x01)
diff --git a/src/emu/machine/68307sim.c b/src/emu/machine/68307sim.c
index 00b468a3674..009afc31326 100644
--- a/src/emu/machine/68307sim.c
+++ b/src/emu/machine/68307sim.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 SIM module */
 
 #include "emu.h"
diff --git a/src/emu/machine/68307sim.h b/src/emu/machine/68307sim.h
index 2d480432f86..8b55630bf40 100644
--- a/src/emu/machine/68307sim.h
+++ b/src/emu/machine/68307sim.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 SIM module */
 
 #include "cpu/m68000/m68000.h"
diff --git a/src/emu/machine/68307tmu.c b/src/emu/machine/68307tmu.c
index 0dc1ed56958..4f675bd8530 100644
--- a/src/emu/machine/68307tmu.c
+++ b/src/emu/machine/68307tmu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68307 TIMER module */
 // 2x timers
 
diff --git a/src/emu/machine/68307tmu.h b/src/emu/machine/68307tmu.h
index e973412c66f..90e547733b1 100644
--- a/src/emu/machine/68307tmu.h
+++ b/src/emu/machine/68307tmu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/emu/machine/68340.c b/src/emu/machine/68340.c
index 0d877c5376b..7e882e0d1e0 100644
--- a/src/emu/machine/68340.c
+++ b/src/emu/machine/68340.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 */
 
 #include "68340.h"
diff --git a/src/emu/machine/68340.h b/src/emu/machine/68340.h
index 093040e121c..aec2bd3c4a3 100644
--- a/src/emu/machine/68340.h
+++ b/src/emu/machine/68340.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 */
 
 
diff --git a/src/emu/machine/68340dma.c b/src/emu/machine/68340dma.c
index 7e3aa5d4dda..77437de781d 100644
--- a/src/emu/machine/68340dma.c
+++ b/src/emu/machine/68340dma.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 DMA module */
 
 #include "emu.h"
diff --git a/src/emu/machine/68340dma.h b/src/emu/machine/68340dma.h
index 10e19ac5ecc..0b3770db6cf 100644
--- a/src/emu/machine/68340dma.h
+++ b/src/emu/machine/68340dma.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/emu/machine/68340ser.c b/src/emu/machine/68340ser.c
index 012feabd9b7..afb751e3b45 100644
--- a/src/emu/machine/68340ser.c
+++ b/src/emu/machine/68340ser.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 SERIAL module */
 
 #include "emu.h"
diff --git a/src/emu/machine/68340ser.h b/src/emu/machine/68340ser.h
index 177f1614a60..2bd851d23ce 100644
--- a/src/emu/machine/68340ser.h
+++ b/src/emu/machine/68340ser.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/emu/machine/68340sim.c b/src/emu/machine/68340sim.c
index 064f434a5c5..1eb34610b78 100644
--- a/src/emu/machine/68340sim.c
+++ b/src/emu/machine/68340sim.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 SIM module */
 
 #include "emu.h"
diff --git a/src/emu/machine/68340sim.h b/src/emu/machine/68340sim.h
index 6b38b48efb2..dbc5ec788b1 100644
--- a/src/emu/machine/68340sim.h
+++ b/src/emu/machine/68340sim.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/emu/machine/68340tmu.c b/src/emu/machine/68340tmu.c
index 378e9edff78..acb0788cd89 100644
--- a/src/emu/machine/68340tmu.c
+++ b/src/emu/machine/68340tmu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 68340 TIMER module */
 
 #include "emu.h"
diff --git a/src/emu/machine/68340tmu.h b/src/emu/machine/68340tmu.h
index 51ecc660354..be8cbaf1eed 100644
--- a/src/emu/machine/68340tmu.h
+++ b/src/emu/machine/68340tmu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/m68000/m68000.h"
 
 
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index 2abb6615997..4e1796ab3a3 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Motorola 6840 (PTM)
diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h
index d5e8851fae4..cdd2252f744 100644
--- a/src/emu/machine/6840ptm.h
+++ b/src/emu/machine/6840ptm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Motorola 6840 (PTM)
diff --git a/src/emu/machine/68561mpcc.c b/src/emu/machine/68561mpcc.c
index 02b0a4468a4..cf9ba0d6851 100644
--- a/src/emu/machine/68561mpcc.c
+++ b/src/emu/machine/68561mpcc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     68561mpcc.c
diff --git a/src/emu/machine/68561mpcc.h b/src/emu/machine/68561mpcc.h
index 4133ad95cb7..19445036008 100644
--- a/src/emu/machine/68561mpcc.h
+++ b/src/emu/machine/68561mpcc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     68561mpcc.h
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c
index 869a7eadb28..02f5bc5e319 100644
--- a/src/emu/machine/74123.c
+++ b/src/emu/machine/74123.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     74123 monoflop emulator - see 74123.h for pin out and truth table
diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h
index 8b9391988a2..1bad167765d 100644
--- a/src/emu/machine/74123.h
+++ b/src/emu/machine/74123.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     74123 monoflop emulator
diff --git a/src/emu/machine/74145.c b/src/emu/machine/74145.c
index 6ff837bbc86..9e0b3ccdfc9 100644
--- a/src/emu/machine/74145.c
+++ b/src/emu/machine/74145.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  TTL74145
diff --git a/src/emu/machine/74145.h b/src/emu/machine/74145.h
index edce3e9b1cf..85733c749d4 100644
--- a/src/emu/machine/74145.h
+++ b/src/emu/machine/74145.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TTL74145
diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c
index 1f0237a9611..26b7a0b858d 100644
--- a/src/emu/machine/74148.c
+++ b/src/emu/machine/74148.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   74148 8-line-to-3-line priority encoder
diff --git a/src/emu/machine/74148.h b/src/emu/machine/74148.h
index 156460133ef..cce75995cfe 100644
--- a/src/emu/machine/74148.h
+++ b/src/emu/machine/74148.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   74148 8-line-to-3-line priority encoder
diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c
index 50955d26d3d..be8dc774674 100644
--- a/src/emu/machine/74153.c
+++ b/src/emu/machine/74153.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   74153 Dual 4-line to 1-line data selectors/multiplexers
diff --git a/src/emu/machine/74153.h b/src/emu/machine/74153.h
index 722a2f94c4c..52d69623bca 100644
--- a/src/emu/machine/74153.h
+++ b/src/emu/machine/74153.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   74153 Dual 4-line to 1-line data selectors/multiplexers
diff --git a/src/emu/machine/74181.c b/src/emu/machine/74181.c
index 1e758677c64..0b0c9b88d37 100644
--- a/src/emu/machine/74181.c
+++ b/src/emu/machine/74181.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     74181
diff --git a/src/emu/machine/74181.h b/src/emu/machine/74181.h
index b7e8a0efd6e..87dc83f3409 100644
--- a/src/emu/machine/74181.h
+++ b/src/emu/machine/74181.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     74181
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index 7c3cfb1c6eb..6aef633e9b6 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   7474 positive-edge-triggered D-type flip-flop with preset, clear and
diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h
index 9788ce9a689..157b526051a 100644
--- a/src/emu/machine/7474.h
+++ b/src/emu/machine/7474.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   7474 positive-edge-triggered D-type flip-flop with preset, clear and
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index eb159c8d2bb..3b9c96f04ad 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     8042kbdc.c
diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h
index a2311e1924d..aea4d64880a 100644
--- a/src/emu/machine/8042kbdc.h
+++ b/src/emu/machine/8042kbdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     8042 Keyboard Controller Emulation
diff --git a/src/emu/machine/8530scc.c b/src/emu/machine/8530scc.c
index c3998000ed5..b1701d6564f 100644
--- a/src/emu/machine/8530scc.c
+++ b/src/emu/machine/8530scc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     8530scc.c
diff --git a/src/emu/machine/8530scc.h b/src/emu/machine/8530scc.h
index b26fd88c6dc..c00d8655598 100644
--- a/src/emu/machine/8530scc.h
+++ b/src/emu/machine/8530scc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     8530scc.h
diff --git a/src/emu/machine/aakart.c b/src/emu/machine/aakart.c
index f858f48f182..b6fbdd4bd21 100644
--- a/src/emu/machine/aakart.c
+++ b/src/emu/machine/aakart.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Acorn Archimedes KART interface
diff --git a/src/emu/machine/aakart.h b/src/emu/machine/aakart.h
index 97b2c1b4727..c307a405fdc 100644
--- a/src/emu/machine/aakart.h
+++ b/src/emu/machine/aakart.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Acorn Archimedes KART interface
diff --git a/src/emu/machine/adc0808.c b/src/emu/machine/adc0808.c
index 4e77123564d..dc173cc178e 100644
--- a/src/emu/machine/adc0808.c
+++ b/src/emu/machine/adc0808.c
@@ -4,9 +4,6 @@
 
     National Semiconductor ADC0808/ADC0809 8-Bit A/D Converter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/adc0808.h b/src/emu/machine/adc0808.h
index cd0247b8c44..a7d1c3eb6c5 100644
--- a/src/emu/machine/adc0808.h
+++ b/src/emu/machine/adc0808.h
@@ -4,9 +4,6 @@
 
     National Semiconductor ADC0808/ADC0809 8-Bit A/D Converter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    IN3   1 |*    \_/     | 28  IN2
diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c
index c9af768f53e..ae87750241e 100644
--- a/src/emu/machine/adc083x.c
+++ b/src/emu/machine/adc083x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC0831 / ADC0832 / ADC0834 / ADC0838
diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h
index 284de42b7c7..c64fa30b2dc 100644
--- a/src/emu/machine/adc083x.h
+++ b/src/emu/machine/adc083x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC0831 / ADC0832 / ADC0834 / ADC0838
diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c
index 0dcd424aa8c..ee03d4798de 100644
--- a/src/emu/machine/adc1038.c
+++ b/src/emu/machine/adc1038.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC1038
diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h
index 8e22fd6face..f5535b8cf12 100644
--- a/src/emu/machine/adc1038.h
+++ b/src/emu/machine/adc1038.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC1038
diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c
index 27e36363700..9c3e21f5511 100644
--- a/src/emu/machine/adc1213x.c
+++ b/src/emu/machine/adc1213x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC12130 / ADC12132 / ADC12138
diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h
index 5a487c076c3..d5af3e2677e 100644
--- a/src/emu/machine/adc1213x.h
+++ b/src/emu/machine/adc1213x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor ADC12130 / ADC12132 / ADC12138
diff --git a/src/emu/machine/aicartc.c b/src/emu/machine/aicartc.c
index 5bd3323dff9..d827132d15c 100644
--- a/src/emu/machine/aicartc.c
+++ b/src/emu/machine/aicartc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     AICA-RTC sub-device
diff --git a/src/emu/machine/aicartc.h b/src/emu/machine/aicartc.h
index 592cf9f4e09..f82878b9751 100644
--- a/src/emu/machine/aicartc.h
+++ b/src/emu/machine/aicartc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/machine/akiko.c b/src/emu/machine/akiko.c
index ef5c4836953..361be7f6464 100644
--- a/src/emu/machine/akiko.c
+++ b/src/emu/machine/akiko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Akiko
diff --git a/src/emu/machine/akiko.h b/src/emu/machine/akiko.h
index 1fa5e46f6ef..0e9774e95e7 100644
--- a/src/emu/machine/akiko.h
+++ b/src/emu/machine/akiko.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Akiko
diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c
index 58e1cf59edf..5cefee3c49b 100644
--- a/src/emu/machine/am53cf96.c
+++ b/src/emu/machine/am53cf96.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * am53cf96.c
  *
diff --git a/src/emu/machine/am53cf96.h b/src/emu/machine/am53cf96.h
index d414811ece4..a88ddc4dac2 100644
--- a/src/emu/machine/am53cf96.h
+++ b/src/emu/machine/am53cf96.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * am53cf96.h
  *
diff --git a/src/emu/machine/amigafdc.h b/src/emu/machine/amigafdc.h
index 4a5b380d1a7..164486b7d49 100644
--- a/src/emu/machine/amigafdc.h
+++ b/src/emu/machine/amigafdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef AMIGAFDC_H
 #define AMIGAFDC_H
 
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index ed0ec69ed09..40d0e5f4816 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     ATMEL AT28C16
 
diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h
index d232f30bb95..f0465b5bc4f 100644
--- a/src/emu/machine/at28c16.h
+++ b/src/emu/machine/at28c16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ATMEL AT28C16
diff --git a/src/emu/machine/at29040a.c b/src/emu/machine/at29040a.c
index d426d4ea86c..f7383982d33 100644
--- a/src/emu/machine/at29040a.c
+++ b/src/emu/machine/at29040a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Atmel at29c040a flash EEPROM
 
diff --git a/src/emu/machine/at29040a.h b/src/emu/machine/at29040a.h
index 9c431e328fc..587a320d792 100644
--- a/src/emu/machine/at29040a.h
+++ b/src/emu/machine/at29040a.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     ATMEL 29040a
 
diff --git a/src/emu/machine/at45dbxx.c b/src/emu/machine/at45dbxx.c
index f482b147773..20611aaa10f 100644
--- a/src/emu/machine/at45dbxx.c
+++ b/src/emu/machine/at45dbxx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Atmel Serial DataFlash
diff --git a/src/emu/machine/at45dbxx.h b/src/emu/machine/at45dbxx.h
index 10ec5a3f36a..11d11346560 100644
--- a/src/emu/machine/at45dbxx.h
+++ b/src/emu/machine/at45dbxx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Atmel Serial DataFlash
diff --git a/src/emu/machine/at_keybc.c b/src/emu/machine/at_keybc.c
index aecbc3f8c36..a2b0bd05062 100644
--- a/src/emu/machine/at_keybc.c
+++ b/src/emu/machine/at_keybc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM PC AT compatibles 8042 keyboard controller
diff --git a/src/emu/machine/at_keybc.h b/src/emu/machine/at_keybc.h
index 65ef24e2d1b..142aea0522c 100644
--- a/src/emu/machine/at_keybc.h
+++ b/src/emu/machine/at_keybc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM PC AT compatibles 8042 keyboard controller
diff --git a/src/emu/machine/autoconfig.c b/src/emu/machine/autoconfig.c
index 15ddfcb64d9..6c1ee4ca412 100644
--- a/src/emu/machine/autoconfig.c
+++ b/src/emu/machine/autoconfig.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Autoconfig
diff --git a/src/emu/machine/autoconfig.h b/src/emu/machine/autoconfig.h
index f86e7577c7a..2d6422b4861 100644
--- a/src/emu/machine/autoconfig.h
+++ b/src/emu/machine/autoconfig.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Autoconfig
diff --git a/src/emu/machine/ay31015.c b/src/emu/machine/ay31015.c
index 7fa96506f64..ea378ea1c1a 100644
--- a/src/emu/machine/ay31015.c
+++ b/src/emu/machine/ay31015.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     ay31015.c by Robbbert, May 2008. Bugs fixed by Judge.
diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h
index 2f46e925fda..63a43127897 100644
--- a/src/emu/machine/ay31015.h
+++ b/src/emu/machine/ay31015.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ay31015.h
 
     Written for MESS by Robbbert on May 29th, 2008.
diff --git a/src/emu/machine/bcreader.c b/src/emu/machine/bcreader.c
index d8560ea600d..d1104c7453e 100644
--- a/src/emu/machine/bcreader.c
+++ b/src/emu/machine/bcreader.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     bcreader.c
diff --git a/src/emu/machine/bcreader.h b/src/emu/machine/bcreader.h
index 33ddfd5adbe..5909d80ec80 100644
--- a/src/emu/machine/bcreader.h
+++ b/src/emu/machine/bcreader.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     bcreader.h
diff --git a/src/emu/machine/buffer.c b/src/emu/machine/buffer.c
index 12e07459fbf..b4d0a09ae81 100644
--- a/src/emu/machine/buffer.c
+++ b/src/emu/machine/buffer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "buffer.h"
 
diff --git a/src/emu/machine/buffer.h b/src/emu/machine/buffer.h
index e69d962e6c0..9e56377f15c 100644
--- a/src/emu/machine/buffer.h
+++ b/src/emu/machine/buffer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __BUFFER_H__
 #define __BUFFER_H__
 
diff --git a/src/emu/machine/cdp1852.h b/src/emu/machine/cdp1852.h
index d0c9a65fede..232e148e474 100644
--- a/src/emu/machine/cdp1852.h
+++ b/src/emu/machine/cdp1852.h
@@ -4,9 +4,6 @@
 
     RCA CDP1852 Byte-Wide Input/Output Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
               CSI/_CSI   1 |*    \_/     | 24  Vdd
diff --git a/src/emu/machine/cdp1871.c b/src/emu/machine/cdp1871.c
index 7d5301d3c9b..e685f8c43ad 100644
--- a/src/emu/machine/cdp1871.c
+++ b/src/emu/machine/cdp1871.c
@@ -4,9 +4,6 @@
 
     RCA CDP1871 Keyboard Encoder emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cdp1871.h"
diff --git a/src/emu/machine/cdp1871.h b/src/emu/machine/cdp1871.h
index 9fc47aed2ba..651f9c4343d 100644
--- a/src/emu/machine/cdp1871.h
+++ b/src/emu/machine/cdp1871.h
@@ -4,9 +4,6 @@
 
     RCA CDP1871 Keyboard Encoder emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     D1   1 |*    \_/     | 40  Vdd
diff --git a/src/emu/machine/clock.c b/src/emu/machine/clock.c
index b5203e62f6b..0abb813fb72 100644
--- a/src/emu/machine/clock.c
+++ b/src/emu/machine/clock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "clock.h"
 
 const device_type CLOCK = &device_creator<clock_device>;
diff --git a/src/emu/machine/clock.h b/src/emu/machine/clock.h
index 2fd83b46c04..7a9063ed33e 100644
--- a/src/emu/machine/clock.h
+++ b/src/emu/machine/clock.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __CLOCK_H__
 #define __CLOCK_H__
 
diff --git a/src/emu/machine/com8116.c b/src/emu/machine/com8116.c
index c60569ceb40..46a0ce83986 100644
--- a/src/emu/machine/com8116.c
+++ b/src/emu/machine/com8116.c
@@ -4,9 +4,6 @@
 
     COM8116 Dual Baud Rate Generator (Programmable Divider) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "com8116.h"
diff --git a/src/emu/machine/com8116.h b/src/emu/machine/com8116.h
index e34122304cd..a423f3782d7 100644
--- a/src/emu/machine/com8116.h
+++ b/src/emu/machine/com8116.h
@@ -4,9 +4,6 @@
 
     COM8116 Dual Baud Rate Generator (Programmable Divider) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
              XTAL/EXT1   1 |*    \_/     | 18  XTAL/EXT2
diff --git a/src/emu/machine/corvushd.c b/src/emu/machine/corvushd.c
index 1d540d43b8f..8d10a31b3e1 100644
--- a/src/emu/machine/corvushd.c
+++ b/src/emu/machine/corvushd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //
 //  corvus_hd
 //
diff --git a/src/emu/machine/corvushd.h b/src/emu/machine/corvushd.h
index 56bf0cf45b8..012f46bf8d4 100644
--- a/src/emu/machine/corvushd.h
+++ b/src/emu/machine/corvushd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/corvushd.h
diff --git a/src/emu/machine/cr511b.c b/src/emu/machine/cr511b.c
index 83d393825db..ab01fa4163c 100644
--- a/src/emu/machine/cr511b.c
+++ b/src/emu/machine/cr511b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     CR-511-B CD-ROM drive
diff --git a/src/emu/machine/cr511b.h b/src/emu/machine/cr511b.h
index 08ee9056901..fd399f267de 100644
--- a/src/emu/machine/cr511b.h
+++ b/src/emu/machine/cr511b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     CR-511-B CD-ROM drive
diff --git a/src/emu/machine/cr589.c b/src/emu/machine/cr589.c
index 59dc475137c..2b11aa53a5f 100644
--- a/src/emu/machine/cr589.c
+++ b/src/emu/machine/cr589.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cr589.h"
 
 
diff --git a/src/emu/machine/cr589.h b/src/emu/machine/cr589.h
index 874e3886ee0..c9dd6817d6f 100644
--- a/src/emu/machine/cr589.h
+++ b/src/emu/machine/cr589.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cr589.h
diff --git a/src/emu/machine/cs4031.c b/src/emu/machine/cs4031.c
index 90dfd738918..6ea8739cea2 100644
--- a/src/emu/machine/cs4031.c
+++ b/src/emu/machine/cs4031.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Chips & Technologies CS4031 chipset
diff --git a/src/emu/machine/cs4031.h b/src/emu/machine/cs4031.h
index ce60e42321d..847c598b89d 100644
--- a/src/emu/machine/cs4031.h
+++ b/src/emu/machine/cs4031.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Chips & Technologies CS4031 chipset
diff --git a/src/emu/machine/cs8221.c b/src/emu/machine/cs8221.c
index f62c1280ed3..b23e989dea4 100644
--- a/src/emu/machine/cs8221.c
+++ b/src/emu/machine/cs8221.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Chips & Technologies CS8221 chipset
diff --git a/src/emu/machine/cs8221.h b/src/emu/machine/cs8221.h
index 33934b0e3a8..b64de3c3ca7 100644
--- a/src/emu/machine/cs8221.h
+++ b/src/emu/machine/cs8221.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Chips & Technologies CS8221 chipset
diff --git a/src/emu/machine/diablo_hd.c b/src/emu/machine/diablo_hd.c
index 86f14e820d2..9ee566350ff 100644
--- a/src/emu/machine/diablo_hd.c
+++ b/src/emu/machine/diablo_hd.c
@@ -1,9 +1,7 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************
  *   DIABLO31 and DIABLO44 hard drive support
- *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  **********************************************************/
 #include "diablo_hd.h"
 
diff --git a/src/emu/machine/diablo_hd.h b/src/emu/machine/diablo_hd.h
index f6ef1ab9ce2..835cc2c281d 100644
--- a/src/emu/machine/diablo_hd.h
+++ b/src/emu/machine/diablo_hd.h
@@ -1,9 +1,7 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************
  *   DIABLO31 and DIABLO44 hard drive support
- *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  **********************************************************/
 
 #if !defined(_DIABLO_HD_DEVICE_)
diff --git a/src/emu/machine/dmac.c b/src/emu/machine/dmac.c
index 96f7782def4..f1381ce5ed5 100644
--- a/src/emu/machine/dmac.c
+++ b/src/emu/machine/dmac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     DMAC
diff --git a/src/emu/machine/dmac.h b/src/emu/machine/dmac.h
index e87930ad7df..54f9165a2b0 100644
--- a/src/emu/machine/dmac.h
+++ b/src/emu/machine/dmac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     DMAC
diff --git a/src/emu/machine/dp8390.c b/src/emu/machine/dp8390.c
index 27b4afb98b4..1f148c7c8b5 100644
--- a/src/emu/machine/dp8390.c
+++ b/src/emu/machine/dp8390.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "dp8390.h"
 
diff --git a/src/emu/machine/dp8390.h b/src/emu/machine/dp8390.h
index c4699ff7aab..4018cfe1d33 100644
--- a/src/emu/machine/dp8390.h
+++ b/src/emu/machine/dp8390.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _DP8390_H_
 #define _DP8390_H_
 
diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c
index 91337023094..c254690cae0 100644
--- a/src/emu/machine/ds1302.c
+++ b/src/emu/machine/ds1302.c
@@ -4,9 +4,6 @@
 
     Dallas DS1302 Trickle-Charge Timekeeping Chip emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/ds1302.h b/src/emu/machine/ds1302.h
index b9c730ae747..15a6fad80c8 100644
--- a/src/emu/machine/ds1302.h
+++ b/src/emu/machine/ds1302.h
@@ -4,9 +4,6 @@
 
     Dallas DS1302 Trickle-Charge Timekeeping Chip emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   Vcc2   1 |*    \_/     | 8   Vcc1
diff --git a/src/emu/machine/ds1315.c b/src/emu/machine/ds1315.c
index a494829ce6b..cf90cebda99 100644
--- a/src/emu/machine/ds1315.c
+++ b/src/emu/machine/ds1315.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************************
 
     ds1315.c
diff --git a/src/emu/machine/ds1315.h b/src/emu/machine/ds1315.h
index 998d10caa7e..9f8cebc604b 100644
--- a/src/emu/machine/ds1315.h
+++ b/src/emu/machine/ds1315.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ds1315.h
diff --git a/src/emu/machine/ds2401.c b/src/emu/machine/ds2401.c
index 0444b264171..745bc83e232 100644
--- a/src/emu/machine/ds2401.c
+++ b/src/emu/machine/ds2401.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * DS2401
  *
diff --git a/src/emu/machine/ds2401.h b/src/emu/machine/ds2401.h
index a05d7215a4c..83939d57af4 100644
--- a/src/emu/machine/ds2401.h
+++ b/src/emu/machine/ds2401.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * DS2401
  *
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index a1e7147b7cb..470ab072872 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     DALLAS DS2404
diff --git a/src/emu/machine/ds2404.h b/src/emu/machine/ds2404.h
index 0e1b8999aea..b589e80d2d0 100644
--- a/src/emu/machine/ds2404.h
+++ b/src/emu/machine/ds2404.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     DALLAS DS2404
diff --git a/src/emu/machine/ds75160a.c b/src/emu/machine/ds75160a.c
index 4a11427322a..1560fa4f0b2 100644
--- a/src/emu/machine/ds75160a.c
+++ b/src/emu/machine/ds75160a.c
@@ -4,9 +4,6 @@
 
     National Semiconductor DS75160A IEEE-488 GPIB Transceiver emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ds75160a.h"
diff --git a/src/emu/machine/ds75160a.h b/src/emu/machine/ds75160a.h
index 89672dd8c81..d3ca0b38de6 100644
--- a/src/emu/machine/ds75160a.h
+++ b/src/emu/machine/ds75160a.h
@@ -4,9 +4,6 @@
 
     National Semiconductor DS75160A IEEE-488 GPIB Transceiver emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     TE   1 |*    \_/     | 20  Vcc
diff --git a/src/emu/machine/ds75161a.c b/src/emu/machine/ds75161a.c
index 70d32d9ead6..5ec21a0e003 100644
--- a/src/emu/machine/ds75161a.c
+++ b/src/emu/machine/ds75161a.c
@@ -4,9 +4,6 @@
 
     National Semiconductor DS75161A IEEE-488 GPIB Transceiver emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "ds75161a.h"
diff --git a/src/emu/machine/ds75161a.h b/src/emu/machine/ds75161a.h
index 598ef23c26b..83f129857e6 100644
--- a/src/emu/machine/ds75161a.h
+++ b/src/emu/machine/ds75161a.h
@@ -4,9 +4,6 @@
 
     National Semiconductor DS75161A IEEE-488 GPIB Transceiver emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     TE   1 |*    \_/     | 20  Vcc
diff --git a/src/emu/machine/e0516.c b/src/emu/machine/e0516.c
index e472e39edad..0fc743ba95c 100644
--- a/src/emu/machine/e0516.c
+++ b/src/emu/machine/e0516.c
@@ -4,9 +4,6 @@
 
     Microelectronic-Marin E050-16 Real Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/e0516.h b/src/emu/machine/e0516.h
index f0430b686b1..8adcdc75948 100644
--- a/src/emu/machine/e0516.h
+++ b/src/emu/machine/e0516.h
@@ -4,9 +4,6 @@
 
     Microelectronic-Marin E050-16 Real Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   Vdd1   1 |*    \_/     | 16  Vdd2
diff --git a/src/emu/machine/e05a03.c b/src/emu/machine/e05a03.c
index 7f4c361a7c3..af7efe7be0e 100644
--- a/src/emu/machine/e05a03.c
+++ b/src/emu/machine/e05a03.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     E05A03 Gate Array (used in the Epson LX-800)
diff --git a/src/emu/machine/e05a03.h b/src/emu/machine/e05a03.h
index e1bab778535..854dc191afc 100644
--- a/src/emu/machine/e05a03.h
+++ b/src/emu/machine/e05a03.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     E05A03 Gate Array (used in the Epson LX-800)
diff --git a/src/emu/machine/e05a30.c b/src/emu/machine/e05a30.c
index 804b46ccbe3..c2ce03596a5 100644
--- a/src/emu/machine/e05a30.c
+++ b/src/emu/machine/e05a30.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * E05A30 Gate Array (used in the Epson ActionPrinter 2000)
  *
diff --git a/src/emu/machine/e05a30.h b/src/emu/machine/e05a30.h
index cc1ab8eb9da..d8537cea43e 100644
--- a/src/emu/machine/e05a30.h
+++ b/src/emu/machine/e05a30.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * E05A30 Gate Array (used in the Epson ActionPrinter 2000)
  *
diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c
index edb82880ae1..13807c24f4f 100644
--- a/src/emu/machine/f3853.c
+++ b/src/emu/machine/f3853.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Fairchild F3853 SRAM interface with integrated interrupt
diff --git a/src/emu/machine/f3853.h b/src/emu/machine/f3853.h
index 8bf73880b6c..1b8a3cb1733 100644
--- a/src/emu/machine/f3853.h
+++ b/src/emu/machine/f3853.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fairchild F3853 SRAM interface with integrated interrupt
diff --git a/src/emu/machine/fdc37c665gt.c b/src/emu/machine/fdc37c665gt.c
index 3c69626ca48..44ede10509a 100644
--- a/src/emu/machine/fdc37c665gt.c
+++ b/src/emu/machine/fdc37c665gt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "fdc37c665gt.h"
 
 fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
diff --git a/src/emu/machine/fdc37c665gt.h b/src/emu/machine/fdc37c665gt.h
index 4002c7ff684..3ca95b47549 100644
--- a/src/emu/machine/fdc37c665gt.h
+++ b/src/emu/machine/fdc37c665gt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 * fdc37c665gt.h
 *
diff --git a/src/emu/machine/fdc_pll.c b/src/emu/machine/fdc_pll.c
index e0cd8338ef2..f0e45fc91c5 100644
--- a/src/emu/machine/fdc_pll.c
+++ b/src/emu/machine/fdc_pll.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "fdc_pll.h"
 
 std::string fdc_pll_t::tts(attotime t)
diff --git a/src/emu/machine/fdc_pll.h b/src/emu/machine/fdc_pll.h
index 7bb04e0be33..03459f3dc9c 100644
--- a/src/emu/machine/fdc_pll.h
+++ b/src/emu/machine/fdc_pll.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __FDC_PLL_H__
 #define __FDC_PLL_H__
 
diff --git a/src/emu/machine/gayle.c b/src/emu/machine/gayle.c
index e229b63f59b..dfe1a10b896 100644
--- a/src/emu/machine/gayle.c
+++ b/src/emu/machine/gayle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     GAYLE
diff --git a/src/emu/machine/gayle.h b/src/emu/machine/gayle.h
index df9a0e043d4..f7e2aa0dbee 100644
--- a/src/emu/machine/gayle.h
+++ b/src/emu/machine/gayle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     GAYLE
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 4065503ff04..20ecd84656d 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     generic.c
diff --git a/src/emu/machine/generic.h b/src/emu/machine/generic.h
index 53610cf4c08..9740d257e89 100644
--- a/src/emu/machine/generic.h
+++ b/src/emu/machine/generic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     generic.h
diff --git a/src/emu/machine/hd63450.c b/src/emu/machine/hd63450.c
index 18fbd7f462a..2123c3824f3 100644
--- a/src/emu/machine/hd63450.c
+++ b/src/emu/machine/hd63450.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Hitachi HD63450 DMA Controller
 
diff --git a/src/emu/machine/hd63450.h b/src/emu/machine/hd63450.h
index dd4c96d7cda..5045a226eb5 100644
--- a/src/emu/machine/hd63450.h
+++ b/src/emu/machine/hd63450.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Hitachi HD63450 DMA Controller
 */
diff --git a/src/emu/machine/i6300esb.c b/src/emu/machine/i6300esb.c
index 7619cb3eda0..be1429e95d4 100644
--- a/src/emu/machine/i6300esb.c
+++ b/src/emu/machine/i6300esb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i6300esb.h"
 
 const device_type I6300ESB_WATCHDOG = &device_creator<i6300esb_watchdog_device>;
diff --git a/src/emu/machine/i6300esb.h b/src/emu/machine/i6300esb.h
index 78c807fbce3..3585fd69d91 100644
--- a/src/emu/machine/i6300esb.h
+++ b/src/emu/machine/i6300esb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Intel i6300ESB southbridge
 
 #ifndef I6300ESB_H
diff --git a/src/emu/machine/i80130.c b/src/emu/machine/i80130.c
index ae1ac21fbac..fb419a06090 100644
--- a/src/emu/machine/i80130.c
+++ b/src/emu/machine/i80130.c
@@ -4,9 +4,6 @@
 
     Intel 80130 iRMX Operating System Processor emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "i80130.h"
diff --git a/src/emu/machine/i80130.h b/src/emu/machine/i80130.h
index 45140331581..b7aaece8fe7 100644
--- a/src/emu/machine/i80130.h
+++ b/src/emu/machine/i80130.h
@@ -4,9 +4,6 @@
 
     Intel 80130 iRMX Operating System Processor emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/i8155.c b/src/emu/machine/i8155.c
index 6590d5b33df..a2914b9081f 100644
--- a/src/emu/machine/i8155.c
+++ b/src/emu/machine/i8155.c
@@ -4,9 +4,6 @@
 
     Intel 8155/8156 - 2048-Bit Static MOS RAM with I/O Ports and Timer emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/i8155.h b/src/emu/machine/i8155.h
index d6d5f3acb6d..c85c0a62846 100644
--- a/src/emu/machine/i8155.h
+++ b/src/emu/machine/i8155.h
@@ -5,9 +5,6 @@
     Intel 8155/8156 - 2048-Bit Static MOS RAM with I/O Ports and Timer emulation
     8156 is the same as 8155, except that chip enable is active high instead of low
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    PC3   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/machine/i8212.c b/src/emu/machine/i8212.c
index f339603bcb4..14b06841278 100644
--- a/src/emu/machine/i8212.c
+++ b/src/emu/machine/i8212.c
@@ -4,9 +4,6 @@
 
     Intel 8212 8-Bit Input/Output Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/i8212.h b/src/emu/machine/i8212.h
index 4530ad2802a..78e87470acd 100644
--- a/src/emu/machine/i8212.h
+++ b/src/emu/machine/i8212.h
@@ -4,9 +4,6 @@
 
     Intel 8212 8-Bit Input/Output Port emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   _DS1   1 |*    \_/     | 24  Vcc
diff --git a/src/emu/machine/i8214.c b/src/emu/machine/i8214.c
index 78b60178690..9a7cf9ecd1c 100644
--- a/src/emu/machine/i8214.c
+++ b/src/emu/machine/i8214.c
@@ -4,9 +4,6 @@
 
     Intel 8214 Priority Interrupt Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/i8214.h b/src/emu/machine/i8214.h
index c229ec84f0d..62e7f98fd51 100644
--- a/src/emu/machine/i8214.h
+++ b/src/emu/machine/i8214.h
@@ -4,9 +4,6 @@
 
     Intel 8214 Priority Interrupt Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    _B0   1 |*    \_/     | 24  Vcc
diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c
index 622605453ca..e318f200288 100644
--- a/src/emu/machine/i8251.c
+++ b/src/emu/machine/i8251.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     i8251.c
diff --git a/src/emu/machine/i8251.h b/src/emu/machine/i8251.h
index 1806894b5c3..2f30a2ddd53 100644
--- a/src/emu/machine/i8251.h
+++ b/src/emu/machine/i8251.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     i8251.h
diff --git a/src/emu/machine/i82541.c b/src/emu/machine/i82541.c
index e6d415c6dd7..5ef4471745a 100644
--- a/src/emu/machine/i82541.c
+++ b/src/emu/machine/i82541.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i82541.h"
 
 const device_type I82541 = &device_creator<i82541_device>;
diff --git a/src/emu/machine/i82541.h b/src/emu/machine/i82541.h
index eaf57e54f60..f432a0576c1 100644
--- a/src/emu/machine/i82541.h
+++ b/src/emu/machine/i82541.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Intel I82541 ethernet controller
 
 #ifndef I82541_H
diff --git a/src/emu/machine/i8255.c b/src/emu/machine/i8255.c
index 0bea38d4969..acaef0f372a 100644
--- a/src/emu/machine/i8255.c
+++ b/src/emu/machine/i8255.c
@@ -4,9 +4,6 @@
 
     Intel 8255(A) Programmable Peripheral Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "i8255.h"
diff --git a/src/emu/machine/i8255.h b/src/emu/machine/i8255.h
index ed4b2f39ad2..c232b2105e0 100644
--- a/src/emu/machine/i8255.h
+++ b/src/emu/machine/i8255.h
@@ -4,9 +4,6 @@
 
     Intel 8255(A) Programmable Peripheral Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    PA3   1 |*    \_/     | 40  PA4
diff --git a/src/emu/machine/i8271.c b/src/emu/machine/i8271.c
index 24282df971e..44b799a3cb9 100644
--- a/src/emu/machine/i8271.c
+++ b/src/emu/machine/i8271.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Intel 8271 Floppy Disc Controller */
 /* used in BBC Micro B,Acorn Atom */
 /* Jun 2000. Kev Thacker */
diff --git a/src/emu/machine/i8271.h b/src/emu/machine/i8271.h
index e69baee004f..0a616da4c61 100644
--- a/src/emu/machine/i8271.h
+++ b/src/emu/machine/i8271.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * machine/i8271.h
diff --git a/src/emu/machine/i8279.c b/src/emu/machine/i8279.c
index 43f02cc2102..3febae4a8b9 100644
--- a/src/emu/machine/i8279.c
+++ b/src/emu/machine/i8279.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     i8279
diff --git a/src/emu/machine/i8279.h b/src/emu/machine/i8279.h
index 0f0cbccbd8a..5565791dace 100644
--- a/src/emu/machine/i8279.h
+++ b/src/emu/machine/i8279.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8279 Programmable Keyboard/Display Interface emulation
diff --git a/src/emu/machine/i82875p.c b/src/emu/machine/i82875p.c
index 10e741fbdb6..99796fca706 100644
--- a/src/emu/machine/i82875p.c
+++ b/src/emu/machine/i82875p.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "i82875p.h"
 
 const device_type I82875P_HOST     = &device_creator<i82875p_host_device>;
diff --git a/src/emu/machine/i82875p.h b/src/emu/machine/i82875p.h
index 26aed95967b..c5490f39a97 100644
--- a/src/emu/machine/i82875p.h
+++ b/src/emu/machine/i82875p.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Intel i82875p northbridge
 
 #ifndef I82875P_H
diff --git a/src/emu/machine/i8355.c b/src/emu/machine/i8355.c
index fbf792314c0..d417bd1e3c3 100644
--- a/src/emu/machine/i8355.c
+++ b/src/emu/machine/i8355.c
@@ -4,9 +4,6 @@
 
     Intel 8355 - 16,384-Bit ROM with I/O emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/i8355.h b/src/emu/machine/i8355.h
index 731081ed32e..33d68d0fa57 100644
--- a/src/emu/machine/i8355.h
+++ b/src/emu/machine/i8355.h
@@ -4,9 +4,6 @@
 
     Intel 8355 - 16,384-Bit ROM with I/O emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   _CE1   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c
index ed69c811fa6..f713a048517 100644
--- a/src/emu/machine/im6402.c
+++ b/src/emu/machine/im6402.c
@@ -4,9 +4,6 @@
 
     Intersil IM6402 Universal Asynchronous Receiver/Transmitter emulation
 
-    Copyright the MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "im6402.h"
diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c
index 7959947ebc4..2241f502752 100644
--- a/src/emu/machine/ins8154.c
+++ b/src/emu/machine/ins8154.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor INS8154
diff --git a/src/emu/machine/ins8154.h b/src/emu/machine/ins8154.h
index 3b272b70a9e..838da2b7c79 100644
--- a/src/emu/machine/ins8154.h
+++ b/src/emu/machine/ins8154.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     National Semiconductor INS8154
diff --git a/src/emu/machine/ins8250.c b/src/emu/machine/ins8250.c
index 91e3a7460ce..c79e2c30902 100644
--- a/src/emu/machine/ins8250.c
+++ b/src/emu/machine/ins8250.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     National Semiconductor 8250 UART interface and emulation
diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h
index 132d55e258e..bf991dee2dd 100644
--- a/src/emu/machine/ins8250.h
+++ b/src/emu/machine/ins8250.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     8250 UART interface and emulation
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index 64cc63ef7de..c16be51ff0d 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Flash ROM emulation
 
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 41719cdbfc8..e2bdeeabbfd 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Intel Flash ROM emulation
 */
diff --git a/src/emu/machine/jvsdev.c b/src/emu/machine/jvsdev.c
index 25147f9f43a..a48f67a8c56 100644
--- a/src/emu/machine/jvsdev.c
+++ b/src/emu/machine/jvsdev.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "jvsdev.h"
 #include "jvshost.h"
 
diff --git a/src/emu/machine/jvsdev.h b/src/emu/machine/jvsdev.h
index a0c6711652c..a8c9b5da0e4 100644
--- a/src/emu/machine/jvsdev.h
+++ b/src/emu/machine/jvsdev.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __JVSDEV_H__
 #define __JVSDEV_H__
 
diff --git a/src/emu/machine/jvshost.c b/src/emu/machine/jvshost.c
index 7be67f5dc47..433b863a92b 100644
--- a/src/emu/machine/jvshost.c
+++ b/src/emu/machine/jvshost.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "jvshost.h"
 #include "jvsdev.h"
 
diff --git a/src/emu/machine/jvshost.h b/src/emu/machine/jvshost.h
index 249048ec512..2d776aeec62 100644
--- a/src/emu/machine/jvshost.h
+++ b/src/emu/machine/jvshost.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __JVSHOST_H__
 #define __JVSHOST_H__
 
diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c
index 6092ac79a8a..f30e32ef09b 100644
--- a/src/emu/machine/k033906.c
+++ b/src/emu/machine/k033906.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami IC 033906 (PCI bridge)
diff --git a/src/emu/machine/k033906.h b/src/emu/machine/k033906.h
index e50fb2cc2b4..e265983a074 100644
--- a/src/emu/machine/k033906.h
+++ b/src/emu/machine/k033906.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami 033906
diff --git a/src/emu/machine/k053252.h b/src/emu/machine/k053252.h
index acde8f2b770..adb141a27c9 100644
--- a/src/emu/machine/k053252.h
+++ b/src/emu/machine/k053252.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**  Konami 053252  **/
 /* CRT and interrupt control unit */
 #pragma once
diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c
index fc50087c550..85eb9956340 100644
--- a/src/emu/machine/k056230.c
+++ b/src/emu/machine/k056230.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami IC 056230 (LANC)
diff --git a/src/emu/machine/k056230.h b/src/emu/machine/k056230.h
index 88579b659df..310789fba45 100644
--- a/src/emu/machine/k056230.h
+++ b/src/emu/machine/k056230.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami 056230
diff --git a/src/emu/machine/kb3600.c b/src/emu/machine/kb3600.c
index 9735d7402b6..0cc19c8d1f5 100644
--- a/src/emu/machine/kb3600.c
+++ b/src/emu/machine/kb3600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     General Instruments AY-5-3600 Keyboard Encoder emulation
diff --git a/src/emu/machine/kb3600.h b/src/emu/machine/kb3600.h
index 5775508d3cc..e63254da43d 100644
--- a/src/emu/machine/kb3600.h
+++ b/src/emu/machine/kb3600.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     General Instruments AY-5-3600 Keyboard Encoder emulation
diff --git a/src/emu/machine/keyboard.c b/src/emu/machine/keyboard.c
index a5185a8e73a..6adcde06d54 100644
--- a/src/emu/machine/keyboard.c
+++ b/src/emu/machine/keyboard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Generic ASCII Keyboard
 
diff --git a/src/emu/machine/keyboard.h b/src/emu/machine/keyboard.h
index 73eaf160f2a..be38844d3ea 100644
--- a/src/emu/machine/keyboard.h
+++ b/src/emu/machine/keyboard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __KEYBOARD_H__
 #define __KEYBOARD_H__
 
diff --git a/src/emu/machine/kr2376.c b/src/emu/machine/kr2376.c
index 20cc6b8c491..2c2c97a9201 100644
--- a/src/emu/machine/kr2376.c
+++ b/src/emu/machine/kr2376.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     SMC KR2376 Keyboard Encoder emulation
diff --git a/src/emu/machine/kr2376.h b/src/emu/machine/kr2376.h
index b922056b807..96f6ced3d7e 100644
--- a/src/emu/machine/kr2376.h
+++ b/src/emu/machine/kr2376.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     SMC KR2376 Keyboard Encoder emulation
diff --git a/src/emu/machine/latch.c b/src/emu/machine/latch.c
index 4cb5ecd06b3..72dc46874be 100644
--- a/src/emu/machine/latch.c
+++ b/src/emu/machine/latch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "latch.h"
 
diff --git a/src/emu/machine/latch.h b/src/emu/machine/latch.h
index f4ceeb93da4..5db3e9d1027 100644
--- a/src/emu/machine/latch.h
+++ b/src/emu/machine/latch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __LATCH_H__
 #define __LATCH_H__
 
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index 43ceb1f5f5a..1e9c2ff33af 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     8 bit latch interface and emulation
diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h
index 9cf8aa7449e..749ada1bb98 100644
--- a/src/emu/machine/latch8.h
+++ b/src/emu/machine/latch8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     8 bit latch interface and emulation
diff --git a/src/emu/machine/lc89510.c b/src/emu/machine/lc89510.c
index 3de42fd6c55..d5addb1ecc9 100644
--- a/src/emu/machine/lc89510.c
+++ b/src/emu/machine/lc89510.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* LC89510 CD Controller
  based off old NeoCD emulator code, adapted to SegaCD, needs reworking to work with NeoCD again
 
diff --git a/src/emu/machine/lc89510.h b/src/emu/machine/lc89510.h
index 7d735a6c818..0053dcde2a7 100644
--- a/src/emu/machine/lc89510.h
+++ b/src/emu/machine/lc89510.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/emu/machine/legscsi.c b/src/emu/machine/legscsi.c
index 65b89154a9e..c7da60d74e2 100644
--- a/src/emu/machine/legscsi.c
+++ b/src/emu/machine/legscsi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "legscsi.h"
 
 legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
diff --git a/src/emu/machine/legscsi.h b/src/emu/machine/legscsi.h
index f952e8c47f1..2ed9223790f 100644
--- a/src/emu/machine/legscsi.h
+++ b/src/emu/machine/legscsi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _LEGSCSI_H_
 #define _LEGSCSI_H_
 
diff --git a/src/emu/machine/lpc-acpi.c b/src/emu/machine/lpc-acpi.c
index 5493fa5ecf6..3189b336590 100644
--- a/src/emu/machine/lpc-acpi.c
+++ b/src/emu/machine/lpc-acpi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "lpc-acpi.h"
 
 const device_type LPC_ACPI = &device_creator<lpc_acpi_device>;
diff --git a/src/emu/machine/lpc-acpi.h b/src/emu/machine/lpc-acpi.h
index 912ce437aff..9ad406d0e3c 100644
--- a/src/emu/machine/lpc-acpi.h
+++ b/src/emu/machine/lpc-acpi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef LPC_ACPI_H
 #define LPC_ACPI_H
 
diff --git a/src/emu/machine/lpc-pit.c b/src/emu/machine/lpc-pit.c
index e7d2dffc934..a66183da596 100644
--- a/src/emu/machine/lpc-pit.c
+++ b/src/emu/machine/lpc-pit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "lpc-pit.h"
 
 const device_type LPC_PIT = &device_creator<lpc_pit_device>;
diff --git a/src/emu/machine/lpc-pit.h b/src/emu/machine/lpc-pit.h
index f6592864fa8..39fec76fc57 100644
--- a/src/emu/machine/lpc-pit.h
+++ b/src/emu/machine/lpc-pit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef LPC_PIT_H
 #define LPC_PIT_H
 
diff --git a/src/emu/machine/lpc-rtc.c b/src/emu/machine/lpc-rtc.c
index 0f51234c3a2..0985f51387c 100644
--- a/src/emu/machine/lpc-rtc.c
+++ b/src/emu/machine/lpc-rtc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "lpc-rtc.h"
 
 const device_type LPC_RTC = &device_creator<lpc_rtc_device>;
diff --git a/src/emu/machine/lpc-rtc.h b/src/emu/machine/lpc-rtc.h
index b2d4ea3155f..54e073327a7 100644
--- a/src/emu/machine/lpc-rtc.h
+++ b/src/emu/machine/lpc-rtc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef LPC_RTC_H
 #define LPC_RTC_H
 
diff --git a/src/emu/machine/lpc.c b/src/emu/machine/lpc.c
index fd9aeee275e..ee59faa61ef 100644
--- a/src/emu/machine/lpc.c
+++ b/src/emu/machine/lpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "lpc.h"
 
 lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
diff --git a/src/emu/machine/lpc.h b/src/emu/machine/lpc.h
index 75af5ffb612..ea73e3c9172 100644
--- a/src/emu/machine/lpc.h
+++ b/src/emu/machine/lpc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef LPC_H
 #define LPC_H
 
diff --git a/src/emu/machine/lpci.c b/src/emu/machine/lpci.c
index 03eff2d5d6e..1ab719ac7df 100644
--- a/src/emu/machine/lpci.c
+++ b/src/emu/machine/lpci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/lpci.c
diff --git a/src/emu/machine/lpci.h b/src/emu/machine/lpci.h
index f3c47a6a82c..94b8961d018 100644
--- a/src/emu/machine/lpci.h
+++ b/src/emu/machine/lpci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/lpci.h
diff --git a/src/emu/machine/m6m80011ap.c b/src/emu/machine/m6m80011ap.c
index 07ec91e3dad..2d11ffda0f9 100644
--- a/src/emu/machine/m6m80011ap.c
+++ b/src/emu/machine/m6m80011ap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/machine/m6m80011ap.h b/src/emu/machine/m6m80011ap.h
index f42c980a81c..1fba6fec863 100644
--- a/src/emu/machine/m6m80011ap.h
+++ b/src/emu/machine/m6m80011ap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/machine/matsucd.c b/src/emu/machine/matsucd.c
index dece9416d2e..99d793591d6 100644
--- a/src/emu/machine/matsucd.c
+++ b/src/emu/machine/matsucd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Matsushita/Panasonic CDR521/522 type CDROM drive emulation
diff --git a/src/emu/machine/matsucd.h b/src/emu/machine/matsucd.h
index 44b4703bb20..5bff7688a08 100644
--- a/src/emu/machine/matsucd.h
+++ b/src/emu/machine/matsucd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Matsushita/Panasonic CDR521/522 type CDROM drive emulation
diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c
index 6e7872281b5..e000177e023 100644
--- a/src/emu/machine/mb14241.c
+++ b/src/emu/machine/mb14241.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/emu/machine/mb14241.h b/src/emu/machine/mb14241.h
index 43afabfe2bb..445ff799803 100644
--- a/src/emu/machine/mb14241.h
+++ b/src/emu/machine/mb14241.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     MB14241 shifter IC emulation
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index 902b121e16d..c4628c45284 100644
--- a/src/emu/machine/mb3773.c
+++ b/src/emu/machine/mb3773.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fujitsu MB3773
diff --git a/src/emu/machine/mb3773.h b/src/emu/machine/mb3773.h
index 95807871a36..2f57174705d 100644
--- a/src/emu/machine/mb3773.h
+++ b/src/emu/machine/mb3773.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fujistu MB3773
diff --git a/src/emu/machine/mb8421.h b/src/emu/machine/mb8421.h
index 78c4359d535..92300e45946 100644
--- a/src/emu/machine/mb8421.h
+++ b/src/emu/machine/mb8421.h
@@ -5,9 +5,6 @@
     Fujitsu MB8421/22/31/32-90/-90L/-90LL/-12/-12L/-12LL
     CMOS 16K-bit (2KB) dual-port SRAM
 
-    Copyright MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c
index 3e955380c94..307b9e1e7c9 100644
--- a/src/emu/machine/mb87078.c
+++ b/src/emu/machine/mb87078.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   Fujitsu MB87078 6-bit, 4-channel electronic volume controller emulator
diff --git a/src/emu/machine/mb87078.h b/src/emu/machine/mb87078.h
index 633e027fe41..5c8ca59f95c 100644
--- a/src/emu/machine/mb87078.h
+++ b/src/emu/machine/mb87078.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   MB87078 6-bit,4-channel electronic volume controller emulator
diff --git a/src/emu/machine/mb8795.c b/src/emu/machine/mb8795.c
index b6c107810f2..eccf0433da8 100644
--- a/src/emu/machine/mb8795.c
+++ b/src/emu/machine/mb8795.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "mb8795.h"
diff --git a/src/emu/machine/mb8795.h b/src/emu/machine/mb8795.h
index aaad0c0ba49..616dde8d3ac 100644
--- a/src/emu/machine/mb8795.h
+++ b/src/emu/machine/mb8795.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef MB8795_H
 #define MB8795_H
 
diff --git a/src/emu/machine/mb89352.c b/src/emu/machine/mb89352.c
index b26844fcace..a72e15ca420 100644
--- a/src/emu/machine/mb89352.c
+++ b/src/emu/machine/mb89352.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Fujitsu MB89352A SCSI Protocol Controller
  *
diff --git a/src/emu/machine/mb89352.h b/src/emu/machine/mb89352.h
index 3c4952b2b2e..da63ef7e810 100644
--- a/src/emu/machine/mb89352.h
+++ b/src/emu/machine/mb89352.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mb89352.h
  *
diff --git a/src/emu/machine/mb89363b.c b/src/emu/machine/mb89363b.c
index 04441b52d02..c4cd015b028 100644
--- a/src/emu/machine/mb89363b.c
+++ b/src/emu/machine/mb89363b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   (this acts as a trampoline to 2x i8255 chips)
 
diff --git a/src/emu/machine/mb89363b.h b/src/emu/machine/mb89363b.h
index 0b2f32a304a..de232fe5971 100644
--- a/src/emu/machine/mb89363b.h
+++ b/src/emu/machine/mb89363b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fujitsu MB89363 Parallel Communication Interface
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index 268a7020eef..4e6ab8901c6 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mc146818.c
diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h
index 474f5621235..e8f3f4b1b6b 100644
--- a/src/emu/machine/mc146818.h
+++ b/src/emu/machine/mc146818.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mc146818.h
diff --git a/src/emu/machine/mc2661.c b/src/emu/machine/mc2661.c
index d13fe33c19f..f93dc1b5ab1 100644
--- a/src/emu/machine/mc2661.c
+++ b/src/emu/machine/mc2661.c
@@ -4,9 +4,6 @@
 
     Motorola MC2661/MC68661 Enhanced Programmable Communications Interface
 
-    Copyright the MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #include "mc2661.h"
diff --git a/src/emu/machine/mc2661.h b/src/emu/machine/mc2661.h
index 760f3bb0f77..5cc2f3e27fc 100644
--- a/src/emu/machine/mc2661.h
+++ b/src/emu/machine/mc2661.h
@@ -4,9 +4,6 @@
 
     Motorola MC2661/MC68661 Enhanced Programmable Communications Interface
 
-    Copyright the MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************
                             _____   _____
                     D2   1 |*    \_/     | 28  D1
diff --git a/src/emu/machine/mc68328.c b/src/emu/machine/mc68328.c
index 0055100bed1..f27d441421c 100644
--- a/src/emu/machine/mc68328.c
+++ b/src/emu/machine/mc68328.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Motorola 68328 ("DragonBall") System-on-a-Chip implementation
diff --git a/src/emu/machine/mc68328.h b/src/emu/machine/mc68328.h
index d3f79d4255f..1a56e1f635b 100644
--- a/src/emu/machine/mc68328.h
+++ b/src/emu/machine/mc68328.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
  Motorola 68328 ("DragonBall") System-on-a-Chip implementation
diff --git a/src/emu/machine/mc6843.c b/src/emu/machine/mc6843.c
index e46f28e7f70..da2b7b58cc5 100644
--- a/src/emu/machine/mc6843.c
+++ b/src/emu/machine/mc6843.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2007
diff --git a/src/emu/machine/mc6843.h b/src/emu/machine/mc6843.h
index ebe2868b05a..c8e645d98b3 100644
--- a/src/emu/machine/mc6843.h
+++ b/src/emu/machine/mc6843.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2007
diff --git a/src/emu/machine/mc6846.c b/src/emu/machine/mc6846.c
index c0a29b82f14..48f94d9023d 100644
--- a/src/emu/machine/mc6846.c
+++ b/src/emu/machine/mc6846.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/emu/machine/mc6846.h b/src/emu/machine/mc6846.h
index ef6247e87ad..1ca074620ca 100644
--- a/src/emu/machine/mc6846.h
+++ b/src/emu/machine/mc6846.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/emu/machine/mc6852.c b/src/emu/machine/mc6852.c
index 800f15e93ae..b0cf1ff9ca9 100644
--- a/src/emu/machine/mc6852.c
+++ b/src/emu/machine/mc6852.c
@@ -4,9 +4,6 @@
 
     Motorola MC6852 Synchronous Serial Data Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/mc6852.h b/src/emu/machine/mc6852.h
index 971c2f063bb..859d9e8bef2 100644
--- a/src/emu/machine/mc6852.h
+++ b/src/emu/machine/mc6852.h
@@ -4,9 +4,6 @@
 
     Motorola MC6852 Synchronous Serial Data Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vss   1 |*    \_/     | 24  _CTS
diff --git a/src/emu/machine/mc6854.c b/src/emu/machine/mc6854.c
index c3a169d6999..4e8d0224cad 100644
--- a/src/emu/machine/mc6854.c
+++ b/src/emu/machine/mc6854.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/emu/machine/mc6854.h b/src/emu/machine/mc6854.h
index baa16636cc4..af85b88c765 100644
--- a/src/emu/machine/mc6854.h
+++ b/src/emu/machine/mc6854.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/emu/machine/mc68681.c b/src/emu/machine/mc68681.c
index 29e6cf772cd..ce6939ee6d6 100644
--- a/src/emu/machine/mc68681.c
+++ b/src/emu/machine/mc68681.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     68681 DUART
 
diff --git a/src/emu/machine/mc68681.h b/src/emu/machine/mc68681.h
index be928c7b7c7..33569eb7297 100644
--- a/src/emu/machine/mc68681.h
+++ b/src/emu/machine/mc68681.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _MC68681_H
 #define _MC68681_H
 
diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c
index 3e5a0401e13..4d35d2a2c44 100644
--- a/src/emu/machine/mc68901.c
+++ b/src/emu/machine/mc68901.c
@@ -4,9 +4,6 @@
 
     Motorola MC68901 Multi Function Peripheral emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/mc68901.h b/src/emu/machine/mc68901.h
index 7db2dcb3b95..7147af2a478 100644
--- a/src/emu/machine/mc68901.h
+++ b/src/emu/machine/mc68901.h
@@ -4,9 +4,6 @@
 
     Motorola MC68901 Multi Function Peripheral emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   R/_W   1 |*    \_/     | 48  _CS
diff --git a/src/emu/machine/mccs1850.c b/src/emu/machine/mccs1850.c
index 40b2892803d..b037f184bfc 100644
--- a/src/emu/machine/mccs1850.c
+++ b/src/emu/machine/mccs1850.c
@@ -4,9 +4,6 @@
 
     Motorola MCCS1850 Serial Real-Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/machine/mccs1850.h b/src/emu/machine/mccs1850.h
index c37a0886c2e..933e67a5f8f 100644
--- a/src/emu/machine/mccs1850.h
+++ b/src/emu/machine/mccs1850.h
@@ -4,9 +4,6 @@
 
     Motorola MCCS1850 Serial Real-Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   Vbat   1 |*    \_/     | 16  Vdd
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index f19684f71a0..48a990515e7 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Modern device for the MCF5206e Peripherals
  this can be hooked properly to the CPU once the CPU is a modern device too
 */
diff --git a/src/emu/machine/mcf5206e.h b/src/emu/machine/mcf5206e.h
index 84c9003eafe..1e8029f9691 100644
--- a/src/emu/machine/mcf5206e.h
+++ b/src/emu/machine/mcf5206e.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MCF5206E Peripherals
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 376f564ecee..9d6b6b52744 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Microtouch touch screen controller
 
diff --git a/src/emu/machine/microtch.h b/src/emu/machine/microtch.h
index d4c03fa41cb..386bbcea9ff 100644
--- a/src/emu/machine/microtch.h
+++ b/src/emu/machine/microtch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _MICROTOUCH_H
 #define _MICROTOUCH_H
 
diff --git a/src/emu/machine/mm58167.c b/src/emu/machine/mm58167.c
index 6f6fdcbc394..e31cbb5bace 100644
--- a/src/emu/machine/mm58167.c
+++ b/src/emu/machine/mm58167.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     mm58167.c - National Semiconductor MM58167 real-time clock emulation
diff --git a/src/emu/machine/mm58167.h b/src/emu/machine/mm58167.h
index fed17010d20..e6bd29fa460 100644
--- a/src/emu/machine/mm58167.h
+++ b/src/emu/machine/mm58167.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     mm58167.h - National Semiconductor MM58167 real-time clock emulation
diff --git a/src/emu/machine/mm58274c.c b/src/emu/machine/mm58274c.c
index 09e2941b8b7..7f673b94573 100644
--- a/src/emu/machine/mm58274c.c
+++ b/src/emu/machine/mm58274c.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mm58274c.c
diff --git a/src/emu/machine/mm58274c.h b/src/emu/machine/mm58274c.h
index 06cb9d86711..67c5c78b003 100644
--- a/src/emu/machine/mm58274c.h
+++ b/src/emu/machine/mm58274c.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MM58274C_H__
 #define __MM58274C_H__
 
diff --git a/src/emu/machine/mm74c922.c b/src/emu/machine/mm74c922.c
index fe2d47cf7e4..6b7f9b50d53 100644
--- a/src/emu/machine/mm74c922.c
+++ b/src/emu/machine/mm74c922.c
@@ -4,9 +4,6 @@
 
     MM74C922/MM74C923 16/20-Key Encoder emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mm74c922.h"
diff --git a/src/emu/machine/mm74c922.h b/src/emu/machine/mm74c922.h
index 9ae7c44959d..88a7bfde186 100644
--- a/src/emu/machine/mm74c922.h
+++ b/src/emu/machine/mm74c922.h
@@ -4,9 +4,6 @@
 
     MM74C922/MM74C923 16/20-Key Encoder emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                 ROW Y1   1 |*    \_/     | 18  Vcc
diff --git a/src/emu/machine/mos6526.c b/src/emu/machine/mos6526.c
index 030ed843a54..e65070d3d67 100644
--- a/src/emu/machine/mos6526.c
+++ b/src/emu/machine/mos6526.c
@@ -4,9 +4,6 @@
 
     MOS 6526/8520 Complex Interface Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/mos6526.h b/src/emu/machine/mos6526.h
index 91543385576..da54967e080 100644
--- a/src/emu/machine/mos6526.h
+++ b/src/emu/machine/mos6526.h
@@ -4,9 +4,6 @@
 
     MOS 6526/8520 Complex Interface Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vss   1 |*    \_/     | 40  CNT
diff --git a/src/emu/machine/mos6529.c b/src/emu/machine/mos6529.c
index ebb09a1bb74..ebae2ca6f5a 100644
--- a/src/emu/machine/mos6529.c
+++ b/src/emu/machine/mos6529.c
@@ -4,9 +4,6 @@
 
     MOS Technology 6529 Single Port Interface Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos6529.h"
diff --git a/src/emu/machine/mos6529.h b/src/emu/machine/mos6529.h
index c14562c8e68..0e6f00f4dd0 100644
--- a/src/emu/machine/mos6529.h
+++ b/src/emu/machine/mos6529.h
@@ -4,9 +4,6 @@
 
     MOS Technology 6529 Single Port Interface Adapter emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    R/W   1 |*    \_/     | 20  Vdd
diff --git a/src/emu/machine/mos6530.c b/src/emu/machine/mos6530.c
index 47a28c07068..58845571dd4 100644
--- a/src/emu/machine/mos6530.c
+++ b/src/emu/machine/mos6530.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   MIOT 6530 emulation
diff --git a/src/emu/machine/mos6530.h b/src/emu/machine/mos6530.h
index 33af24cf993..d2ef7c39a38 100644
--- a/src/emu/machine/mos6530.h
+++ b/src/emu/machine/mos6530.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     MOS Technology 6530 Memory, I/O, Timer Array emulation
diff --git a/src/emu/machine/mos6530n.c b/src/emu/machine/mos6530n.c
index 64e13126a1c..0999eaa4856 100644
--- a/src/emu/machine/mos6530n.c
+++ b/src/emu/machine/mos6530n.c
@@ -4,9 +4,6 @@
 
     MOS Technology 6530 Memory, I/O, Timer Array emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos6530n.h"
diff --git a/src/emu/machine/mos6530n.h b/src/emu/machine/mos6530n.h
index 22be75989b4..24a88af2c96 100644
--- a/src/emu/machine/mos6530n.h
+++ b/src/emu/machine/mos6530n.h
@@ -4,9 +4,6 @@
 
     MOS Technology 6530 Memory, I/O, Timer Array emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vss   1 |*    \_/     | 40  PA1
diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c
index 7ff8c53fe82..f9bf1171155 100644
--- a/src/emu/machine/mos6551.c
+++ b/src/emu/machine/mos6551.c
@@ -4,9 +4,6 @@
 
     MOS Technology 6551 Asynchronous Communication Interface Adapter
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos6551.h"
diff --git a/src/emu/machine/mos6702.c b/src/emu/machine/mos6702.c
index b6e1aeb1f20..9dc11e24af9 100644
--- a/src/emu/machine/mos6702.c
+++ b/src/emu/machine/mos6702.c
@@ -4,9 +4,6 @@
 
     MOS Technology 6702 Mystery Device emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos6702.h"
diff --git a/src/emu/machine/mos6702.h b/src/emu/machine/mos6702.h
index 879f90df2bf..d0675e5140b 100644
--- a/src/emu/machine/mos6702.h
+++ b/src/emu/machine/mos6702.h
@@ -4,9 +4,6 @@
 
     MOS Technology 6702 Mystery Device emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   R/_W   1 |*    \_/     | 20  Vcc
diff --git a/src/emu/machine/mos8706.c b/src/emu/machine/mos8706.c
index 699aa6e7bc7..ca07506423b 100644
--- a/src/emu/machine/mos8706.c
+++ b/src/emu/machine/mos8706.c
@@ -4,9 +4,6 @@
 
     MOS 8706 Speech Glue Logic ASIC emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos8706.h"
diff --git a/src/emu/machine/mos8706.h b/src/emu/machine/mos8706.h
index 1138dab0f8b..070c592b9fe 100644
--- a/src/emu/machine/mos8706.h
+++ b/src/emu/machine/mos8706.h
@@ -4,9 +4,6 @@
 
     MOS 8706 Speech Glue Logic ASIC emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   _RES   1 |*    \_/     | 28  Vdd
diff --git a/src/emu/machine/mos8722.c b/src/emu/machine/mos8722.c
index a85d4fc1317..31b2beb1f27 100644
--- a/src/emu/machine/mos8722.c
+++ b/src/emu/machine/mos8722.c
@@ -4,9 +4,6 @@
 
     MOS Technology 8722 Memory Management Unit emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "mos8722.h"
diff --git a/src/emu/machine/mos8722.h b/src/emu/machine/mos8722.h
index 96b0089de8a..d342781fc4e 100644
--- a/src/emu/machine/mos8722.h
+++ b/src/emu/machine/mos8722.h
@@ -4,9 +4,6 @@
 
     MOS Technology 8722 Memory Management Unit emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vdd   1 |*    \_/     | 48  SENSE40
diff --git a/src/emu/machine/mos8726.c b/src/emu/machine/mos8726.c
index 1927e009ba1..eca6ada5187 100644
--- a/src/emu/machine/mos8726.c
+++ b/src/emu/machine/mos8726.c
@@ -4,9 +4,6 @@
 
     MOS 8726R1 DMA Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/mos8726.h b/src/emu/machine/mos8726.h
index 5d306ba3ab2..324d99794de 100644
--- a/src/emu/machine/mos8726.h
+++ b/src/emu/machine/mos8726.h
@@ -4,9 +4,6 @@
 
     MOS 8726R1 DMA Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                 /RESET   1 |*    \_/     | 64  Vcc
diff --git a/src/emu/machine/mpu401.c b/src/emu/machine/mpu401.c
index 7e654cb0662..a313f1b0407 100644
--- a/src/emu/machine/mpu401.c
+++ b/src/emu/machine/mpu401.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Roland MPU-401 core
diff --git a/src/emu/machine/mpu401.h b/src/emu/machine/mpu401.h
index 0381bafccb6..22dd6940acf 100644
--- a/src/emu/machine/mpu401.h
+++ b/src/emu/machine/mpu401.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MPU401_H__
diff --git a/src/emu/machine/msm5832.c b/src/emu/machine/msm5832.c
index 99665099db6..7bc6fa70bfa 100644
--- a/src/emu/machine/msm5832.c
+++ b/src/emu/machine/msm5832.c
@@ -4,9 +4,6 @@
 
     OKI MSM5832 Real Time Clock/Calendar emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/msm5832.h b/src/emu/machine/msm5832.h
index 5c0048c6296..68b72a3f8bf 100644
--- a/src/emu/machine/msm5832.h
+++ b/src/emu/machine/msm5832.h
@@ -4,9 +4,6 @@
 
     OKI MSM5832 Real Time Clock/Calendar emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vdd   1 |*    \_/     | 18  HOLD
diff --git a/src/emu/machine/msm58321.c b/src/emu/machine/msm58321.c
index 1a12b8bfd50..679b85584ff 100644
--- a/src/emu/machine/msm58321.c
+++ b/src/emu/machine/msm58321.c
@@ -4,9 +4,6 @@
 
     OKI MSM58321RS Real Time Clock/Calendar emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/msm58321.h b/src/emu/machine/msm58321.h
index ca05aebf31b..8b1ad54edd9 100644
--- a/src/emu/machine/msm58321.h
+++ b/src/emu/machine/msm58321.h
@@ -4,9 +4,6 @@
 
     OKI MSM58321RS Real Time Clock/Calendar emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    CS2   1 |*    \_/     | 16  Vdd
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index 313f2d0cd6d..1d43d98fc22 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MSM6242 / Epson RTC 62421 / 62423 Real Time Clock
diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h
index acf86cc6472..49850879a1b 100644
--- a/src/emu/machine/msm6242.h
+++ b/src/emu/machine/msm6242.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MSM6242 Real Time Clock
diff --git a/src/emu/machine/ncr5380.c b/src/emu/machine/ncr5380.c
index cd8b9644f32..b4c5c943033 100644
--- a/src/emu/machine/ncr5380.c
+++ b/src/emu/machine/ncr5380.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * ncr5380.c
  *
diff --git a/src/emu/machine/ncr5380.h b/src/emu/machine/ncr5380.h
index 1304fd01c8b..9d111ce6d35 100644
--- a/src/emu/machine/ncr5380.h
+++ b/src/emu/machine/ncr5380.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * ncr5380.h SCSI controller
  *
diff --git a/src/emu/machine/ncr5380n.c b/src/emu/machine/ncr5380n.c
index 130066e4769..5822c315026 100644
--- a/src/emu/machine/ncr5380n.c
+++ b/src/emu/machine/ncr5380n.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ncr5380n.c
diff --git a/src/emu/machine/ncr5380n.h b/src/emu/machine/ncr5380n.h
index 60bc81df4c3..4d8f0355b40 100644
--- a/src/emu/machine/ncr5380n.h
+++ b/src/emu/machine/ncr5380n.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ncr5380n.c
diff --git a/src/emu/machine/ncr5390.c b/src/emu/machine/ncr5390.c
index 3179a27a896..01058d53605 100644
--- a/src/emu/machine/ncr5390.c
+++ b/src/emu/machine/ncr5390.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "ncr5390.h"
diff --git a/src/emu/machine/ncr5390.h b/src/emu/machine/ncr5390.h
index d89058bfd40..48dcb1a41bc 100644
--- a/src/emu/machine/ncr5390.h
+++ b/src/emu/machine/ncr5390.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef NCR5390_H
 #define NCR5390_H
 
diff --git a/src/emu/machine/ncr539x.c b/src/emu/machine/ncr539x.c
index 0d3da45b530..9b62ece12da 100644
--- a/src/emu/machine/ncr539x.c
+++ b/src/emu/machine/ncr539x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * ncr539x.c
  *
diff --git a/src/emu/machine/ncr539x.h b/src/emu/machine/ncr539x.h
index 76f081c8c28..eb9778ee7ee 100644
--- a/src/emu/machine/ncr539x.h
+++ b/src/emu/machine/ncr539x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * ncr5394/5396.h SCSI controller
  *
diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c
index daf08a61598..9f2ae1c92e8 100644
--- a/src/emu/machine/netlist.c
+++ b/src/emu/machine/netlist.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     netlist.c
diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h
index ae3bbab7cbf..941db1c4d40 100644
--- a/src/emu/machine/netlist.h
+++ b/src/emu/machine/netlist.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     netlist.h
@@ -593,7 +595,7 @@ private:
 	netlist_analog_input_t m_in;
 	netlist_analog_output_delegate m_callback;
 	netlist_mame_cpu_device_t *m_cpu_device;
-	netlist_state_t<nl_double> m_last;
+	nl_double m_last;
 };
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/emu/machine/nmc9306.c b/src/emu/machine/nmc9306.c
index 62709141cfd..d32c88bea01 100644
--- a/src/emu/machine/nmc9306.c
+++ b/src/emu/machine/nmc9306.c
@@ -4,9 +4,6 @@
 
     National Semiconductor NMC9306 256-Bit Serial EEPROM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/machine/nmc9306.h b/src/emu/machine/nmc9306.h
index 808a7ee7085..95db0133025 100644
--- a/src/emu/machine/nmc9306.h
+++ b/src/emu/machine/nmc9306.h
@@ -4,9 +4,6 @@
 
     National Semiconductor NMC9306 256-Bit Serial EEPROM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     CS   1 |*    \_/     | 8   Vcc
diff --git a/src/emu/machine/nsc810.c b/src/emu/machine/nsc810.c
index 2161a867378..7058948682c 100644
--- a/src/emu/machine/nsc810.c
+++ b/src/emu/machine/nsc810.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nsc810.c
  *
diff --git a/src/emu/machine/nsc810.h b/src/emu/machine/nsc810.h
index 4112a8cab65..541724e3d7b 100644
--- a/src/emu/machine/nsc810.h
+++ b/src/emu/machine/nsc810.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nsc810.h
  *
diff --git a/src/emu/machine/nscsi_bus.c b/src/emu/machine/nscsi_bus.c
index d02c5c7b1dd..b224ec9da9d 100644
--- a/src/emu/machine/nscsi_bus.c
+++ b/src/emu/machine/nscsi_bus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "nscsi_bus.h"
 
 const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
diff --git a/src/emu/machine/nscsi_bus.h b/src/emu/machine/nscsi_bus.h
index 010807c119b..8efa5f00b42 100644
--- a/src/emu/machine/nscsi_bus.h
+++ b/src/emu/machine/nscsi_bus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NSCSI_BUS_H__
 #define __NSCSI_BUS_H__
 
diff --git a/src/emu/machine/nscsi_cb.c b/src/emu/machine/nscsi_cb.c
index bd828cac1e4..b1fda3461f6 100644
--- a/src/emu/machine/nscsi_cb.c
+++ b/src/emu/machine/nscsi_cb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "nscsi_cb.h"
 
 const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
diff --git a/src/emu/machine/nscsi_cb.h b/src/emu/machine/nscsi_cb.h
index fbeea187559..236f6982625 100644
--- a/src/emu/machine/nscsi_cb.h
+++ b/src/emu/machine/nscsi_cb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef NSCSI_CB_H
 #define NSCSI_CB_H
 
diff --git a/src/emu/machine/nscsi_cd.c b/src/emu/machine/nscsi_cd.c
index 7838638be0f..de5435ddcda 100644
--- a/src/emu/machine/nscsi_cd.c
+++ b/src/emu/machine/nscsi_cd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nscsi_cd.h"
 #include "imagedev/chd_cd.h"
 
diff --git a/src/emu/machine/nscsi_cd.h b/src/emu/machine/nscsi_cd.h
index 854c5261e23..49b7a90c77e 100644
--- a/src/emu/machine/nscsi_cd.h
+++ b/src/emu/machine/nscsi_cd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NSCSI_CD_H__
 #define __NSCSI_CD_H__
 
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index 1b5bbdd6c92..912b46acff5 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nscsi_hd.h"
 #include "imagedev/harddriv.h"
 
diff --git a/src/emu/machine/nscsi_hd.h b/src/emu/machine/nscsi_hd.h
index 84b98ab5dc7..e511a72cb66 100644
--- a/src/emu/machine/nscsi_hd.h
+++ b/src/emu/machine/nscsi_hd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NSCSI_HD_H__
 #define __NSCSI_HD_H__
 
diff --git a/src/emu/machine/nscsi_s1410.c b/src/emu/machine/nscsi_s1410.c
index 883fd1bb2d8..e24096c754e 100644
--- a/src/emu/machine/nscsi_s1410.c
+++ b/src/emu/machine/nscsi_s1410.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nscsi_s1410.h"
 
 const device_type NSCSI_S1410 = &device_creator<nscsi_s1410_device>;
diff --git a/src/emu/machine/nscsi_s1410.h b/src/emu/machine/nscsi_s1410.h
index 0af6963950d..24167f16a35 100644
--- a/src/emu/machine/nscsi_s1410.h
+++ b/src/emu/machine/nscsi_s1410.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NSCSI_S1410_H__
 #define __NSCSI_S1410_H__
 
diff --git a/src/emu/machine/pc_fdc.c b/src/emu/machine/pc_fdc.c
index 598568ee0e1..e347b547072 100644
--- a/src/emu/machine/pc_fdc.c
+++ b/src/emu/machine/pc_fdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     PC-style floppy disk controller emulation
diff --git a/src/emu/machine/pc_fdc.h b/src/emu/machine/pc_fdc.h
index 41ddbc9694c..2d98c65a677 100644
--- a/src/emu/machine/pc_fdc.h
+++ b/src/emu/machine/pc_fdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     PC-style floppy disk controller emulation
diff --git a/src/emu/machine/pc_lpt.c b/src/emu/machine/pc_lpt.c
index 40ae6f1852e..240e8b2c219 100644
--- a/src/emu/machine/pc_lpt.c
+++ b/src/emu/machine/pc_lpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM-PC printer interface
diff --git a/src/emu/machine/pc_lpt.h b/src/emu/machine/pc_lpt.h
index 582ac30b45b..4ffcb98db06 100644
--- a/src/emu/machine/pc_lpt.h
+++ b/src/emu/machine/pc_lpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM-PC printer interface
diff --git a/src/emu/machine/pcf8593.c b/src/emu/machine/pcf8593.c
index db237678804..189e44f8cb8 100644
--- a/src/emu/machine/pcf8593.c
+++ b/src/emu/machine/pcf8593.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     Philips PCF8593 CMOS clock/calendar circuit
diff --git a/src/emu/machine/pcf8593.h b/src/emu/machine/pcf8593.h
index 887a68f219c..80f5bc72faf 100644
--- a/src/emu/machine/pcf8593.h
+++ b/src/emu/machine/pcf8593.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     Philips PCF8593 CMOS clock/calendar circuit
diff --git a/src/emu/machine/pci-apic.c b/src/emu/machine/pci-apic.c
index 7b61167d1d4..2fac7015aa3 100644
--- a/src/emu/machine/pci-apic.c
+++ b/src/emu/machine/pci-apic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci-apic.h"
 
 const device_type APIC = &device_creator<apic_device>;
diff --git a/src/emu/machine/pci-apic.h b/src/emu/machine/pci-apic.h
index 30e4f900185..a2f15c43dc3 100644
--- a/src/emu/machine/pci-apic.h
+++ b/src/emu/machine/pci-apic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_APIC_H
 #define PCI_APIC_H
 
diff --git a/src/emu/machine/pci-sata.c b/src/emu/machine/pci-sata.c
index 55980ee20fe..fc96886a220 100644
--- a/src/emu/machine/pci-sata.c
+++ b/src/emu/machine/pci-sata.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci-sata.h"
 
 const device_type SATA = &device_creator<sata_device>;
diff --git a/src/emu/machine/pci-sata.h b/src/emu/machine/pci-sata.h
index baf2e96aada..65bd9217cb8 100644
--- a/src/emu/machine/pci-sata.h
+++ b/src/emu/machine/pci-sata.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_SATA_H
 #define PCI_SATA_H
 
diff --git a/src/emu/machine/pci-smbus.c b/src/emu/machine/pci-smbus.c
index 32a3ec8fa8c..c7394a72303 100644
--- a/src/emu/machine/pci-smbus.c
+++ b/src/emu/machine/pci-smbus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci-smbus.h"
 
 const device_type SMBUS = &device_creator<smbus_device>;
diff --git a/src/emu/machine/pci-smbus.h b/src/emu/machine/pci-smbus.h
index a228ed2e035..353a43bc8f3 100644
--- a/src/emu/machine/pci-smbus.h
+++ b/src/emu/machine/pci-smbus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_SMBUS_H
 #define PCI_SMBUS_H
 
diff --git a/src/emu/machine/pci-usb.c b/src/emu/machine/pci-usb.c
index b7bc2d96556..85f93bd8e72 100644
--- a/src/emu/machine/pci-usb.c
+++ b/src/emu/machine/pci-usb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci-usb.h"
 
 const device_type USB_UHCI = &device_creator<usb_uhci_device>;
diff --git a/src/emu/machine/pci-usb.h b/src/emu/machine/pci-usb.h
index 5cc6c931031..64df0aad166 100644
--- a/src/emu/machine/pci-usb.h
+++ b/src/emu/machine/pci-usb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_USB_H
 #define PCI_USB_H
 
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index c61d2045d20..0760454be76 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci.h"
 
 const device_type PCI_ROOT   = &device_creator<pci_root_device>;
diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h
index e678b2eb689..407a73bbff8 100644
--- a/src/emu/machine/pci.h
+++ b/src/emu/machine/pci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_H
 #define PCI_H
 
diff --git a/src/emu/machine/pci9050.c b/src/emu/machine/pci9050.c
index ed8e58e2497..d94ff0eb09f 100644
--- a/src/emu/machine/pci9050.c
+++ b/src/emu/machine/pci9050.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     pci9050.c - PLX PCI9050 PCI to 4x Local Bus Bridge
diff --git a/src/emu/machine/pci9050.h b/src/emu/machine/pci9050.h
index 556290ad81c..53212e73b53 100644
--- a/src/emu/machine/pci9050.h
+++ b/src/emu/machine/pci9050.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     pci9050.h - PLX PCI9050 PCI to 4x Local Bus Bridge
diff --git a/src/emu/machine/pckeybrd.c b/src/emu/machine/pckeybrd.c
index 12aefd6086f..6c7eb54f510 100644
--- a/src/emu/machine/pckeybrd.c
+++ b/src/emu/machine/pckeybrd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     pckeybrd.c
diff --git a/src/emu/machine/pckeybrd.h b/src/emu/machine/pckeybrd.h
index 3bfd399d92a..66ac450c3b4 100644
--- a/src/emu/machine/pckeybrd.h
+++ b/src/emu/machine/pckeybrd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     pckeybrd.h
diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c
index d86b25dd30c..5d982037961 100644
--- a/src/emu/machine/pic8259.c
+++ b/src/emu/machine/pic8259.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     8259 PIC interface and emulation
diff --git a/src/emu/machine/pic8259.h b/src/emu/machine/pic8259.h
index 739d9955c8b..27e92a13daa 100644
--- a/src/emu/machine/pic8259.h
+++ b/src/emu/machine/pic8259.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8259A
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index 2b9448582dd..cecf8eb9efe 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  Programmable Interval Timer 8253/8254
diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h
index a6e4080aad9..54a0f619ed2 100644
--- a/src/emu/machine/pit8253.h
+++ b/src/emu/machine/pit8253.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Intel 8253/8254
diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c
index 4d0a3978161..ee60cbd56d7 100644
--- a/src/emu/machine/pla.c
+++ b/src/emu/machine/pla.c
@@ -4,9 +4,6 @@
 
     PLA (Programmable Logic Array) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "pla.h"
diff --git a/src/emu/machine/pla.h b/src/emu/machine/pla.h
index a84ab2612a6..121807a8a6b 100644
--- a/src/emu/machine/pla.h
+++ b/src/emu/machine/pla.h
@@ -4,9 +4,6 @@
 
     PLA (Programmable Logic Array) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/r10696.c b/src/emu/machine/r10696.c
index 7dca19866f6..feb0138055c 100644
--- a/src/emu/machine/r10696.c
+++ b/src/emu/machine/r10696.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 10696 General Purpose Input/Output (I/O)
diff --git a/src/emu/machine/r10696.h b/src/emu/machine/r10696.h
index a151a4846dd..ca3b87c935e 100644
--- a/src/emu/machine/r10696.h
+++ b/src/emu/machine/r10696.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************************
 
     Rockwell 10696 General Purpose Input/Output (I/O)
diff --git a/src/emu/machine/r10788.c b/src/emu/machine/r10788.c
index 128314903fe..ad163973681 100644
--- a/src/emu/machine/r10788.c
+++ b/src/emu/machine/r10788.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 10788 General Purpose Keyboard and Display circuit
diff --git a/src/emu/machine/r10788.h b/src/emu/machine/r10788.h
index 925e579f2c1..af58aca65c7 100644
--- a/src/emu/machine/r10788.h
+++ b/src/emu/machine/r10788.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************************
 
     Rockwell 10788 General Purpose Keyboard and Display circuit
diff --git a/src/emu/machine/ra17xx.c b/src/emu/machine/ra17xx.c
index 2b143d0aa9c..127067ad760 100644
--- a/src/emu/machine/ra17xx.c
+++ b/src/emu/machine/ra17xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell A17XX ROM, RAM and I/O chip
diff --git a/src/emu/machine/ra17xx.h b/src/emu/machine/ra17xx.h
index f771ca77590..3ca8877d7de 100644
--- a/src/emu/machine/ra17xx.h
+++ b/src/emu/machine/ra17xx.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller
 /**********************************************************************
 
     Rockwell RA17xx (e.g. A1752, A1753) ROM, RAM and I/O chip
diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c
index 6f5d3c4ec27..5e730a40298 100644
--- a/src/emu/machine/ram.c
+++ b/src/emu/machine/ram.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     RAM device
diff --git a/src/emu/machine/ram.h b/src/emu/machine/ram.h
index 7f4a20471ec..9cfdee6efc5 100644
--- a/src/emu/machine/ram.h
+++ b/src/emu/machine/ram.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     RAM device
diff --git a/src/emu/machine/rescap.h b/src/emu/machine/rescap.h
index 1db116bc5c2..ba21770eaf1 100644
--- a/src/emu/machine/rescap.h
+++ b/src/emu/machine/rescap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef RC_MACROS_H
 #define RC_MACROS_H
 
diff --git a/src/emu/machine/rf5c296.c b/src/emu/machine/rf5c296.c
index 3b530a97669..7d2689c824e 100644
--- a/src/emu/machine/rf5c296.c
+++ b/src/emu/machine/rf5c296.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "rf5c296.h"
 
 // rf5c296 is very inaccurate at that point, it hardcodes the gnet config
diff --git a/src/emu/machine/rf5c296.h b/src/emu/machine/rf5c296.h
index 5332aafff2e..5ad53dd35c3 100644
--- a/src/emu/machine/rf5c296.h
+++ b/src/emu/machine/rf5c296.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __RF5C296_H__
diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c
index c13c0375e38..c5a692c3074 100644
--- a/src/emu/machine/roc10937.c
+++ b/src/emu/machine/roc10937.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 10937/10957 interface and emulation by J.Wallace
diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h
index a8c5130b75a..db98ac8ee83 100644
--- a/src/emu/machine/roc10937.h
+++ b/src/emu/machine/roc10937.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Rockwell 10937/10957 interface and simlar chips
diff --git a/src/emu/machine/rp5c01.c b/src/emu/machine/rp5c01.c
index 6a8000c4879..5ac56b4b415 100644
--- a/src/emu/machine/rp5c01.c
+++ b/src/emu/machine/rp5c01.c
@@ -4,9 +4,6 @@
 
     Ricoh RP5C01(A) Real Time Clock With Internal RAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/machine/rp5c01.h b/src/emu/machine/rp5c01.h
index 335708da0f1..e0283816067 100644
--- a/src/emu/machine/rp5c01.h
+++ b/src/emu/machine/rp5c01.h
@@ -4,9 +4,6 @@
 
     Ricoh RP5C01(A) Real Time Clock With Internal RAM emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    _CS   1 |*    \_/     | 18  Vcc
diff --git a/src/emu/machine/rp5c15.c b/src/emu/machine/rp5c15.c
index 9a4694a1962..7967366c349 100644
--- a/src/emu/machine/rp5c15.c
+++ b/src/emu/machine/rp5c15.c
@@ -4,9 +4,6 @@
 
     Ricoh RP5C15 Real Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/emu/machine/rp5c15.h b/src/emu/machine/rp5c15.h
index 9badb665ac0..2f97d49d99f 100644
--- a/src/emu/machine/rp5c15.h
+++ b/src/emu/machine/rp5c15.h
@@ -4,9 +4,6 @@
 
     Ricoh RP5C15 Real Time Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    _CS   1 |*    \_/     | 18  Vcc
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index c0619151810..91d133712da 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     RP5H01 - Ricoh 64x1bit(+8bit) PROM with 6/7-bit counter
diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h
index ed6bb68fa7a..2979d1b0a57 100644
--- a/src/emu/machine/rp5h01.h
+++ b/src/emu/machine/rp5h01.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     RP5H01 - Ricoh 64x1bit(+8bit) PROM with 6/7-bit counter
diff --git a/src/emu/machine/rtc4543.c b/src/emu/machine/rtc4543.c
index 6c17c12c7f5..145bee23380 100644
--- a/src/emu/machine/rtc4543.c
+++ b/src/emu/machine/rtc4543.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     rtc4543.c - Epson R4543 real-time clock chip emulation
diff --git a/src/emu/machine/rtc4543.h b/src/emu/machine/rtc4543.h
index 1b917566401..9d2313c5af3 100644
--- a/src/emu/machine/rtc4543.h
+++ b/src/emu/machine/rtc4543.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     rtc4543.h - Epson R4543 real-time clock emulation
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index fee26078023..bc0e95af869 100644
--- a/src/emu/machine/rtc65271.c
+++ b/src/emu/machine/rtc65271.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     rtc65271 emulation
 
diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h
index 05f7db48f67..712814fc4a1 100644
--- a/src/emu/machine/rtc65271.h
+++ b/src/emu/machine/rtc65271.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     rtc65271.h: include file for rtc65271.c
 */
diff --git a/src/emu/machine/rtc9701.h b/src/emu/machine/rtc9701.h
index ab5445d4d96..6a89de82be1 100644
--- a/src/emu/machine/rtc9701.h
+++ b/src/emu/machine/rtc9701.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rtc9701.h
diff --git a/src/emu/machine/s2636.c b/src/emu/machine/s2636.c
index 3931d85aa97..2a33bfe6857 100644
--- a/src/emu/machine/s2636.c
+++ b/src/emu/machine/s2636.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Signetics 2636 video chip
diff --git a/src/emu/machine/s2636.h b/src/emu/machine/s2636.h
index 3be2d6e8093..53aae846abb 100644
--- a/src/emu/machine/s2636.h
+++ b/src/emu/machine/s2636.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Signetics 2636 video chip
diff --git a/src/emu/machine/s3520cf.h b/src/emu/machine/s3520cf.h
index 85dc39516a0..e20782e0253 100644
--- a/src/emu/machine/s3520cf.h
+++ b/src/emu/machine/s3520cf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c
index 3414335ed17..3e52ecd282b 100644
--- a/src/emu/machine/s3c2400.c
+++ b/src/emu/machine/s3c2400.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2400
diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h
index db4bc567392..16fd5edd179 100644
--- a/src/emu/machine/s3c2400.h
+++ b/src/emu/machine/s3c2400.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2400
diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c
index 75a258a6751..495d639ae7c 100644
--- a/src/emu/machine/s3c2410.c
+++ b/src/emu/machine/s3c2410.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2410
diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h
index 802eb1cc52a..f17408981e8 100644
--- a/src/emu/machine/s3c2410.h
+++ b/src/emu/machine/s3c2410.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2410
diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c
index 80932103bdb..9af75a4c265 100644
--- a/src/emu/machine/s3c2440.c
+++ b/src/emu/machine/s3c2440.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2440
diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h
index 4c333de06f7..74a9bb791d8 100644
--- a/src/emu/machine/s3c2440.h
+++ b/src/emu/machine/s3c2440.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C2440
diff --git a/src/emu/machine/s3c44b0.c b/src/emu/machine/s3c44b0.c
index 9b2d68a02a8..127fd3cc8ae 100644
--- a/src/emu/machine/s3c44b0.c
+++ b/src/emu/machine/s3c44b0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C44B0
diff --git a/src/emu/machine/s3c44b0.h b/src/emu/machine/s3c44b0.h
index dc13e086f77..62e4497e5f2 100644
--- a/src/emu/machine/s3c44b0.h
+++ b/src/emu/machine/s3c44b0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Samsung S3C44B0
diff --git a/src/emu/machine/serflash.c b/src/emu/machine/serflash.c
index 8ea9a4445ea..96049e7d4c0 100644
--- a/src/emu/machine/serflash.c
+++ b/src/emu/machine/serflash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Serial Flash Device */
 
 /* todo: cleanup, refactor etc. */
diff --git a/src/emu/machine/serflash.h b/src/emu/machine/serflash.h
index 8f37e6d6ca5..2f9db332b28 100644
--- a/src/emu/machine/serflash.h
+++ b/src/emu/machine/serflash.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Serial Flash */
 
 #pragma once
diff --git a/src/emu/machine/smc92x4.c b/src/emu/machine/smc92x4.c
index e6091ef14f9..db282a24471 100644
--- a/src/emu/machine/smc92x4.c
+++ b/src/emu/machine/smc92x4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     HDC9224 and HDC9234 Hard and Floppy Disk Controller
 
diff --git a/src/emu/machine/smc92x4.h b/src/emu/machine/smc92x4.h
index defe39100ee..7d87f784321 100644
--- a/src/emu/machine/smc92x4.h
+++ b/src/emu/machine/smc92x4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Interface */
 
 #ifndef __SMC92X4_H__
diff --git a/src/emu/machine/smpc.h b/src/emu/machine/smpc.h
index be47a6260f8..7909cbb2e74 100644
--- a/src/emu/machine/smpc.h
+++ b/src/emu/machine/smpc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // TODO: make separate device when code is decoupled better
 //DECLARE_WRITE8_MEMBER( stv_SMPC_w );
 //DECLARE_READ8_MEMBER( stv_SMPC_r );
diff --git a/src/emu/machine/spchrom.c b/src/emu/machine/spchrom.c
index ac4ae9d5aed..f5058fd11bc 100644
--- a/src/emu/machine/spchrom.c
+++ b/src/emu/machine/spchrom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     spchroms.c - This is an emulator for "typical" speech ROMs from TI, as used by TI99/4(a).
 
diff --git a/src/emu/machine/spchrom.h b/src/emu/machine/spchrom.h
index 8dba6eaa3db..55ee333a834 100644
--- a/src/emu/machine/spchrom.h
+++ b/src/emu/machine/spchrom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Voice Synthesis Memory
  *
diff --git a/src/emu/machine/steppers.c b/src/emu/machine/steppers.c
index 4bf3f80ba6e..c9456a32230 100644
--- a/src/emu/machine/steppers.c
+++ b/src/emu/machine/steppers.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // steppers.c steppermotor emulation                                     //
diff --git a/src/emu/machine/steppers.h b/src/emu/machine/steppers.h
index 6e7fd90c5a6..f96b374c688 100644
--- a/src/emu/machine/steppers.h
+++ b/src/emu/machine/steppers.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // steppers.c steppermotor emulation                                     //
diff --git a/src/emu/machine/strata.c b/src/emu/machine/strata.c
index aa393db46f8..8932be4fe27 100644
--- a/src/emu/machine/strata.c
+++ b/src/emu/machine/strata.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Intel 28F640J5 Flash ROM emulation (could also handle 28F320J5 with minor
     changes, and possibly 28F256J3, 28F128J3, 28F640J3 and 28F320J3)
diff --git a/src/emu/machine/strata.h b/src/emu/machine/strata.h
index 2341549172e..4e39e20a168 100644
--- a/src/emu/machine/strata.h
+++ b/src/emu/machine/strata.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     strata.h: header file for strata.c
 */
diff --git a/src/emu/machine/t10mmc.c b/src/emu/machine/t10mmc.c
index aee65ffb5ce..fbf0fdc2c8a 100644
--- a/src/emu/machine/t10mmc.c
+++ b/src/emu/machine/t10mmc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "t10mmc.h"
 
 static int to_msf(int frame)
diff --git a/src/emu/machine/t10mmc.h b/src/emu/machine/t10mmc.h
index 7d8ad0a5aa1..748d44cd32b 100644
--- a/src/emu/machine/t10mmc.h
+++ b/src/emu/machine/t10mmc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 t10mmc.h
diff --git a/src/emu/machine/t10sbc.c b/src/emu/machine/t10sbc.c
index 204046e39d6..bb2baf03d90 100644
--- a/src/emu/machine/t10sbc.c
+++ b/src/emu/machine/t10sbc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "t10sbc.h"
 
 void t10sbc::t10_start(device_t &device)
diff --git a/src/emu/machine/t10sbc.h b/src/emu/machine/t10sbc.h
index 321d0c2d5db..6cdddc3075f 100644
--- a/src/emu/machine/t10sbc.h
+++ b/src/emu/machine/t10sbc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 t10sbc.h
diff --git a/src/emu/machine/t10spc.c b/src/emu/machine/t10spc.c
index 8d87a34ca39..3a720f9cc2f 100644
--- a/src/emu/machine/t10spc.c
+++ b/src/emu/machine/t10spc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "t10spc.h"
 
 void t10spc::t10_start(device_t &device)
diff --git a/src/emu/machine/t10spc.h b/src/emu/machine/t10spc.h
index 58d8a8769d3..d73bb97f1b5 100644
--- a/src/emu/machine/t10spc.h
+++ b/src/emu/machine/t10spc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 t10spc.h
diff --git a/src/emu/machine/tc009xlvc.h b/src/emu/machine/tc009xlvc.h
index 6ea809b8e8a..a2255d5f837 100644
--- a/src/emu/machine/tc009xlvc.h
+++ b/src/emu/machine/tc009xlvc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TC0091LVC device
diff --git a/src/emu/machine/terminal.c b/src/emu/machine/terminal.c
index 3c20c0ab0b8..f46bcd3156e 100644
--- a/src/emu/machine/terminal.c
+++ b/src/emu/machine/terminal.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 #include "machine/terminal.h"
 
 #define KEYBOARD_TAG "keyboard"
diff --git a/src/emu/machine/terminal.h b/src/emu/machine/terminal.h
index 9e2944e8806..0a0e2ff9b77 100644
--- a/src/emu/machine/terminal.h
+++ b/src/emu/machine/terminal.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 #ifndef __TERMINAL_H__
 #define __TERMINAL_H__
 
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 64d90ffc42e..668f04a05a6 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     timekpr.h
diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h
index ad5f51cae39..856701744f5 100644
--- a/src/emu/machine/timekpr.h
+++ b/src/emu/machine/timekpr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     timekpr.h
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 4594ea0397f..7cd1dc3daea 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TMP68301 basic emulation + Interrupt Handling
diff --git a/src/emu/machine/tmp68301.h b/src/emu/machine/tmp68301.h
index 692bfdc0f38..627e80e8326 100644
--- a/src/emu/machine/tmp68301.h
+++ b/src/emu/machine/tmp68301.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef TMP68301_H
 #define TMP68301_H
 
diff --git a/src/emu/machine/tms5501.c b/src/emu/machine/tms5501.c
index 09f2e01509f..71f3f298cde 100644
--- a/src/emu/machine/tms5501.c
+++ b/src/emu/machine/tms5501.c
@@ -4,9 +4,6 @@
 
     TMS5501 Multifunction Input/Output Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "tms5501.h"
diff --git a/src/emu/machine/tms5501.h b/src/emu/machine/tms5501.h
index 03b8377b9e6..0a62f751910 100644
--- a/src/emu/machine/tms5501.h
+++ b/src/emu/machine/tms5501.h
@@ -4,9 +4,6 @@
 
     TMS5501 Multifunction Input/Output Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                            _____   _____
                    Vbb   1 |*    \_/     | 40  XMT
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index 2df1cada967..110fdaf7d1c 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
 
      TMS6100 simulator
diff --git a/src/emu/machine/tms6100.h b/src/emu/machine/tms6100.h
index 502cb57969b..458127eed4a 100644
--- a/src/emu/machine/tms6100.h
+++ b/src/emu/machine/tms6100.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS6100_H__
diff --git a/src/emu/machine/upd1990a.c b/src/emu/machine/upd1990a.c
index 30efad1062c..9069deb96a2 100644
--- a/src/emu/machine/upd1990a.c
+++ b/src/emu/machine/upd1990a.c
@@ -4,9 +4,6 @@
 
     NEC uPD1990AC Serial I/O Calendar & Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/upd1990a.h b/src/emu/machine/upd1990a.h
index e8525f9d66e..745f6c6e648 100644
--- a/src/emu/machine/upd1990a.h
+++ b/src/emu/machine/upd1990a.h
@@ -4,9 +4,6 @@
 
     NEC uPD1990AC Serial I/O Calendar & Clock emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     C2   1 |*    \_/     | 14  Vdd
diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c
index 7cbe7204050..da1a9a796ae 100644
--- a/src/emu/machine/upd4701.c
+++ b/src/emu/machine/upd4701.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NEC uPD4701
diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h
index 6d361da3a41..9b9aaa530c4 100644
--- a/src/emu/machine/upd4701.h
+++ b/src/emu/machine/upd4701.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NEC uPD4701
diff --git a/src/emu/machine/upd7002.c b/src/emu/machine/upd7002.c
index 2fc1aedf6bc..a74a07ba19f 100644
--- a/src/emu/machine/upd7002.c
+++ b/src/emu/machine/upd7002.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     uPD7002 Analogue to Digital Converter
 
diff --git a/src/emu/machine/upd7002.h b/src/emu/machine/upd7002.h
index b6fea6a1622..5f562cd7ba0 100644
--- a/src/emu/machine/upd7002.h
+++ b/src/emu/machine/upd7002.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * machine/upd7002.h
diff --git a/src/emu/machine/upd71071.c b/src/emu/machine/upd71071.c
index 0a4484b607f..3cb33f1c84c 100644
--- a/src/emu/machine/upd71071.c
+++ b/src/emu/machine/upd71071.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
 
diff --git a/src/emu/machine/upd71071.h b/src/emu/machine/upd71071.h
index b5717ec05b3..6e23e8e94e9 100644
--- a/src/emu/machine/upd71071.h
+++ b/src/emu/machine/upd71071.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __UPD71071_H__
 #define __UPD71071_H__
 
diff --git a/src/emu/machine/upd765.c b/src/emu/machine/upd765.c
index 2e19c8a2cb1..a53420f7739 100644
--- a/src/emu/machine/upd765.c
+++ b/src/emu/machine/upd765.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "debugger.h"
 
 #include "upd765.h"
diff --git a/src/emu/machine/upd765.h b/src/emu/machine/upd765.h
index d692686be65..4e69b3b424b 100644
--- a/src/emu/machine/upd765.h
+++ b/src/emu/machine/upd765.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __UPD765_F_H__
 #define __UPD765_F_H__
 
diff --git a/src/emu/machine/v3021.c b/src/emu/machine/v3021.c
index dbee7b35bca..4000589de6d 100644
--- a/src/emu/machine/v3021.c
+++ b/src/emu/machine/v3021.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     v3021.c
diff --git a/src/emu/machine/v3021.h b/src/emu/machine/v3021.h
index 3df1d90a821..80604e24fbb 100644
--- a/src/emu/machine/v3021.h
+++ b/src/emu/machine/v3021.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     v3021.h
diff --git a/src/emu/machine/vrc4373.c b/src/emu/machine/vrc4373.c
index 0abfeedbfe3..1303d5ab50d 100644
--- a/src/emu/machine/vrc4373.c
+++ b/src/emu/machine/vrc4373.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "vrc4373.h"
 
 #define LOG_NILE            (0)
diff --git a/src/emu/machine/vrc4373.h b/src/emu/machine/vrc4373.h
index b620e9f6d20..d7c037d0404 100644
--- a/src/emu/machine/vrc4373.h
+++ b/src/emu/machine/vrc4373.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // NEC VRC 4373 System Controller
 
 #ifndef VRC4373_H
diff --git a/src/emu/machine/wd11c00_17.c b/src/emu/machine/wd11c00_17.c
index ef58c805eb9..0f38c32c624 100644
--- a/src/emu/machine/wd11c00_17.c
+++ b/src/emu/machine/wd11c00_17.c
@@ -4,9 +4,6 @@
 
     Western Digital WD11C00-17 PC/XT Host Interface Logic Device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "machine/wd11c00_17.h"
diff --git a/src/emu/machine/wd11c00_17.h b/src/emu/machine/wd11c00_17.h
index 9a49f252563..adc8a9f2c64 100644
--- a/src/emu/machine/wd11c00_17.h
+++ b/src/emu/machine/wd11c00_17.h
@@ -4,9 +4,6 @@
 
     Western Digital WD11C00-17 PC/XT Host Interface Logic Device
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c
index 7dacd8dd939..9782cca826f 100644
--- a/src/emu/machine/wd17xx.c
+++ b/src/emu/machine/wd17xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h
index ac5844fb49a..a4e87bda9fc 100644
--- a/src/emu/machine/wd17xx.h
+++ b/src/emu/machine/wd17xx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
diff --git a/src/emu/machine/wd2010.h b/src/emu/machine/wd2010.h
index c5ef5d1dd7d..678844f28d6 100644
--- a/src/emu/machine/wd2010.h
+++ b/src/emu/machine/wd2010.h
@@ -4,9 +4,6 @@
 
     Western Digital WD2010 Winchester Disk Controller
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c
index 09593c22cfc..ce86cb53c14 100644
--- a/src/emu/machine/wd33c93.c
+++ b/src/emu/machine/wd33c93.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wd33c93.c
  *
diff --git a/src/emu/machine/wd33c93.h b/src/emu/machine/wd33c93.h
index ac9a0fb5379..1ff3801ae84 100644
--- a/src/emu/machine/wd33c93.h
+++ b/src/emu/machine/wd33c93.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wd33c93.h
  *
diff --git a/src/emu/machine/wd7600.c b/src/emu/machine/wd7600.c
index 5d1821471aa..056784286fd 100644
--- a/src/emu/machine/wd7600.c
+++ b/src/emu/machine/wd7600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Western Digital WD7600 PC system chipset
  *
diff --git a/src/emu/machine/wd7600.h b/src/emu/machine/wd7600.h
index c6640e920c2..dee9061c1e9 100644
--- a/src/emu/machine/wd7600.h
+++ b/src/emu/machine/wd7600.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wd7600.h
  *
diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h
index 39467ffd2c4..dcf3df17988 100644
--- a/src/emu/machine/wd_fdc.h
+++ b/src/emu/machine/wd_fdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef WD_FDC_H
 #define WD_FDC_H
 
diff --git a/src/emu/machine/wozfdc.c b/src/emu/machine/wozfdc.c
index 7486d17816e..a8ad87ed49b 100644
--- a/src/emu/machine/wozfdc.c
+++ b/src/emu/machine/wozfdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     wozfdc.c
diff --git a/src/emu/machine/wozfdc.h b/src/emu/machine/wozfdc.h
index d2bb138dcde..58a572aa1f1 100644
--- a/src/emu/machine/wozfdc.h
+++ b/src/emu/machine/wozfdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     wozfdc.h
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index d491d2b0e23..abd9c220c80 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     x2212.c
diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h
index fbe7dfff259..2ec462cccfb 100644
--- a/src/emu/machine/x2212.h
+++ b/src/emu/machine/x2212.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     x2212.h
diff --git a/src/emu/machine/ym2148.c b/src/emu/machine/ym2148.c
index d61be4bed96..8ab7408d9fa 100644
--- a/src/emu/machine/ym2148.c
+++ b/src/emu/machine/ym2148.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
   Yamaha YM-2148 emulation
diff --git a/src/emu/machine/ym2148.h b/src/emu/machine/ym2148.h
index e92b0c6738a..381ba5eba05 100644
--- a/src/emu/machine/ym2148.h
+++ b/src/emu/machine/ym2148.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ym2148.h
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index 1ca2ce556a5..3d1a9f80cd9 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Z80 CTC (Z8430) implementation
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index a9945d547bf..5b66367282b 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Z80 CTC (Z8430) implementation
diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h
index 27376cddde0..27df3dabb82 100644
--- a/src/emu/machine/z80dart.h
+++ b/src/emu/machine/z80dart.h
@@ -7,9 +7,6 @@
     Z80-DART Dual Asynchronous Receiver/Transmitter emulation
     Z80-SIO/0/1/2/3/4 Serial Input/Output Controller emulation
 
-    Copyright (c) 2008, The MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************
                             _____   _____
                    CLK   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index d75afbf4409..c84d532c628 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Z80 DMA interface and emulation
diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h
index f16812ef07b..fda224f1e17 100644
--- a/src/emu/machine/z80dma.h
+++ b/src/emu/machine/z80dma.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Zilog Z80 DMA Direct Memory Access Controller emulation
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index ea5da25e221..6463adc8fb7 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -4,9 +4,6 @@
 
     Zilog Z80 Parallel Input/Output Controller implementation
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 /*
diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h
index c27ac4ecba1..80a458dd4fd 100644
--- a/src/emu/machine/z80pio.h
+++ b/src/emu/machine/z80pio.h
@@ -4,9 +4,6 @@
 
     Zilog Z80 Parallel Input/Output Controller implementation
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************
                             _____   _____
                     D2   1 |*    \_/     | 40  D3
diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c
index 40752ae1ea6..a27295f6ff1 100644
--- a/src/emu/machine/z80sti.c
+++ b/src/emu/machine/z80sti.c
@@ -4,9 +4,6 @@
 
     Mostek MK3801 Serial Timer Interrupt Controller (Z80-STI) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 /*
diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h
index 4065bf6bdcb..1691695147c 100644
--- a/src/emu/machine/z80sti.h
+++ b/src/emu/machine/z80sti.h
@@ -4,9 +4,6 @@
 
     Mostek MK3801 Serial Timer Interrupt Controller (Z80-STI) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    TAO   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/machine/z8536.c b/src/emu/machine/z8536.c
index a497f3aefc4..fc5e770b15a 100644
--- a/src/emu/machine/z8536.c
+++ b/src/emu/machine/z8536.c
@@ -4,9 +4,6 @@
 
     Zilog Z8536 Counter/Timer and Parallel I/O emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/machine/z8536.h b/src/emu/machine/z8536.h
index ffbc30aa9e6..96c39e0123a 100644
--- a/src/emu/machine/z8536.h
+++ b/src/emu/machine/z8536.h
@@ -4,9 +4,6 @@
 
     Zilog Z8536 Counter/Timer and Parallel I/O emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     D4   1 |*    \_/     | 40  D3
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 1af6ccff012..f5865378e81 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mame.c
diff --git a/src/emu/mame.h b/src/emu/mame.h
index 427d11a1000..c54e025a1bf 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mame.h
diff --git a/src/emu/netlist/analog/nld_bjt.c b/src/emu/netlist/analog/nld_bjt.c
index 0341345a2f0..1bd58a07c63 100644
--- a/src/emu/netlist/analog/nld_bjt.c
+++ b/src/emu/netlist/analog/nld_bjt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_bjt.c
  *
diff --git a/src/emu/netlist/analog/nld_bjt.h b/src/emu/netlist/analog/nld_bjt.h
index caf9267c328..9b24ac1f00f 100644
--- a/src/emu/netlist/analog/nld_bjt.h
+++ b/src/emu/netlist/analog/nld_bjt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_bjt.h
  *
diff --git a/src/emu/netlist/analog/nld_fourterm.c b/src/emu/netlist/analog/nld_fourterm.c
index ec8ae087ec6..dee0a8c6ba2 100644
--- a/src/emu/netlist/analog/nld_fourterm.c
+++ b/src/emu/netlist/analog/nld_fourterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_fourterm.c
  *
diff --git a/src/emu/netlist/analog/nld_fourterm.h b/src/emu/netlist/analog/nld_fourterm.h
index 94334ced90f..345c7d616bf 100644
--- a/src/emu/netlist/analog/nld_fourterm.h
+++ b/src/emu/netlist/analog/nld_fourterm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_fourterm.h
  *
diff --git a/src/emu/netlist/analog/nld_ms_direct.h b/src/emu/netlist/analog/nld_ms_direct.h
index 42e29d04b33..d78ea4a27d7 100644
--- a/src/emu/netlist/analog/nld_ms_direct.h
+++ b/src/emu/netlist/analog/nld_ms_direct.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_ms_direct.h
  *
@@ -21,7 +23,7 @@ public:
 	ATTR_COLD virtual void vsetup(netlist_analog_net_t::list_t &nets);
 	ATTR_COLD virtual void reset() { netlist_matrix_solver_t::reset(); }
 
-	ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
+	ATTR_HOT inline const int N() const { return (m_N == 0 ? m_dim : m_N); }
 
 	ATTR_HOT inline int vsolve_non_dynamic();
 
@@ -52,7 +54,6 @@ protected:
 	terms_t *m_rails_temp;
 
 private:
-	vector_ops_t *m_row_ops[_storage_N + 1];
 
 	int m_dim;
 	nl_double m_lp_fact;
@@ -72,9 +73,7 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::~netlist_matrix_solver_direct_t
 	for (int k = 0; k < N(); k++)
 	{
 		nl_free(m_terms[k]);
-		nl_free(m_row_ops[k]);
 	}
-	nl_free(m_row_ops[N()]);
 	//delete[] m_last_RHS;
 	//delete[] m_RHS;
 	nl_free_array(m_terms);
@@ -243,16 +242,12 @@ ATTR_HOT void netlist_matrix_solver_direct_t<m_N, _storage_N>::build_LE()
 			const nl_double * RESTRICT gt = m_terms[k]->gt();
 			const nl_double * RESTRICT go = m_terms[k]->go();
 			const nl_double * RESTRICT Idr = m_terms[k]->Idr();
-#if VECTALT
-
 			for (int i = 0; i < terms_count; i++)
 			{
 				rhsk = rhsk + Idr[i];
 				akk = akk + gt[i];
 			}
-#else
-			m_terms[k]->ops()->sum2(Idr, gt, rhsk, akk);
-#endif
+
 			nl_double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog();
 			for (int i = m_terms[k]->m_railstart; i < terms_count; i++)
 			{
@@ -345,13 +340,8 @@ ATTR_HOT void netlist_matrix_solver_direct_t<m_N, _storage_N>::gauss_LE(
 			const nl_double f1 = - m_A[j][i] * f;
 			if (f1 != 0.0)
 			{
-#if 0 && VECTALT
 				for (int k = i + 1; k < kN; k++)
 					m_A[j][k] += m_A[i][k] * f1;
-#else
-				// addmult gives some performance increase here...
-				m_row_ops[kN - (i + 1)]->addmult(&m_A[j][i+1], &m_A[i][i+1], f1) ;
-#endif
 				m_RHS[j] += m_RHS[i] * f1;
 			}
 		}
@@ -464,9 +454,7 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::netlist_matrix_solver_direct_t(
 	for (int k = 0; k < N(); k++)
 	{
 		m_terms[k] = nl_alloc(terms_t);
-		m_row_ops[k] = vector_ops_t::create_ops(k);
 	}
-	m_row_ops[N()] = vector_ops_t::create_ops(N());
 }
 
 template <int m_N, int _storage_N>
@@ -481,9 +469,7 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::netlist_matrix_solver_direct_t(
 	for (int k = 0; k < N(); k++)
 	{
 		m_terms[k] = nl_alloc(terms_t);
-		m_row_ops[k] = vector_ops_t::create_ops(k);
 	}
-	m_row_ops[N()] = vector_ops_t::create_ops(N());
 }
 
 
diff --git a/src/emu/netlist/analog/nld_ms_direct1.h b/src/emu/netlist/analog/nld_ms_direct1.h
index b1873b8e636..bc213287992 100644
--- a/src/emu/netlist/analog/nld_ms_direct1.h
+++ b/src/emu/netlist/analog/nld_ms_direct1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_ms_direct1.h
  *
diff --git a/src/emu/netlist/analog/nld_ms_direct2.h b/src/emu/netlist/analog/nld_ms_direct2.h
index 25bb1dba3ca..340c527c0e5 100644
--- a/src/emu/netlist/analog/nld_ms_direct2.h
+++ b/src/emu/netlist/analog/nld_ms_direct2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_ms_direct1.h
  *
diff --git a/src/emu/netlist/analog/nld_ms_gauss_seidel.h b/src/emu/netlist/analog/nld_ms_gauss_seidel.h
index a3641c0b29b..35f64cebb3a 100644
--- a/src/emu/netlist/analog/nld_ms_gauss_seidel.h
+++ b/src/emu/netlist/analog/nld_ms_gauss_seidel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_ms_direct1.h
  *
@@ -260,6 +262,7 @@ ATTR_HOT inline int netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolv
 	ATTR_ALIGN nl_double one_m_w[_storage_N];
 	ATTR_ALIGN nl_double RHS[_storage_N];
 	ATTR_ALIGN nl_double new_V[_storage_N];
+	ATTR_ALIGN nl_double old_V[_storage_N];
 
 	for (int k = 0; k < iN; k++)
 	{
@@ -275,21 +278,15 @@ ATTR_HOT inline int netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolv
 			const nl_double * const RESTRICT go = this->m_terms[k]->go();
 			const nl_double * const RESTRICT Idr = this->m_terms[k]->Idr();
 			const nl_double * const *other_cur_analog = this->m_terms[k]->other_curanalog();
-#if VECTALT
+
 			for (int i = 0; i < term_count; i++)
 			{
 				gtot_t = gtot_t + gt[i];
 				RHS_t = RHS_t + Idr[i];
-			}
-			if (USE_GABS)
-				for (int i = 0; i < term_count; i++)
+				if (USE_GABS)
 					gabs_t = gabs_t + fabs(go[i]);
-#else
-			if (USE_GABS)
-				this->m_terms[k]->ops()->sum2a(gt, Idr, go, gtot_t, RHS_t, gabs_t);
-			else
-				this->m_terms[k]->ops()->sum2(gt, Idr, gtot_t, RHS_t);
-#endif
+			}
+
 			for (int i = this->m_terms[k]->m_railstart; i < term_count; i++)
 				RHS_t = RHS_t  + go[i] * *other_cur_analog[i];
 		}
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c
index 697b504e415..0a015516fbd 100644
--- a/src/emu/netlist/analog/nld_opamps.c
+++ b/src/emu/netlist/analog/nld_opamps.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_opamps.c
  *
diff --git a/src/emu/netlist/analog/nld_solver.c b/src/emu/netlist/analog/nld_solver.c
index 62b1661abcf..1e01f34becc 100644
--- a/src/emu/netlist/analog/nld_solver.c
+++ b/src/emu/netlist/analog/nld_solver.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_solver.c
  *
@@ -39,39 +41,6 @@
 #include "omp.h"
 #endif
 
-vector_ops_t *vector_ops_t::create_ops(const int size)
-{
-	switch (size)
-	{
-		case 1:
-			return nl_alloc(vector_ops_impl_t<1>);
-		case 2:
-			return nl_alloc(vector_ops_impl_t<2>);
-		case 3:
-			return nl_alloc(vector_ops_impl_t<3>);
-		case 4:
-			return nl_alloc(vector_ops_impl_t<4>);
-		case 5:
-			return nl_alloc(vector_ops_impl_t<5>);
-		case 6:
-			return nl_alloc(vector_ops_impl_t<6>);
-		case 7:
-			return nl_alloc(vector_ops_impl_t<7>);
-		case 8:
-			return nl_alloc(vector_ops_impl_t<8>);
-		case 9:
-			return nl_alloc(vector_ops_impl_t<9>);
-		case 10:
-			return nl_alloc(vector_ops_impl_t<10>);
-		case 11:
-			return nl_alloc(vector_ops_impl_t<11>);
-		case 12:
-			return nl_alloc(vector_ops_impl_t<12>);
-		default:
-			return nl_alloc(vector_ops_impl_t<0>, size);
-	}
-}
-
 ATTR_COLD void terms_t::add(netlist_terminal_t *term, int net_other)
 {
 	m_term.add(term);
@@ -556,7 +525,7 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start()
 				break;
 		}
 
-		register_sub(*ms, pstring::sprintf("Solver %d",m_mat_solvers.count()));
+		register_sub(*ms, pstring::sprintf("Solver_%d",m_mat_solvers.count()));
 
 		ms->vsetup(groups[i]);
 
diff --git a/src/emu/netlist/analog/nld_solver.h b/src/emu/netlist/analog/nld_solver.h
index a0cdec5c786..dcca5d474bf 100644
--- a/src/emu/netlist/analog/nld_solver.h
+++ b/src/emu/netlist/analog/nld_solver.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_solver.h
  *
@@ -48,107 +50,6 @@ struct netlist_solver_parameters_t
 	netlist_time m_nt_sync_delay;
 };
 
-class vector_ops_t
-{
-public:
-
-	vector_ops_t(int size)
-	: m_dim(size)
-	{
-	}
-
-	virtual ~vector_ops_t() {}
-
-	virtual const nl_double sum(const nl_double * v) = 0;
-	virtual void sum2(const nl_double * RESTRICT v1, const nl_double * RESTRICT v2, nl_double & RESTRICT  s1, nl_double & RESTRICT s2) = 0;
-	virtual void addmult(nl_double * RESTRICT v1, const nl_double * RESTRICT v2, const nl_double &mult) = 0;
-	virtual void sum2a(const nl_double * RESTRICT v1, const nl_double * RESTRICT v2, const nl_double * RESTRICT v3abs, nl_double & RESTRICT s1, nl_double & RESTRICT s2, nl_double & RESTRICT s3abs) = 0;
-
-	virtual const nl_double sumabs(const nl_double * v) = 0;
-
-	static vector_ops_t *create_ops(const int size);
-
-protected:
-	int m_dim;
-
-private:
-
-};
-
-template <int m_N>
-class vector_ops_impl_t : public vector_ops_t
-{
-public:
-
-	vector_ops_impl_t()
-	: vector_ops_t(m_N)
-	{
-	}
-
-	vector_ops_impl_t(int size)
-	: vector_ops_t(size)
-	{
-		nl_assert(m_N == 0);
-	}
-
-	virtual ~vector_ops_impl_t() {}
-
-	ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
-
-	const nl_double sum(const nl_double * v)
-	{
-		const nl_double *  RESTRICT vl = v;
-		nl_double tmp = 0.0;
-		for (int i=0; i < N(); i++)
-			tmp += vl[i];
-		return tmp;
-	}
-
-	void sum2(const nl_double * RESTRICT v1, const nl_double * RESTRICT v2, nl_double & RESTRICT s1, nl_double & RESTRICT s2)
-	{
-		const nl_double * RESTRICT v1l = v1;
-		const nl_double * RESTRICT v2l = v2;
-		for (int i=0; i < N(); i++)
-		{
-			s1 += v1l[i];
-			s2 += v2l[i];
-		}
-	}
-
-	void addmult(nl_double * RESTRICT v1, const nl_double * RESTRICT v2, const nl_double &mult)
-	{
-		nl_double * RESTRICT v1l = v1;
-		const nl_double * RESTRICT v2l = v2;
-		for (int i=0; i < N(); i++)
-		{
-			v1l[i] += v2l[i] * mult;
-		}
-	}
-
-	void sum2a(const nl_double * RESTRICT v1, const nl_double * RESTRICT v2, const nl_double * RESTRICT v3abs, nl_double & RESTRICT s1, nl_double & RESTRICT s2, nl_double & RESTRICT s3abs)
-	{
-		const nl_double * RESTRICT v1l = v1;
-		const nl_double * RESTRICT v2l = v2;
-		const nl_double * RESTRICT v3l = v3abs;
-		for (int i=0; i < N(); i++)
-		{
-			s1 += v1l[i];
-			s2 += v2l[i];
-			s3abs += fabs(v3l[i]);
-		}
-	}
-
-	const nl_double sumabs(const nl_double * v)
-	{
-		const nl_double * RESTRICT vl = v;
-		nl_double tmp = 0.0;
-		for (int i=0; i < N(); i++)
-			tmp += fabs(vl[i]);
-		return tmp;
-	}
-
-private:
-};
 
 class ATTR_ALIGNED(64) terms_t
 {
diff --git a/src/emu/netlist/analog/nld_switches.c b/src/emu/netlist/analog/nld_switches.c
index 45d45f6ad83..8121d9788e0 100644
--- a/src/emu/netlist/analog/nld_switches.c
+++ b/src/emu/netlist/analog/nld_switches.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_legacy.c
  *
diff --git a/src/emu/netlist/analog/nld_twoterm.c b/src/emu/netlist/analog/nld_twoterm.c
index c11cea1a4aa..dd9908a1d03 100644
--- a/src/emu/netlist/analog/nld_twoterm.c
+++ b/src/emu/netlist/analog/nld_twoterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_twoterm.c
  *
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index ed2f7ae8d27..a30b3707561 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -99,6 +99,7 @@ void nl_initialize_factory(netlist_factory_t &factory)
 	ENTRY(log,                  LOG,                    "+I")
 	ENTRY(logD,                 LOGD,                   "+I,I2")
 	ENTRY(clock,                CLOCK,                  "FREQ")
+	ENTRY(extclock,             EXTCLOCK,               "FREQ")
 	ENTRY(mainclock,            MAINCLOCK,              "FREQ")
 	ENTRY(solver,               SOLVER,                 "FREQ")
 	ENTRY(res_sw,               RES_SWITCH,             "+IN,P1,P2")
diff --git a/src/emu/netlist/devices/nld_4020.c b/src/emu/netlist/devices/nld_4020.c
index 48109d206d4..8176f8bdbfb 100644
--- a/src/emu/netlist/devices/nld_4020.c
+++ b/src/emu/netlist/devices/nld_4020.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_4020.c
  *
diff --git a/src/emu/netlist/devices/nld_4020.h b/src/emu/netlist/devices/nld_4020.h
index 3ecf7923a38..10d5fa4e1da 100644
--- a/src/emu/netlist/devices/nld_4020.h
+++ b/src/emu/netlist/devices/nld_4020.h
@@ -47,7 +47,7 @@ NETLIB_SUBDEVICE(4020_sub,
 
 	netlist_ttl_input_t m_IP;
 
-	netlist_state_t<UINT16> m_cnt;
+	UINT16 m_cnt;
 
 	netlist_ttl_output_t m_Q[14];
 );
diff --git a/src/emu/netlist/devices/nld_4066.c b/src/emu/netlist/devices/nld_4066.c
index f512fdd598d..7a50982f7fa 100644
--- a/src/emu/netlist/devices/nld_4066.c
+++ b/src/emu/netlist/devices/nld_4066.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_4066.c
  *
@@ -20,10 +22,10 @@ NETLIB_RESET(4066)
 
 NETLIB_UPDATE(4066)
 {
-	nl_double sup = (m_supply.get()->vdd() - m_supply.get()->vss());
+	nl_double sup = (m_supply->vdd() - m_supply->vss());
 	nl_double low = 0.45 * sup;
 	nl_double high = 0.55 * sup;
-	nl_double in = INPANALOG(m_control) - m_supply.get()->vss();
+	nl_double in = INPANALOG(m_control) - m_supply->vss();
 	nl_double rON = m_base_r * 5.0 / sup;
 	nl_double R = -1.0;
 
diff --git a/src/emu/netlist/devices/nld_4066.h b/src/emu/netlist/devices/nld_4066.h
index 63bb7b764e3..d70b4047803 100644
--- a/src/emu/netlist/devices/nld_4066.h
+++ b/src/emu/netlist/devices/nld_4066.h
@@ -40,8 +40,8 @@ public:
 	netlist_analog_input_t m_control;
 	NETLIB_NAME(R) m_R;
 
-	netlist_state_t<NETLIB_NAME(vdd_vss) *>m_supply;
-	netlist_state_t<nl_double> m_base_r;
+	NETLIB_NAME(vdd_vss) *m_supply;
+	nl_double m_base_r;
 );
 
 NETLIB_DEVICE(4066_dip,
diff --git a/src/emu/netlist/devices/nld_7400.c b/src/emu/netlist/devices/nld_7400.c
index 32122aa4aa2..1b4195880af 100644
--- a/src/emu/netlist/devices/nld_7400.c
+++ b/src/emu/netlist/devices/nld_7400.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7400.c
  *
diff --git a/src/emu/netlist/devices/nld_7402.c b/src/emu/netlist/devices/nld_7402.c
index 9c2bac7c50f..a30adfd0264 100644
--- a/src/emu/netlist/devices/nld_7402.c
+++ b/src/emu/netlist/devices/nld_7402.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7402.c
  *
diff --git a/src/emu/netlist/devices/nld_7404.c b/src/emu/netlist/devices/nld_7404.c
index e0f1dd59e19..cf933d07006 100644
--- a/src/emu/netlist/devices/nld_7404.c
+++ b/src/emu/netlist/devices/nld_7404.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7404.c
  *
diff --git a/src/emu/netlist/devices/nld_7408.c b/src/emu/netlist/devices/nld_7408.c
index 788d68af196..e8d8167a8a0 100644
--- a/src/emu/netlist/devices/nld_7408.c
+++ b/src/emu/netlist/devices/nld_7408.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7408.c
  *
diff --git a/src/emu/netlist/devices/nld_7410.c b/src/emu/netlist/devices/nld_7410.c
index 6e68517fe58..2e3006a5caa 100644
--- a/src/emu/netlist/devices/nld_7410.c
+++ b/src/emu/netlist/devices/nld_7410.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7410.c
  *
diff --git a/src/emu/netlist/devices/nld_74107.c b/src/emu/netlist/devices/nld_74107.c
index 84743900c66..db8e9ce7338 100644
--- a/src/emu/netlist/devices/nld_74107.c
+++ b/src/emu/netlist/devices/nld_74107.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74107.c
  *
diff --git a/src/emu/netlist/devices/nld_74107.h b/src/emu/netlist/devices/nld_74107.h
index 8f96841d3c0..150516a00c3 100644
--- a/src/emu/netlist/devices/nld_74107.h
+++ b/src/emu/netlist/devices/nld_74107.h
@@ -80,9 +80,9 @@ NETLIB_SUBDEVICE(74107Asub,
 	netlist_ttl_output_t m_Q;
 	netlist_ttl_output_t m_QQ;
 
-	netlist_state_t<netlist_sig_t> m_Q1;
-	netlist_state_t<netlist_sig_t> m_Q2;
-	netlist_state_t<netlist_sig_t> m_F;
+	netlist_sig_t m_Q1;
+	netlist_sig_t m_Q2;
+	netlist_sig_t m_F;
 
 	ATTR_HOT void newstate(const netlist_sig_t state);
 
diff --git a/src/emu/netlist/devices/nld_7411.c b/src/emu/netlist/devices/nld_7411.c
index eefa0c7f81a..43422aa722e 100644
--- a/src/emu/netlist/devices/nld_7411.c
+++ b/src/emu/netlist/devices/nld_7411.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7411.c
  *
diff --git a/src/emu/netlist/devices/nld_74123.c b/src/emu/netlist/devices/nld_74123.c
index df7f7eaacb7..7c76f2d3354 100644
--- a/src/emu/netlist/devices/nld_74123.c
+++ b/src/emu/netlist/devices/nld_74123.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74123.c
  *
diff --git a/src/emu/netlist/devices/nld_74123.h b/src/emu/netlist/devices/nld_74123.h
index de030f38db4..a5c9f430577 100644
--- a/src/emu/netlist/devices/nld_74123.h
+++ b/src/emu/netlist/devices/nld_74123.h
@@ -59,9 +59,9 @@ public:
 
 	netlist_analog_input_t m_CV;
 
-	netlist_state_t<netlist_sig_t> m_last_trig;
-	netlist_state_t<UINT8>         m_state;
-	netlist_state_t<double>        m_KP;
+	netlist_sig_t m_last_trig;
+	UINT8         m_state;
+	double        m_KP;
 
 	netlist_param_double_t m_K;
 	netlist_param_double_t m_RI;
diff --git a/src/emu/netlist/devices/nld_74153.c b/src/emu/netlist/devices/nld_74153.c
index 461d388fcf9..5d42a034eb4 100644
--- a/src/emu/netlist/devices/nld_74153.c
+++ b/src/emu/netlist/devices/nld_74153.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74153.c
  *
diff --git a/src/emu/netlist/devices/nld_74153.h b/src/emu/netlist/devices/nld_74153.h
index 5f633ef00f0..03c942f9a70 100644
--- a/src/emu/netlist/devices/nld_74153.h
+++ b/src/emu/netlist/devices/nld_74153.h
@@ -66,7 +66,7 @@ NETLIB_SUBDEVICE(74153sub,
 
 	netlist_ttl_output_t m_Y;
 
-	netlist_state_t<int> m_chan;
+	int m_chan;
 );
 
 NETLIB_DEVICE(74153,
diff --git a/src/emu/netlist/devices/nld_74175.c b/src/emu/netlist/devices/nld_74175.c
index 613f5c75682..98e7a4b0bd9 100644
--- a/src/emu/netlist/devices/nld_74175.c
+++ b/src/emu/netlist/devices/nld_74175.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74175.c
  *
diff --git a/src/emu/netlist/devices/nld_74175.h b/src/emu/netlist/devices/nld_74175.h
index 47b094f1ba2..08c825ca09e 100644
--- a/src/emu/netlist/devices/nld_74175.h
+++ b/src/emu/netlist/devices/nld_74175.h
@@ -50,8 +50,8 @@ NETLIB_SUBDEVICE(74175_sub,
 	netlist_ttl_output_t m_Q[4];
 	netlist_ttl_output_t m_QQ[4];
 
-	netlist_state_t<netlist_sig_t> m_clrq;
-	netlist_state_t<UINT8> m_data;
+	netlist_sig_t m_clrq;
+	UINT8 m_data;
 );
 
 NETLIB_DEVICE(74175,
diff --git a/src/emu/netlist/devices/nld_74192.c b/src/emu/netlist/devices/nld_74192.c
index b2a7e4d80e7..97577173650 100644
--- a/src/emu/netlist/devices/nld_74192.c
+++ b/src/emu/netlist/devices/nld_74192.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74192.c
  *
diff --git a/src/emu/netlist/devices/nld_74192.h b/src/emu/netlist/devices/nld_74192.h
index 2b5ba415940..036358db9b5 100644
--- a/src/emu/netlist/devices/nld_74192.h
+++ b/src/emu/netlist/devices/nld_74192.h
@@ -47,9 +47,9 @@ NETLIB_DEVICE(74192,
 	netlist_ttl_input_t m_CU;
 	netlist_ttl_input_t m_CD;
 
-	netlist_state_t<INT8> m_cnt;
-	netlist_state_t<UINT8> m_last_CU;
-	netlist_state_t<UINT8> m_last_CD;
+	INT8 m_cnt;
+	UINT8 m_last_CU;
+	UINT8 m_last_CD;
 
 	netlist_ttl_output_t m_Q[4];
 	netlist_ttl_output_t m_BORROWQ;
diff --git a/src/emu/netlist/devices/nld_74193.c b/src/emu/netlist/devices/nld_74193.c
index 8b67a22340d..94f3d6c919b 100644
--- a/src/emu/netlist/devices/nld_74193.c
+++ b/src/emu/netlist/devices/nld_74193.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74193.c
  *
diff --git a/src/emu/netlist/devices/nld_74193.h b/src/emu/netlist/devices/nld_74193.h
index fc2a7de8105..ffe92f5fd94 100644
--- a/src/emu/netlist/devices/nld_74193.h
+++ b/src/emu/netlist/devices/nld_74193.h
@@ -46,9 +46,9 @@ NETLIB_DEVICE(74193,
 	netlist_ttl_input_t m_CU;
 	netlist_ttl_input_t m_CD;
 
-	netlist_state_t<INT8> m_cnt;
-	netlist_state_t<UINT8> m_last_CU;
-	netlist_state_t<UINT8> m_last_CD;
+	INT8 m_cnt;
+	UINT8 m_last_CU;
+	UINT8 m_last_CD;
 
 	netlist_ttl_output_t m_Q[4];
 	netlist_ttl_output_t m_BORROWQ;
diff --git a/src/emu/netlist/devices/nld_7420.c b/src/emu/netlist/devices/nld_7420.c
index 538b666643c..eed7ecd82e1 100644
--- a/src/emu/netlist/devices/nld_7420.c
+++ b/src/emu/netlist/devices/nld_7420.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7420.c
  *
diff --git a/src/emu/netlist/devices/nld_7425.c b/src/emu/netlist/devices/nld_7425.c
index b588dc9dc7b..abe24ae84bc 100644
--- a/src/emu/netlist/devices/nld_7425.c
+++ b/src/emu/netlist/devices/nld_7425.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7425.c
  *
diff --git a/src/emu/netlist/devices/nld_7427.c b/src/emu/netlist/devices/nld_7427.c
index 0a5873dba9e..17bc4346828 100644
--- a/src/emu/netlist/devices/nld_7427.c
+++ b/src/emu/netlist/devices/nld_7427.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7427.c
  *
diff --git a/src/emu/netlist/devices/nld_74279.c b/src/emu/netlist/devices/nld_74279.c
index 163bf1c593f..de9a4d1ca57 100644
--- a/src/emu/netlist/devices/nld_74279.c
+++ b/src/emu/netlist/devices/nld_74279.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_74279.c
  *
diff --git a/src/emu/netlist/devices/nld_7430.c b/src/emu/netlist/devices/nld_7430.c
index 6d481fdc74d..e2915c84174 100644
--- a/src/emu/netlist/devices/nld_7430.c
+++ b/src/emu/netlist/devices/nld_7430.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7430.c
  *
diff --git a/src/emu/netlist/devices/nld_7432.c b/src/emu/netlist/devices/nld_7432.c
index 95c6326991c..66e3edad624 100644
--- a/src/emu/netlist/devices/nld_7432.c
+++ b/src/emu/netlist/devices/nld_7432.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7432.c
  *
diff --git a/src/emu/netlist/devices/nld_7437.c b/src/emu/netlist/devices/nld_7437.c
index 8462cec3b1f..026c479a104 100644
--- a/src/emu/netlist/devices/nld_7437.c
+++ b/src/emu/netlist/devices/nld_7437.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7437.c
  *
diff --git a/src/emu/netlist/devices/nld_7448.c b/src/emu/netlist/devices/nld_7448.c
index 03202eb8724..1f46fb14abf 100644
--- a/src/emu/netlist/devices/nld_7448.c
+++ b/src/emu/netlist/devices/nld_7448.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7448.c
  *
diff --git a/src/emu/netlist/devices/nld_7448.h b/src/emu/netlist/devices/nld_7448.h
index f1b0fd7fcaa..2c06638f93a 100644
--- a/src/emu/netlist/devices/nld_7448.h
+++ b/src/emu/netlist/devices/nld_7448.h
@@ -49,7 +49,7 @@ NETLIB_SUBDEVICE(7448_sub,
 	netlist_ttl_input_t m_D;
 	netlist_ttl_input_t m_RBIQ;
 
-	netlist_state_t<UINT8> m_state;
+	UINT8 m_state;
 
 	netlist_ttl_output_t m_a;
 	netlist_ttl_output_t m_b;
diff --git a/src/emu/netlist/devices/nld_7450.c b/src/emu/netlist/devices/nld_7450.c
index 9c16cd0537a..e2b0142fccb 100644
--- a/src/emu/netlist/devices/nld_7450.c
+++ b/src/emu/netlist/devices/nld_7450.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7450.c
  *
diff --git a/src/emu/netlist/devices/nld_7474.c b/src/emu/netlist/devices/nld_7474.c
index d04238c0d7e..a0847e510a4 100644
--- a/src/emu/netlist/devices/nld_7474.c
+++ b/src/emu/netlist/devices/nld_7474.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7474.c
  *
diff --git a/src/emu/netlist/devices/nld_7474.h b/src/emu/netlist/devices/nld_7474.h
index 3452400dd54..d2d8ac08cf2 100644
--- a/src/emu/netlist/devices/nld_7474.h
+++ b/src/emu/netlist/devices/nld_7474.h
@@ -57,7 +57,7 @@
 NETLIB_SUBDEVICE(7474sub,
 	netlist_ttl_input_t m_CLK;
 
-	netlist_state_t<UINT8> m_nextD;
+	INT8 m_nextD;
 	netlist_ttl_output_t m_Q;
 	netlist_ttl_output_t m_QQ;
 
diff --git a/src/emu/netlist/devices/nld_7483.c b/src/emu/netlist/devices/nld_7483.c
index b0f2478e895..0bbc52dd543 100644
--- a/src/emu/netlist/devices/nld_7483.c
+++ b/src/emu/netlist/devices/nld_7483.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7483.c
  *
diff --git a/src/emu/netlist/devices/nld_7483.h b/src/emu/netlist/devices/nld_7483.h
index 82a3e2f4f8f..d2da6ecc517 100644
--- a/src/emu/netlist/devices/nld_7483.h
+++ b/src/emu/netlist/devices/nld_7483.h
@@ -55,7 +55,7 @@ NETLIB_DEVICE(7483,
 	netlist_ttl_input_t m_B3;
 	netlist_ttl_input_t m_B4;
 
-	netlist_state_t<UINT8> m_lastr;
+	UINT8 m_lastr;
 
 	netlist_ttl_output_t m_S1;
 	netlist_ttl_output_t m_S2;
diff --git a/src/emu/netlist/devices/nld_7486.c b/src/emu/netlist/devices/nld_7486.c
index 4eddfb828ef..c7f12a85d2d 100644
--- a/src/emu/netlist/devices/nld_7486.c
+++ b/src/emu/netlist/devices/nld_7486.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7486.c
  *
@@ -16,9 +18,10 @@ NETLIB_RESET(7486)
 {
 }
 
+static const netlist_time delay[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) };
+
 NETLIB_UPDATE(7486)
 {
-	static const netlist_time delay[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) };
 	UINT8 t = INPLOGIC(m_A) ^ INPLOGIC(m_B);
 	OUTLOGIC(m_Q, t, delay[t]);
 }
diff --git a/src/emu/netlist/devices/nld_7490.c b/src/emu/netlist/devices/nld_7490.c
index 26c8e147904..f5eaf85647e 100644
--- a/src/emu/netlist/devices/nld_7490.c
+++ b/src/emu/netlist/devices/nld_7490.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7490.c
  *
diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h
index 1a83dbaa711..4b4d84ff612 100644
--- a/src/emu/netlist/devices/nld_7490.h
+++ b/src/emu/netlist/devices/nld_7490.h
@@ -80,9 +80,9 @@ NETLIB_DEVICE(7490,
 	netlist_ttl_input_t m_A;
 	netlist_ttl_input_t m_B;
 
-	netlist_state_t<UINT8> m_cnt;
-	netlist_state_t<UINT8> m_last_A;
-	netlist_state_t<UINT8> m_last_B;
+	UINT8 m_cnt;
+	UINT8 m_last_A;
+	UINT8 m_last_B;
 
 	netlist_ttl_output_t m_Q[4];
 );
diff --git a/src/emu/netlist/devices/nld_7493.c b/src/emu/netlist/devices/nld_7493.c
index 408ded68db0..1631eb4a2f5 100644
--- a/src/emu/netlist/devices/nld_7493.c
+++ b/src/emu/netlist/devices/nld_7493.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_7493.c
  *
diff --git a/src/emu/netlist/devices/nld_7493.h b/src/emu/netlist/devices/nld_7493.h
index 4ff18ec9e18..8c856048a7c 100644
--- a/src/emu/netlist/devices/nld_7493.h
+++ b/src/emu/netlist/devices/nld_7493.h
@@ -73,7 +73,7 @@ NETLIB_SUBDEVICE(7493ff,
 	netlist_ttl_input_t m_I;
 	netlist_ttl_output_t m_Q;
 
-	netlist_state_t<UINT8> m_reset;
+	UINT8 m_reset;
 );
 
 NETLIB_DEVICE(7493,
diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c
index 32525d825b9..5b7f2b4e68b 100644
--- a/src/emu/netlist/devices/nld_74ls629.c
+++ b/src/emu/netlist/devices/nld_74ls629.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_SN74LS629.c
  *
diff --git a/src/emu/netlist/devices/nld_74ls629.h b/src/emu/netlist/devices/nld_74ls629.h
index c32c0c283ad..c571b5c29ed 100644
--- a/src/emu/netlist/devices/nld_74ls629.h
+++ b/src/emu/netlist/devices/nld_74ls629.h
@@ -40,8 +40,8 @@ NETLIB_SUBDEVICE(SN74LS629clk,
 	netlist_logic_output_t m_Y;
 
 	netlist_time m_inc;
-	netlist_state_t<netlist_sig_t> m_enableq;
-	netlist_state_t<netlist_sig_t> m_out;
+	netlist_sig_t m_enableq;
+	netlist_sig_t m_out;
 );
 
 NETLIB_DEVICE_WITH_PARAMS(SN74LS629,
diff --git a/src/emu/netlist/devices/nld_82S16.c b/src/emu/netlist/devices/nld_82S16.c
index 368a9060138..545bba2167a 100644
--- a/src/emu/netlist/devices/nld_82S16.c
+++ b/src/emu/netlist/devices/nld_82S16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_82S16.c
  *
@@ -84,7 +86,10 @@ NETLIB_START(82S16_dip)
 	register_input("12",    m_WEQ);
 	register_input("13",    m_DIN);
 
-	register_output("6",   m_DOUTQ);}
+	register_output("6",    m_DOUTQ);
+
+	save(NLNAME(m_ram));
+}
 
 NETLIB_RESET(82S16_dip)
 {
diff --git a/src/emu/netlist/devices/nld_82S16.h b/src/emu/netlist/devices/nld_82S16.h
index 6992e252ca3..1d3c64e0ca6 100644
--- a/src/emu/netlist/devices/nld_82S16.h
+++ b/src/emu/netlist/devices/nld_82S16.h
@@ -33,7 +33,6 @@
 
 NETLIB_DEVICE(82S16,
 
-	UINT8 m_ram[256];
 	netlist_ttl_input_t m_A[8];
 	netlist_ttl_input_t m_CE1Q;
 	netlist_ttl_input_t m_CE2Q;
@@ -41,6 +40,9 @@ NETLIB_DEVICE(82S16,
 	netlist_ttl_input_t m_WEQ;
 	netlist_ttl_input_t m_DIN;
 	netlist_ttl_output_t m_DOUTQ;
+
+	//netlist_state_t<UINT8[256]> m_ram;
+	UINT8 m_ram[256];
 );
 
 NETLIB_DEVICE_DERIVED(82S16_dip, 82S16,
diff --git a/src/emu/netlist/devices/nld_9310.c b/src/emu/netlist/devices/nld_9310.c
index 9d31f2cf13c..77f9e9d1cd4 100644
--- a/src/emu/netlist/devices/nld_9310.c
+++ b/src/emu/netlist/devices/nld_9310.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_9310.c
  *
@@ -94,7 +96,7 @@ NETLIB_UPDATE(9310_sub)
 		update_outputs(m_cnt);
 		OUTLOGIC(m_RC, m_ent & (m_cnt == MAXCNT), NLTIME_FROM_NS(20));
 #else
-		switch (m_cnt.get())
+		switch (m_cnt)
 		{
 			case MAXCNT - 1:
 				m_cnt = MAXCNT;
@@ -114,7 +116,7 @@ NETLIB_UPDATE(9310_sub)
 	}
 	else
 	{
-		m_cnt = m_ABCD.get()->read_ABCD();
+		m_cnt = m_ABCD->read_ABCD();
 		update_outputs_all(m_cnt, NLTIME_FROM_NS(22));
 		OUTLOGIC(m_RC, m_ent & (m_cnt == MAXCNT), NLTIME_FROM_NS(27));
 	}
diff --git a/src/emu/netlist/devices/nld_9310.h b/src/emu/netlist/devices/nld_9310.h
index 35d6f14a3c1..95e3061bdca 100644
--- a/src/emu/netlist/devices/nld_9310.h
+++ b/src/emu/netlist/devices/nld_9310.h
@@ -81,10 +81,10 @@ NETLIB_SUBDEVICE(9310_sub,
 
 	netlist_ttl_input_t m_CLK;
 
-	netlist_state_t<UINT8> m_cnt;
-	netlist_state_t<NETLIB_NAME(9310_subABCD) *> m_ABCD;
-	netlist_state_t<netlist_sig_t> m_loadq;
-	netlist_state_t<netlist_sig_t> m_ent;
+	UINT8 m_cnt;
+	NETLIB_NAME(9310_subABCD) *m_ABCD;
+	netlist_sig_t m_loadq;
+	netlist_sig_t m_ent;
 
 	netlist_ttl_output_t m_QA;
 	netlist_ttl_output_t m_QB;
diff --git a/src/emu/netlist/devices/nld_9312.c b/src/emu/netlist/devices/nld_9312.c
index 2bdaf0714d5..2bae1878269 100644
--- a/src/emu/netlist/devices/nld_9312.c
+++ b/src/emu/netlist/devices/nld_9312.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_9312.c
  *
@@ -20,7 +22,7 @@
 */
 #include "nld_9312.h"
 
-//#if (USE_TRUTHTABLE)
+#if (USE_TRUTHTABLE)
 nld_9312::truthtable_t nld_9312::m_ttbl;
 
 /* FIXME: Data changes are propagating faster than changing selects A,B,C
@@ -50,13 +52,81 @@ const char *nld_9312::m_desc[] = {
 		" 1, 1, 1, 0, X, X, X, X, X, X, X, 1| 1, 0|33,28",
 		""
 };
-//#endif
+#endif
+
+NETLIB_UPDATE(9312)
+{
+	const UINT8 G = INPLOGIC(m_G);
+	if ((m_last_G ^ G) == 1)
+	{
+		static const netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(19) };
+		OUTLOGIC(m_Y, !G, delay[!G]);
+		OUTLOGIC(m_YQ, G, delay[G]);
+		if (G)
+		{
+			m_A.inactivate();
+			m_B.inactivate();
+			m_C.inactivate();
+		} else {
+			m_A.activate();
+			m_B.activate();
+			m_C.activate();
+		}
+		m_last_G = G;
+	}
+	if (!G)
+	{
+		static const netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(28) };
+		const UINT8 chan = INPLOGIC(m_A) | (INPLOGIC(m_B)<<1) | (INPLOGIC(m_C)<<2);
+		if (m_last_chan != chan)
+		{
+			m_D[m_last_chan].inactivate();
+			m_D[chan].activate();
+		}
+		const UINT8 val = INPLOGIC(m_D[chan]);
+		OUTLOGIC(m_Y, val, delay[val]);
+		OUTLOGIC(m_YQ, !val, delay[!val]);
+		m_last_chan = chan;
+	}
+}
+
+NETLIB_START(9312)
+{
+	register_input("G",         m_G);
+	register_input("A",         m_A);
+	register_input("B",         m_B);
+	register_input("C",         m_C);
+
+	register_input("D0",        m_D[0]);
+	register_input("D1",        m_D[1]);
+	register_input("D2",        m_D[2]);
+	register_input("D3",        m_D[3]);
+	register_input("D4",        m_D[4]);
+	register_input("D5",        m_D[5]);
+	register_input("D6",        m_D[6]);
+	register_input("D7",        m_D[7]);
+
+	register_output("Y",        m_Y);
+	register_output("YQ",     	m_YQ);
+
+	m_last_chan = 0;
+	m_last_G = 0;
+
+	save(NLNAME(m_last_chan));
+	save(NLNAME(m_last_G));
+}
+
+NETLIB_RESET(9312)
+{
+}
 
 
 NETLIB_START(9312_dip)
 {
 	register_sub(m_sub, "1");
 
+#if (USE_TRUTHTABLE)
+
 	register_subalias("13", m_sub.m_i[0]);
 	register_subalias("12", m_sub.m_i[1]);
 	register_subalias("11", m_sub.m_i[2]);
@@ -73,6 +143,27 @@ NETLIB_START(9312_dip)
 
 	register_subalias("15", m_sub.m_Q[0]); // Y
 	register_subalias("14", m_sub.m_Q[1]); // YQ
+
+#else
+
+	register_subalias("13", m_sub.m_C);
+	register_subalias("12", m_sub.m_B);
+	register_subalias("11", m_sub.m_A);
+	register_subalias("10", m_sub.m_G);
+
+	register_subalias("1", m_sub.m_D[0]);
+	register_subalias("2", m_sub.m_D[1]);
+	register_subalias("3", m_sub.m_D[2]);
+	register_subalias("4", m_sub.m_D[3]);
+	register_subalias("5", m_sub.m_D[4]);
+	register_subalias("6", m_sub.m_D[5]);
+	register_subalias("7", m_sub.m_D[6]);
+	register_subalias("9", m_sub.m_D[7]);
+
+	register_subalias("15", m_sub.m_Y); // Y
+	register_subalias("14", m_sub.m_YQ); // YQ
+
+#endif
 }
 
 NETLIB_UPDATE(9312_dip)
diff --git a/src/emu/netlist/devices/nld_9312.h b/src/emu/netlist/devices/nld_9312.h
index 677197d00cf..055419808dc 100644
--- a/src/emu/netlist/devices/nld_9312.h
+++ b/src/emu/netlist/devices/nld_9312.h
@@ -41,10 +41,27 @@
 
 #define TTL_9312(_name)                                                \
 		NET_REGISTER_DEV(9312, _name)
-//#if (USE_TRUTHTABLE)
+#if (USE_TRUTHTABLE)
 #include "nld_truthtable.h"
 NETLIB_TRUTHTABLE(9312, 12, 2, 0);
-//#endif
+#else
+
+NETLIB_DEVICE(9312,
+public:
+//		C, B, A, G,D0,D1,D2,D3,D4,D5,D6,D7| Y,YQ
+	netlist_ttl_input_t m_A;
+	netlist_ttl_input_t m_B;
+	netlist_ttl_input_t m_C;
+	netlist_ttl_input_t m_G;
+	netlist_ttl_input_t m_D[8];
+	netlist_ttl_output_t m_Y;
+	netlist_ttl_output_t m_YQ;
+
+	UINT8 m_last_chan;
+	UINT8 m_last_G;
+);
+
+#endif
 
 
 #define TTL_9312_DIP(_name)                                            \
diff --git a/src/emu/netlist/devices/nld_9316.c b/src/emu/netlist/devices/nld_9316.c
index 0583593ae7f..55ab180de78 100644
--- a/src/emu/netlist/devices/nld_9316.c
+++ b/src/emu/netlist/devices/nld_9316.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_9316.c
  *
@@ -89,34 +91,29 @@ NETLIB_UPDATE(9316_sub)
 {
 	if (m_loadq)
 	{
-#if 0
-		m_cnt = (m_cnt < MAXCNT) ? m_cnt + 1 : 0;
-		update_outputs(m_cnt);
-		OUTLOGIC(m_RC, m_ent & (m_cnt == MAXCNT), NLTIME_FROM_NS(20));
-#else
-		switch (m_cnt.get())
+		switch (m_cnt)
 		{
 			case MAXCNT - 1:
 				m_cnt = MAXCNT;
-				OUTLOGIC(m_RC, m_ent, NLTIME_FROM_NS(20));
+				OUTLOGIC(m_RC, m_ent, NLTIME_FROM_NS(27));
 				OUTLOGIC(m_QA, 1, NLTIME_FROM_NS(20));
 				break;
 			case MAXCNT:
-				OUTLOGIC(m_RC, 0, NLTIME_FROM_NS(20));
+				OUTLOGIC(m_RC, 0, NLTIME_FROM_NS(27));
 				m_cnt = 0;
 				update_outputs_all(m_cnt, NLTIME_FROM_NS(20));
 				break;
 			default:
 				m_cnt++;
 				update_outputs(m_cnt);
+				break;
 		}
-#endif
 	}
 	else
 	{
-		m_cnt = m_ABCD.get()->read_ABCD();
-		update_outputs_all(m_cnt, NLTIME_FROM_NS(22));
+		m_cnt = m_ABCD->read_ABCD();
 		OUTLOGIC(m_RC, m_ent & (m_cnt == MAXCNT), NLTIME_FROM_NS(27));
+		update_outputs_all(m_cnt, NLTIME_FROM_NS(22));
 	}
 }
 
diff --git a/src/emu/netlist/devices/nld_9316.h b/src/emu/netlist/devices/nld_9316.h
index 316face36d9..57de7efee51 100644
--- a/src/emu/netlist/devices/nld_9316.h
+++ b/src/emu/netlist/devices/nld_9316.h
@@ -85,16 +85,17 @@ NETLIB_SUBDEVICE(9316_sub,
 
 	netlist_ttl_input_t m_CLK;
 
-	netlist_state_t<UINT8> m_cnt;
-	netlist_state_t<NETLIB_NAME(9316_subABCD) *> m_ABCD;
-	netlist_state_t<netlist_sig_t> m_loadq;
-	netlist_state_t<netlist_sig_t> m_ent;
-
 	netlist_ttl_output_t m_QA;
 	netlist_ttl_output_t m_QB;
 	netlist_ttl_output_t m_QC;
 	netlist_ttl_output_t m_QD;
 	netlist_ttl_output_t m_RC;
+
+	UINT8 m_cnt;
+	NETLIB_NAME(9316_subABCD) *m_ABCD;
+	netlist_sig_t m_loadq;
+	netlist_sig_t m_ent;
+
 );
 
 NETLIB_DEVICE(9316,
diff --git a/src/emu/netlist/devices/nld_cmos.h b/src/emu/netlist/devices/nld_cmos.h
index b62b73701de..f2248a6cf3d 100644
--- a/src/emu/netlist/devices/nld_cmos.h
+++ b/src/emu/netlist/devices/nld_cmos.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_cmos.h
  *
diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c
index 554476c52c3..fe42cf60d6c 100644
--- a/src/emu/netlist/devices/nld_legacy.c
+++ b/src/emu/netlist/devices/nld_legacy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_legacy.c
  *
diff --git a/src/emu/netlist/devices/nld_legacy.h b/src/emu/netlist/devices/nld_legacy.h
index f9e085bf65f..5ace1a82b90 100644
--- a/src/emu/netlist/devices/nld_legacy.h
+++ b/src/emu/netlist/devices/nld_legacy.h
@@ -46,7 +46,7 @@ NETLIB_DEVICE_WITH_PARAMS(nicDelay,
 	netlist_param_int_t m_L_to_H;
 	netlist_param_int_t m_H_to_L;
 
-	netlist_state_t<UINT8> m_last;
+	UINT8 m_last;
 );
 
 
diff --git a/src/emu/netlist/devices/nld_log.c b/src/emu/netlist/devices/nld_log.c
index dba06aeaecd..c53043e1943 100644
--- a/src/emu/netlist/devices/nld_log.c
+++ b/src/emu/netlist/devices/nld_log.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_log.c
  *
diff --git a/src/emu/netlist/devices/nld_log.h b/src/emu/netlist/devices/nld_log.h
index 700e38d22ec..bf0bbe31a0d 100644
--- a/src/emu/netlist/devices/nld_log.h
+++ b/src/emu/netlist/devices/nld_log.h
@@ -28,7 +28,7 @@ NETLIB_DEVICE(log,
 	~NETLIB_NAME(log)();
 	netlist_analog_input_t m_I;
 protected:
-	netlist_state_t<FILE *> m_file;
+	FILE * m_file;
 );
 
 #define LOGD(_name, _I, _I2)                                                 \
diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c
index 3a3646a01c8..acd34d02c45 100644
--- a/src/emu/netlist/devices/nld_ne555.c
+++ b/src/emu/netlist/devices/nld_ne555.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_NE555.c
  *
@@ -79,7 +81,7 @@ NETLIB_UPDATE(NE555)
 		m_ff = false;
 	}
 
-	bool out = (!INPLOGIC(m_RESET) ? false : m_ff.get());
+	bool out = (!INPLOGIC(m_RESET) ? false : m_ff);
 
 	if (m_last_out && !out)
 	{
diff --git a/src/emu/netlist/devices/nld_ne555.h b/src/emu/netlist/devices/nld_ne555.h
index 1d70dc9e170..2d42675a386 100644
--- a/src/emu/netlist/devices/nld_ne555.h
+++ b/src/emu/netlist/devices/nld_ne555.h
@@ -37,8 +37,8 @@ NETLIB_DEVICE(NE555,
 	netlist_analog_input_t m_TRIG;
 	netlist_analog_output_t m_OUT;
 
-	netlist_state_t<bool> m_last_out;
-	netlist_state_t<bool> m_ff;
+	bool m_last_out;
+	bool m_ff;
 
 	inline nl_double clamp(const nl_double v, const nl_double a, const nl_double b);
 
diff --git a/src/emu/netlist/devices/nld_r2r_dac.c b/src/emu/netlist/devices/nld_r2r_dac.c
index 86543a5bce7..fef8112ce77 100644
--- a/src/emu/netlist/devices/nld_r2r_dac.c
+++ b/src/emu/netlist/devices/nld_r2r_dac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_R2R_dac.c
  *
diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h
index 965d1cd36d8..e73e941d8c2 100644
--- a/src/emu/netlist/devices/nld_signal.h
+++ b/src/emu/netlist/devices/nld_signal.h
@@ -148,7 +148,7 @@ public:
 
 	ATTR_HOT ATTR_ALIGN void update()
 	{
-		const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)};
+		static const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)};
 
 		// FIXME: this check is needed because update is called during startup as well
 		//if (m_active == 0 && netlist().use_deactivate())
diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c
index b4232819f05..13b463a600f 100644
--- a/src/emu/netlist/devices/nld_system.c
+++ b/src/emu/netlist/devices/nld_system.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_system.c
  *
@@ -35,6 +37,65 @@ NETLIB_UPDATE(clock)
 	OUTLOGIC(m_Q, !m_Q.net().as_logic().new_Q(), m_inc  );
 }
 
+// ----------------------------------------------------------------------------------------
+// extclock
+// ----------------------------------------------------------------------------------------
+
+NETLIB_START(extclock)
+{
+	register_output("Q", m_Q);
+	register_input("FB", m_feedback);
+
+	register_param("FREQ", m_freq, 7159000.0 * 5.0);
+	register_param("PATTERN", m_pattern, "1,1");
+	register_param("OFFSET", m_offset, 0.0);
+	m_inc[0] = netlist_time::from_hz(m_freq.Value()*2);
+
+	connect(m_feedback, m_Q);
+	{
+		netlist_time base = netlist_time::from_hz(m_freq.Value()*2);
+		nl_util::pstring_list pat = nl_util::split(m_pattern.Value(),",");
+		m_off = netlist_time::from_double(m_offset.Value());
+
+		int pati[256];
+		m_size = pat.count();
+		int total = 0;
+		for (int i=0; i<m_size; i++)
+		{
+			pati[i] = pat[i].as_long();
+			total += pati[i];
+		}
+		netlist_time ttotal = netlist_time::zero;
+		for (int i=0; i<m_size - 1; i++)
+		{
+			m_inc[i] = base * pati[i];
+			ttotal += m_inc[i];
+		}
+		m_inc[m_size - 1] = base * total - ttotal;
+	}
+	save(NLNAME(m_cnt));
+	save(NLNAME(m_off));
+}
+
+NETLIB_RESET(extclock)
+{
+	m_cnt = 0;
+	m_off = netlist_time::from_double(m_offset.Value());
+	m_Q.initial(0);
+}
+
+NETLIB_UPDATE_PARAM(extclock)
+{
+}
+
+NETLIB_UPDATE(extclock)
+{
+	//static UINT8 pattern[6] = { 4, 4, 4, 4, 4, 8 };
+	OUTLOGIC(m_Q, (m_cnt & 1) ^ 1, m_inc[m_cnt] + m_off);
+	m_cnt = (m_cnt + 1) % m_size;
+	m_off = netlist_time::zero;
+}
+
 // ----------------------------------------------------------------------------------------
 // logic_input
 // ----------------------------------------------------------------------------------------
@@ -105,6 +166,7 @@ ATTR_COLD void nld_d_to_a_proxy::start()
 ATTR_COLD void nld_d_to_a_proxy::reset()
 {
 	m_RV.do_reset();
+	m_is_timestep = m_RV.m_P.net().as_analog().solver()->is_timestep();
 }
 
 ATTR_COLD netlist_core_terminal_t &nld_d_to_a_proxy::out()
@@ -122,17 +184,12 @@ ATTR_HOT ATTR_ALIGN void nld_d_to_a_proxy::update()
 		const nl_double V = state ? m_logic_family->m_high_V : m_logic_family->m_low_V;
 
 		// We only need to update the net first if this is a time stepping net
-		if (m_RV.m_P.net().as_analog().solver()->is_timestep())
+		if (m_is_timestep)
 		{
 			m_RV.update_dev();
-			m_RV.set(1.0 / R, V, 0.0);
-			m_RV.m_P.schedule_after(NLTIME_FROM_NS(1));
-		}
-		else
-		{
-			m_RV.set(1.0 / R, V, 0.0);
-			m_RV.update_dev();
 		}
+		m_RV.set(1.0 / R, V, 0.0);
+		m_RV.m_P.schedule_after(NLTIME_FROM_NS(1));
 	}
 }
 
@@ -169,7 +226,7 @@ NETLIB_UPDATE(res_sw)
 		const nl_double R = state ? m_RON.Value() : m_ROFF.Value();
 
 		// We only need to update the net first if this is a time stepping net
-		if (1) // m_R.m_P.net().as_analog().solver()->is_timestep())
+		if (0) // m_R.m_P.net().as_analog().solver()->is_timestep())
 		{
 			m_R.update_dev();
 			m_R.set_R(R);
@@ -178,7 +235,8 @@ NETLIB_UPDATE(res_sw)
 		else
 		{
 			m_R.set_R(R);
-			m_R.update_dev();
+			m_R.m_P.schedule_after(NLTIME_FROM_NS(1));
+			//m_R.update_dev();
 		}
 	}
 }
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index 40edb1eb310..cfadb192d6e 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -33,6 +33,11 @@
 		NET_REGISTER_DEV(clock, _name)                                         \
 		PARAM(_name.FREQ, _freq)
 
+#define EXTCLOCK(_name, _freq, _pattern)                                       \
+		NET_REGISTER_DEV(extclock, _name)                                      \
+		PARAM(_name.FREQ, _freq)											   \
+		PARAM(_name.PATTERN, _pattern)
+
 #define GNDA()                                                                 \
 		NET_REGISTER_DEV(gnd, GND)
 
@@ -77,6 +82,23 @@ NETLIB_DEVICE_WITH_PARAMS(clock,
 	netlist_time m_inc;
 );
 
+// -----------------------------------------------------------------------------
+// extclock
+// -----------------------------------------------------------------------------
+
+NETLIB_DEVICE_WITH_PARAMS(extclock,
+	netlist_ttl_input_t m_feedback;
+	netlist_ttl_output_t m_Q;
+
+	netlist_param_double_t m_freq;
+	netlist_param_str_t m_pattern;
+	netlist_param_double_t m_offset;
+
+	UINT8 m_cnt;
+	UINT8 m_size;
+	netlist_time m_off;
+	netlist_time m_inc[32];
+);
 
 // -----------------------------------------------------------------------------
 // Special support devices ...
@@ -219,7 +241,7 @@ protected:
 	ATTR_HOT ATTR_ALIGN void update_param();
 
 private:
-	netlist_state_t<UINT8> m_last_state;
+	UINT8 m_last_state;
 };
 
 
@@ -230,17 +252,17 @@ private:
 class nld_a_to_d_proxy : public netlist_device_t
 {
 public:
-	ATTR_COLD nld_a_to_d_proxy(netlist_input_t &in_proxied)
+	ATTR_COLD nld_a_to_d_proxy(netlist_logic_input_t &in_proxied)
 			: netlist_device_t()
 	{
 		nl_assert(in_proxied.family() == LOGIC);
-		m_I.m_logic_family = in_proxied.m_logic_family;
+		m_logic_family = in_proxied.logic_family();
 	}
 
 	ATTR_COLD virtual ~nld_a_to_d_proxy() {}
 
 	netlist_analog_input_t m_I;
-	netlist_ttl_output_t m_Q;
+	netlist_logic_output_t m_Q;
 
 protected:
 	ATTR_COLD void start()
@@ -255,14 +277,15 @@ protected:
 
 	ATTR_HOT ATTR_ALIGN void update()
 	{
-		if (m_I.Q_Analog() > m_I.m_logic_family->m_high_thresh_V)
+		if (m_I.Q_Analog() > m_logic_family->m_high_thresh_V)
 			OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1));
-		else if (m_I.Q_Analog() < m_I.m_logic_family->m_low_thresh_V)
+		else if (m_I.Q_Analog() < m_logic_family->m_low_thresh_V)
 			OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(1));
 		//else
 		//  OUTLOGIC(m_Q, m_Q.net().last_Q(), NLTIME_FROM_NS(1));
 	}
-
+private:
+	const netlist_logic_family_desc_t *m_logic_family;
 };
 
 // -----------------------------------------------------------------------------
@@ -272,21 +295,20 @@ protected:
 class nld_base_d_to_a_proxy : public netlist_device_t
 {
 public:
-	ATTR_COLD nld_base_d_to_a_proxy(netlist_output_t &out_proxied)
+	ATTR_COLD nld_base_d_to_a_proxy(netlist_logic_output_t &out_proxied)
 			: netlist_device_t()
 	{
 		nl_assert(out_proxied.family() == LOGIC);
-		m_logic_family = out_proxied.m_logic_family;
+		m_logic_family = out_proxied.logic_family();
 	}
 
 	ATTR_COLD virtual ~nld_base_d_to_a_proxy() {}
 
 	ATTR_COLD virtual netlist_core_terminal_t &out() = 0;
-
-	netlist_ttl_input_t m_I;
+	ATTR_COLD virtual netlist_logic_input_t &in() { return m_I; }
 
 protected:
-	ATTR_COLD void start()
+	ATTR_COLD virtual void start()
 	{
 		register_input("I", m_I);
 	}
@@ -297,6 +319,9 @@ protected:
 	}
 
 	const netlist_logic_family_desc_t *m_logic_family;
+
+	netlist_ttl_input_t m_I;
+
 private:
 };
 
@@ -340,10 +365,11 @@ private:
 class nld_d_to_a_proxy : public nld_base_d_to_a_proxy
 {
 public:
-	ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
+	ATTR_COLD nld_d_to_a_proxy(netlist_logic_output_t &out_proxied)
 	: nld_base_d_to_a_proxy(out_proxied)
 	, m_RV(TWOTERM)
 	, m_last_state(-1)
+	, m_is_timestep(false)
 	{
 	}
 
@@ -362,6 +388,7 @@ private:
 	netlist_analog_output_t m_Q;
 	nld_twoterm m_RV;
 	int m_last_state;
+	bool m_is_timestep;
 };
 #endif
 
diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h
index a503a77d856..f645770ade8 100644
--- a/src/emu/netlist/devices/nld_truthtable.h
+++ b/src/emu/netlist/devices/nld_truthtable.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nld_truthtable.h
  *
@@ -65,6 +67,7 @@ public:
 				register_output(out[i].trim(), m_Q[i]);
 			}
 		}
+		m_ign = 0;
 		setup_tt();
 		// FIXME: save state
 	}
@@ -191,18 +194,19 @@ public:
 		UINT32 state = 0;
 		for (int i = 0; i < m_NI; i++)
 		{
-			m_i[i].activate();
+			if ((m_ign & (1<<i)) != 0)
+				m_i[i].activate();
 			state |= (INPLOGIC(m_i[i]) << i);
 		}
 
 		const UINT32 nstate = state | (has_state ? (m_last_state << m_NI) : 0);
 		const UINT32 out = m_ttp->m_outs[nstate] & ((1 << m_NO) - 1);
-		const UINT32 ign = m_ttp->m_outs[nstate] >> m_NO;
+		m_ign = m_ttp->m_outs[nstate] >> m_NO;
 		if (has_state)
 			m_last_state = (state << m_NO) | out;
 
 		for (int i = 0; i < m_NI; i++)
-			if (ign & (1 << i))
+			if (m_ign & (1 << i))
 				m_i[i].inactivate();
 
 		for (int i = 0; i < m_NO; i++)
@@ -235,6 +239,7 @@ public:
 private:
 
 	UINT32 m_last_state;
+	UINT32 m_ign;
 	INT32 m_active;
 
 	truthtable_t *m_ttp;
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index 96b3b3c9b31..ae3f11e3b5c 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nlbase.c
  *
@@ -13,27 +15,48 @@
 
 const netlist_time netlist_time::zero = netlist_time::from_raw(0);
 
-netlist_logic_family_desc_t netlist_family_TTL =
+class netlist_logic_family_ttl_t : public netlist_logic_family_desc_t
 {
-		0.8, // m_low_thresh_V
-		2.0, // m_high_thresh_V
-		0.3, // m_low_V  - these depend on sinked/sourced current. Values should be suitable for typical applications.
-		3.7, // m_high_V
-		1.0, // m_R_low;
-		130.0, //  m_R_high;
+public:
+	netlist_logic_family_ttl_t()
+	{
+		m_low_thresh_V = 0.8;
+		m_high_thresh_V = 2.0;
+		// m_low_V  - these depend on sinked/sourced current. Values should be suitable for typical applications.
+		m_low_V = 0.3;
+		m_high_V = 3.7;
+		m_R_low = 1.0;
+		m_R_high = 130.0;
+	}
+	virtual nld_base_d_to_a_proxy *create_d_a_proxy(netlist_logic_output_t &proxied) const
+	{
+		return nl_alloc(nld_d_to_a_proxy , proxied);
+	}
 };
 
 //FIXME: set to proper values
-netlist_logic_family_desc_t netlist_family_CD4000 =
+class netlist_logic_family_cd4000_t : public netlist_logic_family_desc_t
 {
-		0.8, // m_low_thresh_V
-		2.0, // m_high_thresh_V
-		0.3, // m_low_V  - these depend on sinked/sourced current. Values should be suitable for typical applications.
-		3.7, // m_high_V
-		1.0, // m_R_low;
-		130.0, //  m_R_high;
+public:
+	netlist_logic_family_cd4000_t()
+	{
+		m_low_thresh_V = 0.8;
+		m_high_thresh_V = 2.0;
+		// m_low_V  - these depend on sinked/sourced current. Values should be suitable for typical applications.
+		m_low_V = 0.3;
+		m_high_V = 3.7;
+		m_R_low = 1.0;
+		m_R_high = 130.0;
+	}
+	virtual nld_base_d_to_a_proxy *create_d_a_proxy(netlist_logic_output_t &proxied) const
+	{
+		return nl_alloc(nld_d_to_a_proxy , proxied);
+	}
 };
 
+const netlist_logic_family_desc_t &netlist_family_TTL = netlist_logic_family_ttl_t();
+const netlist_logic_family_desc_t &netlist_family_CD4000 = netlist_logic_family_cd4000_t();
+
 // ----------------------------------------------------------------------------------------
 // netlist_queue_t
 // ----------------------------------------------------------------------------------------
@@ -341,8 +364,9 @@ ATTR_COLD void netlist_base_t::log(const char *format, ...) const
 ATTR_COLD netlist_core_device_t::netlist_core_device_t(const family_t afamily)
 : netlist_object_t(DEVICE, afamily)
 #if (NL_KEEP_STATISTICS)
-	, total_time(0)
-	, stat_count(0)
+	, stat_total_time(0)
+	, stat_update_count(0)
+	, stat_call_count(0)
 #endif
 {
 }
@@ -362,6 +386,14 @@ ATTR_COLD netlist_core_device_t::~netlist_core_device_t()
 {
 }
 
+ATTR_COLD void netlist_core_device_t::start_dev()
+{
+#if (NL_KEEP_STATISTICS)
+	netlist().m_started_devices.add(this, false);
+#endif
+	start();
+}
+
 ATTR_HOT ATTR_ALIGN const netlist_sig_t netlist_core_device_t::INPLOGIC_PASSIVE(netlist_logic_input_t &inp)
 {
 	if (inp.state() != netlist_input_t::STATE_INP_PASSIVE)
@@ -432,15 +464,28 @@ ATTR_COLD void netlist_device_t::register_terminal(const pstring &name, netlist_
 		m_terminals.add(port.name());
 }
 
+ATTR_COLD void netlist_device_t::register_output(const pstring &name, netlist_logic_output_t &port)
+{
+	port.set_logic_family(this->logic_family());
+	setup().register_object(*this, name, port);
+}
+
 ATTR_COLD void netlist_device_t::register_output(const pstring &name, netlist_output_t &port)
 {
-	port.m_logic_family = this->logic_family();
+	//port.set_logic_family(this->logic_family());
 	setup().register_object(*this, name, port);
 }
 
+ATTR_COLD void netlist_device_t::register_input(const pstring &name, netlist_logic_input_t &inp)
+{
+	inp.set_logic_family(this->logic_family());
+	setup().register_object(*this, name, inp);
+	m_terminals.add(inp.name());
+}
+
 ATTR_COLD void netlist_device_t::register_input(const pstring &name, netlist_input_t &inp)
 {
-	inp.m_logic_family = this->logic_family();
+	//inp.set_logic_family(this->logic_family());
 	setup().register_object(*this, name, inp);
 	m_terminals.add(inp.name());
 }
@@ -562,19 +607,20 @@ ATTR_COLD void netlist_net_t::save_register()
 	netlist_object_t::save_register();
 }
 
-ATTR_HOT ATTR_ALIGN static inline void update_dev(const netlist_core_terminal_t *inp, const UINT32 mask)
+ATTR_HOT /*ATTR_ALIGN*/ static inline void update_dev(const netlist_core_terminal_t *inp, const UINT32 mask)
 {
+	netlist_core_device_t &netdev = inp->netdev();
+	inc_stat(netdev.stat_call_count);
 	if ((inp->state() & mask) != 0)
 	{
-		netlist_core_device_t &netdev = inp->netdev();
-		begin_timing(netdev.total_time);
-		inc_stat(netdev.stat_count);
+		begin_timing(netdev.stat_total_time);
+		inc_stat(netdev.stat_update_count);
 		netdev.update_dev();
-		end_timing(netdev.total_time);
+		end_timing(netdev.stat_total_time);
 	}
 }
 
-ATTR_HOT ATTR_ALIGN inline void netlist_net_t::update_devs()
+ATTR_HOT /*ATTR_ALIGN*/ inline void netlist_net_t::update_devs()
 {
 	//assert(m_num_cons != 0);
 	nl_assert(this->isRailNet());
@@ -765,7 +811,6 @@ ATTR_COLD void netlist_analog_net_t::process_net(list_t *groups, int &cur_group)
 ATTR_COLD netlist_core_terminal_t::netlist_core_terminal_t(const type_t atype, const family_t afamily)
 : netlist_owned_object_t(atype, afamily)
 , plinkedlist_element_t<netlist_core_terminal_t>()
-, m_logic_family(NULL)
 , m_net(NULL)
 , m_state(STATE_NONEX)
 {
@@ -852,7 +897,7 @@ ATTR_COLD void netlist_output_t::init_object(netlist_core_device_t &dev, const p
 // ----------------------------------------------------------------------------------------
 
 ATTR_COLD netlist_logic_output_t::netlist_logic_output_t()
-	: netlist_output_t(OUTPUT, LOGIC), m_proxy(NULL)
+	: netlist_output_t(OUTPUT, LOGIC), m_proxy(NULL), m_logic_family(NULL)
 {
 	this->set_net(m_my_net);
 }
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index e1871687923..7dbb80b7777 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -259,6 +259,7 @@ class netlist_net_t;
 class netlist_analog_net_t;
 class netlist_logic_net_t;
 class netlist_output_t;
+class netlist_logic_output_t;
 class netlist_param_t;
 class netlist_setup_t;
 class netlist_base_t;
@@ -272,8 +273,14 @@ class NETLIB_NAME(base_d_to_a_proxy);
 // netlist_output_family_t
 // -----------------------------------------------------------------------------
 
-struct netlist_logic_family_desc_t
+class nld_base_d_to_a_proxy;
+
+class netlist_logic_family_desc_t
 {
+public:
+	virtual ~netlist_logic_family_desc_t() {}
+	virtual nld_base_d_to_a_proxy *create_d_a_proxy(netlist_logic_output_t &proxied) const = 0;
+
 	nl_double m_low_thresh_V;
 	nl_double m_high_thresh_V;
 	nl_double m_low_V;
@@ -289,27 +296,10 @@ struct netlist_logic_family_desc_t
  * Only devices of type GENERIC should have a family description entry
  */
 
-extern netlist_logic_family_desc_t netlist_family_TTL;
-extern netlist_logic_family_desc_t netlist_family_CD4000;
+extern const netlist_logic_family_desc_t &netlist_family_TTL;
+extern const netlist_logic_family_desc_t &netlist_family_CD4000;
 
 
-// -----------------------------------------------------------------------------
-// netlist_state_t
-// -----------------------------------------------------------------------------
-
-template< typename X>
-class netlist_state_t {
-public:
-	inline netlist_state_t() : m_x(static_cast<X>(0)) {}
-	inline netlist_state_t(const X& x_) : m_x(x_) {}
-	inline const X& get() const { return m_x; }
-	inline X& ref() { return m_x; }
-	inline operator const X&() const { return m_x; }
-	inline operator X&() { return m_x; }
-private:
-	X m_x;
-};
-
 // -----------------------------------------------------------------------------
 // netlist_object_t
 // -----------------------------------------------------------------------------
@@ -358,11 +348,6 @@ public:
 	ATTR_COLD const pstring &name() const;
 
 	PSTATE_INTERFACE_DECL()
-	template<typename C> ATTR_COLD void save(netlist_state_t<C> &state,
-			const pstring &stname)
-	{
-		save(state.ref(), stname);
-	}
 
 	ATTR_HOT inline const type_t type() const { return m_objtype; }
 	ATTR_HOT inline const family_t family() const { return m_family; }
@@ -450,8 +435,6 @@ public:
 		m_state = astate;
 	}
 
-	const netlist_logic_family_desc_t *m_logic_family;
-
 protected:
 	ATTR_COLD virtual void save_register()
 	{
@@ -555,7 +538,7 @@ class netlist_logic_input_t : public netlist_input_t
 {
 public:
 	ATTR_COLD netlist_logic_input_t()
-		: netlist_input_t(INPUT, LOGIC)
+		: netlist_input_t(INPUT, LOGIC), m_logic_family(NULL)
 	{
 	}
 
@@ -565,6 +548,11 @@ public:
 	ATTR_HOT inline void activate_hl();
 	ATTR_HOT inline void activate_lh();
 
+	ATTR_HOT inline const netlist_logic_family_desc_t *logic_family() { return m_logic_family; }
+	ATTR_COLD void set_logic_family(const netlist_logic_family_desc_t *fam) { m_logic_family = fam; }
+
+private:
+	const netlist_logic_family_desc_t *m_logic_family;
 };
 
 // -----------------------------------------------------------------------------
@@ -804,18 +792,22 @@ public:
 
 	ATTR_COLD void initial(const netlist_sig_t val);
 
-	ATTR_COLD bool has_proxy() const { return (m_proxy != NULL); }
-	ATTR_COLD nld_base_d_to_a_proxy *get_proxy() const  { return m_proxy; }
-	ATTR_COLD void set_proxy(nld_base_d_to_a_proxy *proxy) { m_proxy = proxy; }
-
 	ATTR_HOT inline void set_Q(const netlist_sig_t newQ, const netlist_time &delay)
 	{
 		net().as_logic().set_Q(newQ, delay);
 	}
 
+	ATTR_COLD bool has_proxy() const { return (m_proxy != NULL); }
+	ATTR_COLD nld_base_d_to_a_proxy *get_proxy() const  { return m_proxy; }
+	ATTR_COLD void set_proxy(nld_base_d_to_a_proxy *proxy) { m_proxy = proxy; }
+
+	ATTR_HOT inline const netlist_logic_family_desc_t *logic_family() { return m_logic_family; }
+	ATTR_COLD void set_logic_family(const netlist_logic_family_desc_t *fam) { m_logic_family = fam; }
+
 private:
 	netlist_logic_net_t m_my_net;
 	nld_base_d_to_a_proxy *m_proxy;
+	const netlist_logic_family_desc_t *m_logic_family;
 };
 
 class netlist_ttl_output_t : public netlist_logic_output_t
@@ -981,10 +973,7 @@ public:
 		update();
 #endif
 	}
-	ATTR_HOT inline void start_dev()
-	{
-		start();
-	}
+	ATTR_COLD void start_dev();
 
 	ATTR_HOT const netlist_sig_t INPLOGIC_PASSIVE(netlist_logic_input_t &inp);
 
@@ -1019,8 +1008,9 @@ public:
 
 #if (NL_KEEP_STATISTICS)
 	/* stats */
-	osd_ticks_t total_time;
-	INT32 stat_count;
+	osd_ticks_t stat_total_time;
+	INT32 stat_update_count;
+	INT32 stat_call_count;
 #endif
 
 #if USE_PMFDELEGATES
@@ -1058,7 +1048,9 @@ public:
 	ATTR_COLD void register_subalias(const pstring &name, netlist_core_terminal_t &term);
 	ATTR_COLD void register_terminal(const pstring &name, netlist_terminal_t &port);
 	ATTR_COLD void register_output(const pstring &name, netlist_output_t &out);
+	ATTR_COLD void register_output(const pstring &name, netlist_logic_output_t &out);
 	ATTR_COLD void register_input(const pstring &name, netlist_input_t &in);
+	ATTR_COLD void register_input(const pstring &name, netlist_logic_input_t &in);
 
 	ATTR_COLD void connect(netlist_core_terminal_t &t1, netlist_core_terminal_t &t2);
 
@@ -1189,6 +1181,9 @@ public:
 
 	pnamedlist_t<netlist_device_t *> m_devices;
 	netlist_net_t::list_t m_nets;
+#if (NL_KEEP_STATISTICS)
+	pnamedlist_t<netlist_core_device_t *> m_started_devices;
+#endif
 
 protected:
 
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 0aaf161c887..487bbae44b6 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -399,7 +399,7 @@ nld_base_d_to_a_proxy *netlist_setup_t::get_d_a_proxy(netlist_output_t &out)
 	if (proxy == NULL)
 	{
 		// create a new one ...
-		proxy = nl_alloc(nld_d_to_a_proxy ,out);
+		proxy = out_cast.logic_family()->create_d_a_proxy(out_cast);
 		pstring x = pstring::sprintf("proxy_da_%s_%d", out.name().cstr(), m_proxy_cnt);
 		m_proxy_cnt++;
 
@@ -417,7 +417,7 @@ nld_base_d_to_a_proxy *netlist_setup_t::get_d_a_proxy(netlist_output_t &out)
 		}
 		out.net().m_core_terms.clear(); // clear the list
 #endif
-		out.net().register_con(proxy->m_I);
+		out.net().register_con(proxy->in());
 		out_cast.set_proxy(proxy);
 
 	}
@@ -428,7 +428,8 @@ void netlist_setup_t::connect_input_output(netlist_input_t &in, netlist_output_t
 {
 	if (out.isFamily(netlist_terminal_t::ANALOG) && in.isFamily(netlist_terminal_t::LOGIC))
 	{
-		nld_a_to_d_proxy *proxy = nl_alloc(nld_a_to_d_proxy, in);
+		netlist_logic_input_t &incast = dynamic_cast<netlist_logic_input_t &>(in);
+		nld_a_to_d_proxy *proxy = nl_alloc(nld_a_to_d_proxy, incast);
 		pstring x = pstring::sprintf("proxy_ad_%s_%d", in.name().cstr(), m_proxy_cnt);
 		m_proxy_cnt++;
 
@@ -463,8 +464,9 @@ void netlist_setup_t::connect_terminal_input(netlist_terminal_t &term, netlist_i
 	}
 	else if (inp.isFamily(netlist_terminal_t::LOGIC))
 	{
+		netlist_logic_input_t &incast = dynamic_cast<netlist_logic_input_t &>(inp);
 		NL_VERBOSE_OUT(("connect_terminal_input: connecting proxy\n"));
-		nld_a_to_d_proxy *proxy = nl_alloc(nld_a_to_d_proxy, inp);
+		nld_a_to_d_proxy *proxy = nl_alloc(nld_a_to_d_proxy, incast);
 		pstring x = pstring::sprintf("proxy_ad_%s_%d", inp.name().cstr(), m_proxy_cnt);
 		m_proxy_cnt++;
 
@@ -724,10 +726,10 @@ void netlist_setup_t::print_stats() const
 {
 #if (NL_KEEP_STATISTICS)
 	{
-		for (netlist_device_t * const *entry = netlist().m_devices.first(); entry != NULL; entry = netlist().m_devices.next(entry))
+		for (netlist_core_device_t * const *entry = netlist().m_started_devices.first(); entry != NULL; entry = netlist().m_started_devices.next(entry))
 		{
 			//entry->object()->s
-			printf("Device %20s : %12d %15ld\n", (*entry)->name().cstr(), (*entry)->stat_count, (long int) (*entry)->total_time / ((*entry)->stat_count + 1));
+			printf("Device %20s : %12d %12d %15ld\n", (*entry)->name().cstr(), (*entry)->stat_call_count, (*entry)->stat_update_count, (long int) (*entry)->stat_total_time / ((*entry)->stat_update_count + 1));
 		}
 		printf("Queue Start %15d\n", m_netlist.queue().m_prof_start);
 		printf("Queue End   %15d\n", m_netlist.queue().m_prof_end);
diff --git a/src/emu/netlist/nl_util.h b/src/emu/netlist/nl_util.h
index 35cadb8d6e3..396de3455e4 100644
--- a/src/emu/netlist/nl_util.h
+++ b/src/emu/netlist/nl_util.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nl_util.h
  *
diff --git a/src/emu/netlist/pstate.c b/src/emu/netlist/pstate.c
index 8d7e1810f11..aadea26fc5e 100644
--- a/src/emu/netlist/pstate.c
+++ b/src/emu/netlist/pstate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * pstate.c
  *
diff --git a/src/emu/netlist/pstate.h b/src/emu/netlist/pstate.h
index 3dad87c2333..e39c724c264 100644
--- a/src/emu/netlist/pstate.h
+++ b/src/emu/netlist/pstate.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * pstate.h
  *
@@ -16,13 +18,17 @@
 // ----------------------------------------------------------------------------------------
 
 #define PSTATE_INTERFACE_DECL()               \
-	template<typename C> ATTR_COLD void save(C &state, const pstring &stname);
+	template<typename C> ATTR_COLD void save(C &state, const pstring &stname); \
+	template<typename C, std::size_t N> ATTR_COLD void save(C (&state)[N], const pstring &stname); \
+	template<typename C> ATTR_COLD void save(C *state, const pstring &stname, const int count);
 
 #define PSTATE_INTERFACE(obj, manager, module)               \
 	template<typename C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
-	{                                                                       \
-		manager->save_item(state, this, module + "." + stname);  \
-	}
+	{ manager->save_item(state, this, module + "." + stname); } \
+	template<typename C, std::size_t N> ATTR_COLD void obj::save(C (&state)[N], const pstring &stname) \
+	{ manager->save_state_ptr(module + "." + stname, nl_datatype<C>::type, this, sizeof(state[0]), N, &(state[0]), false); } \
+	template<typename C> ATTR_COLD void obj::save(C *state, const pstring &stname, const int count) \
+	{ manager->save_state_ptr(module + "." + stname, nl_datatype<C>::type, this, sizeof(C), count, state, false); 	}
 
 enum pstate_data_type_e {
 	NOT_SUPPORTED,
@@ -140,9 +146,11 @@ public:
 
 	inline const pstate_entry_t::list_t &save_list() const { return m_save; }
 
-protected:
+	// FIXME: should be protected
 	ATTR_COLD void save_state_ptr(const pstring &stname, const pstate_data_type_e, const void *owner, const int size, const int count, void *ptr, bool is_ptr);
 
+protected:
+
 private:
 	pstate_entry_t::list_t m_save;
 };
diff --git a/src/emu/netlist/pstring.c b/src/emu/netlist/pstring.c
index 3f19cc16a89..20f98ed6d9e 100644
--- a/src/emu/netlist/pstring.c
+++ b/src/emu/netlist/pstring.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * nl_string.c
  *
diff --git a/src/emu/network.c b/src/emu/network.c
index 3da575835af..cc9b533b8fa 100644
--- a/src/emu/network.c
+++ b/src/emu/network.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     network.c
diff --git a/src/emu/network.h b/src/emu/network.h
index a52bf73b621..f6757e6a9f0 100644
--- a/src/emu/network.h
+++ b/src/emu/network.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     network.h
diff --git a/src/emu/output.c b/src/emu/output.c
index 883a3922b2a..cddb808b29f 100644
--- a/src/emu/output.c
+++ b/src/emu/output.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     output.c
diff --git a/src/emu/output.h b/src/emu/output.h
index 4e4bda44463..466ac337f7c 100644
--- a/src/emu/output.h
+++ b/src/emu/output.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     output.h
diff --git a/src/emu/rendutil.c b/src/emu/rendutil.c
index 5eb7c012521..7c59033514b 100644
--- a/src/emu/rendutil.c
+++ b/src/emu/rendutil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rendutil.c
diff --git a/src/emu/rendutil.h b/src/emu/rendutil.h
index a158ded0c2a..5ebebebb723 100644
--- a/src/emu/rendutil.h
+++ b/src/emu/rendutil.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rendutil.h
diff --git a/src/emu/romload.c b/src/emu/romload.c
index fc6ef629bf5..18448a82e75 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     romload.c
diff --git a/src/emu/romload.h b/src/emu/romload.h
index 33fe06e3d48..fc86045c686 100644
--- a/src/emu/romload.h
+++ b/src/emu/romload.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     romload.h
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index ed41ca05560..3e5e24787cd 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     softlist.c
diff --git a/src/emu/softlist.h b/src/emu/softlist.h
index 77ed72437b2..af07c2460ea 100644
--- a/src/emu/softlist.h
+++ b/src/emu/softlist.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     softlist.h
diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index 8d69690867a..6475aa72166 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     2151intf.c
diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h
index b043934605c..5f56a94dc79 100644
--- a/src/emu/sound/2151intf.h
+++ b/src/emu/sound/2151intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     2151intf.h
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index ca4373f4222..05eaee328ec 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "2203intf.h"
 #include "fm.h"
 
diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h
index 4d47e8743a9..93027f8846c 100644
--- a/src/emu/sound/2203intf.h
+++ b/src/emu/sound/2203intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __2203INTF_H__
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index 5ace261123a..198e2f86e14 100644
--- a/src/emu/sound/2413intf.c
+++ b/src/emu/sound/2413intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************
 
     MAME / MESS functions
diff --git a/src/emu/sound/2413intf.h b/src/emu/sound/2413intf.h
index 8e0f9008d10..c1170b200d7 100644
--- a/src/emu/sound/2413intf.h
+++ b/src/emu/sound/2413intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __2413INTF_H__
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index dea17227d3e..9821fef591a 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   2608intf.c
diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h
index 399c40edbd1..0fbd06414ac 100644
--- a/src/emu/sound/2608intf.h
+++ b/src/emu/sound/2608intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __2608INTF_H__
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index fb3b8f0e6b7..5c81ab6c65b 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   2610intf.c
diff --git a/src/emu/sound/2610intf.h b/src/emu/sound/2610intf.h
index 3845105655a..2fe2eb8e883 100644
--- a/src/emu/sound/2610intf.h
+++ b/src/emu/sound/2610intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __2610INTF_H__
diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c
index c40ea7c87c5..816235feeff 100644
--- a/src/emu/sound/2612intf.c
+++ b/src/emu/sound/2612intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   2612intf.c
diff --git a/src/emu/sound/2612intf.h b/src/emu/sound/2612intf.h
index 3020a548d70..f3b69bcd7e5 100644
--- a/src/emu/sound/2612intf.h
+++ b/src/emu/sound/2612intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __2612INTF_H__
diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c
index 1ddfa00358c..b3dd128f2ee 100644
--- a/src/emu/sound/262intf.c
+++ b/src/emu/sound/262intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   262intf.c
diff --git a/src/emu/sound/262intf.h b/src/emu/sound/262intf.h
index a45852f4223..e25450bb812 100644
--- a/src/emu/sound/262intf.h
+++ b/src/emu/sound/262intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __262INTF_H__
diff --git a/src/emu/sound/3526intf.c b/src/emu/sound/3526intf.c
index 88d0f69fdd5..aca133b4878 100644
--- a/src/emu/sound/3526intf.c
+++ b/src/emu/sound/3526intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 * FILE
 *   Yamaha 3812 emulator interface - MAME VERSION
diff --git a/src/emu/sound/3526intf.h b/src/emu/sound/3526intf.h
index 5ad6812d297..5764c81b941 100644
--- a/src/emu/sound/3526intf.h
+++ b/src/emu/sound/3526intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __3526INTF_H__
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index 9e1f35118c1..926f3a20643 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 * FILE
 *   Yamaha 3812 emulator interface - MAME VERSION
diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h
index 986296d058c..a003b3cfeb6 100644
--- a/src/emu/sound/3812intf.h
+++ b/src/emu/sound/3812intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __3812INTF_H__
diff --git a/src/emu/sound/8950intf.c b/src/emu/sound/8950intf.c
index 4bdfa95a0dd..9d2801c4396 100644
--- a/src/emu/sound/8950intf.c
+++ b/src/emu/sound/8950intf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 * FILE
 *   Yamaha 3812 emulator interface - MAME VERSION
diff --git a/src/emu/sound/8950intf.h b/src/emu/sound/8950intf.h
index 304fd2bc654..441e279ab2c 100644
--- a/src/emu/sound/8950intf.h
+++ b/src/emu/sound/8950intf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __8950INTF_H__
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 1c5d1645fcb..361eb7473da 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Sega/Yamaha AICA emulation
     By ElSemi, kingshriek, Deunan Knute, and R. Belmont
diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h
index ec709756ec8..2be02baac23 100644
--- a/src/emu/sound/aica.h
+++ b/src/emu/sound/aica.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Sega/Yamaha AICA emulation
diff --git a/src/emu/sound/aicadsp.c b/src/emu/sound/aicadsp.c
index 3c1d0971b78..f46f332288f 100644
--- a/src/emu/sound/aicadsp.c
+++ b/src/emu/sound/aicadsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "aicadsp.h"
 
diff --git a/src/emu/sound/aicadsp.h b/src/emu/sound/aicadsp.h
index e027bcc6117..278ffca51ad 100644
--- a/src/emu/sound/aicadsp.h
+++ b/src/emu/sound/aicadsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __AICADSP_H__
diff --git a/src/emu/sound/amiga.c b/src/emu/sound/amiga.c
index 7ec9dbb773b..369b436551a 100644
--- a/src/emu/sound/amiga.c
+++ b/src/emu/sound/amiga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga audio hardware
diff --git a/src/emu/sound/amiga.h b/src/emu/sound/amiga.h
index 1963f5a16d2..d4e26b6ad0f 100644
--- a/src/emu/sound/amiga.h
+++ b/src/emu/sound/amiga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga audio hardware
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 06282487ba9..fdf37c3028c 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     asc.c
diff --git a/src/emu/sound/asc.h b/src/emu/sound/asc.h
index 652d035f990..4b4baaee771 100644
--- a/src/emu/sound/asc.h
+++ b/src/emu/sound/asc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     asc.h
diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c
index 3383cba1fb9..39b133dae85 100644
--- a/src/emu/sound/astrocde.c
+++ b/src/emu/sound/astrocde.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************
 
     Astrocade custom 'IO' chip sound chip driver
diff --git a/src/emu/sound/astrocde.h b/src/emu/sound/astrocde.h
index 799a2a32b1c..81d4b912841 100644
--- a/src/emu/sound/astrocde.h
+++ b/src/emu/sound/astrocde.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ASTROCDE_H__
diff --git a/src/emu/sound/awacs.c b/src/emu/sound/awacs.c
index fd93f77b479..9c30929eff2 100644
--- a/src/emu/sound/awacs.c
+++ b/src/emu/sound/awacs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     awacs.c
diff --git a/src/emu/sound/awacs.h b/src/emu/sound/awacs.h
index 0c1ad063225..5654bb43a8d 100644
--- a/src/emu/sound/awacs.h
+++ b/src/emu/sound/awacs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     awacs.h
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 7e30de56eb6..36f1a15b084 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Couriersud, July 2014:
  *
diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h
index d8803044b4f..d23d0de60a1 100644
--- a/src/emu/sound/ay8910.h
+++ b/src/emu/sound/ay8910.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __AY8910_H__
diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c
index 04b3412ecdd..933fa79697d 100644
--- a/src/emu/sound/beep.c
+++ b/src/emu/sound/beep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     beep.c
diff --git a/src/emu/sound/beep.h b/src/emu/sound/beep.h
index d42bfcf1b24..7a419d73428 100644
--- a/src/emu/sound/beep.h
+++ b/src/emu/sound/beep.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __BEEP_H__
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index f01f3f199f6..bfa0b3fb21c 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 C140.c
 
diff --git a/src/emu/sound/c140.h b/src/emu/sound/c140.h
index 87887c32329..27852b88fc6 100644
--- a/src/emu/sound/c140.h
+++ b/src/emu/sound/c140.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* C140.h */
 
 #pragma once
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index 1e19c844b0a..adaee4eb824 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     c352.c - Namco C352 custom PCM chip emulation
     v1.2
diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h
index 42192339c80..9d1b89da539 100644
--- a/src/emu/sound/c352.h
+++ b/src/emu/sound/c352.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __C352_H__
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index 72c4ae7924a..56a43117120 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     HuC6280 sound chip emulator
     by Charles MacDonald
diff --git a/src/emu/sound/c6280.h b/src/emu/sound/c6280.h
index c068356a8b8..0ce240ff26e 100644
--- a/src/emu/sound/c6280.h
+++ b/src/emu/sound/c6280.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __C6280_H__
diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c
index b43028d7f88..1ef050b7dcb 100644
--- a/src/emu/sound/cdda.c
+++ b/src/emu/sound/cdda.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     CD-DA "Red Book" audio sound hardware handler
     Relies on the actual CD logic and reading in cdrom.c.
diff --git a/src/emu/sound/cdda.h b/src/emu/sound/cdda.h
index 0c945ea0f25..92bd9ebc9d9 100644
--- a/src/emu/sound/cdda.h
+++ b/src/emu/sound/cdda.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CDDA_H__
diff --git a/src/emu/sound/cdp1863.c b/src/emu/sound/cdp1863.c
index 253d6a4238e..08a88f914ce 100644
--- a/src/emu/sound/cdp1863.c
+++ b/src/emu/sound/cdp1863.c
@@ -4,9 +4,6 @@
 
     RCA CDP1863 CMOS 8-Bit Programmable Frequency Generator emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h
index 7b6494daa56..910be5153fd 100644
--- a/src/emu/sound/cdp1863.h
+++ b/src/emu/sound/cdp1863.h
@@ -4,9 +4,6 @@
 
     RCA CDP1863 CMOS 8-Bit Programmable Frequency Generator emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                 _RESET   1 |*    \_/     | 16  Vdd
diff --git a/src/emu/sound/cdp1864.c b/src/emu/sound/cdp1864.c
index 0c12b01f554..b4859cee4a3 100644
--- a/src/emu/sound/cdp1864.c
+++ b/src/emu/sound/cdp1864.c
@@ -4,9 +4,6 @@
 
     RCA CDP1864C COS/MOS PAL Compatible Color TV Interface
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h
index c22322ef356..ab9f384dc1a 100644
--- a/src/emu/sound/cdp1864.h
+++ b/src/emu/sound/cdp1864.h
@@ -4,9 +4,6 @@
 
     RCA CDP1864C COS/MOS PAL Compatible Color TV Interface
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                 INLACE   1 |*    \_/     | 40  Vdd
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 2b8a42d0184..383d7eb5d88 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -4,9 +4,6 @@
 
     RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index 1dadd16cab2..96185021ac4 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -4,9 +4,6 @@
 
     RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    TPA   1 |*    \_/     | 40  Vdd
diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c
index 117fa0f003c..09361fbdc66 100644
--- a/src/emu/sound/cem3394.c
+++ b/src/emu/sound/cem3394.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     CEM3394 sound driver.
diff --git a/src/emu/sound/cem3394.h b/src/emu/sound/cem3394.h
index 9ba4154a7b2..d695999b903 100644
--- a/src/emu/sound/cem3394.h
+++ b/src/emu/sound/cem3394.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CEM3394_H__
diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c
index 436440188ca..5e63193383e 100644
--- a/src/emu/sound/digitalk.c
+++ b/src/emu/sound/digitalk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "digitalk.h"
 
diff --git a/src/emu/sound/digitalk.h b/src/emu/sound/digitalk.h
index 70fc392764c..143e6a29df0 100644
--- a/src/emu/sound/digitalk.h
+++ b/src/emu/sound/digitalk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _DIGITALKER_H_
 #define _DIGITALKER_H_
 
diff --git a/src/emu/sound/disc_cls.h b/src/emu/sound/disc_cls.h
index e54ccf916e1..b7713b5c2a2 100644
--- a/src/emu/sound/disc_cls.h
+++ b/src/emu/sound/disc_cls.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISC_CLS_H__
diff --git a/src/emu/sound/disc_dev.h b/src/emu/sound/disc_dev.h
index 5ccd6cd2963..dd083bffc08 100644
--- a/src/emu/sound/disc_dev.h
+++ b/src/emu/sound/disc_dev.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISC_DEV_H__
diff --git a/src/emu/sound/disc_flt.h b/src/emu/sound/disc_flt.h
index 6c066da974e..7f6f4eea087 100644
--- a/src/emu/sound/disc_flt.h
+++ b/src/emu/sound/disc_flt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISC_FLTH__
diff --git a/src/emu/sound/disc_mth.h b/src/emu/sound/disc_mth.h
index 899c113b55a..c4485a41f96 100644
--- a/src/emu/sound/disc_mth.h
+++ b/src/emu/sound/disc_mth.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISC_MTH_H__
diff --git a/src/emu/sound/disc_wav.h b/src/emu/sound/disc_wav.h
index 2cd285d7353..1527cf87f94 100644
--- a/src/emu/sound/disc_wav.h
+++ b/src/emu/sound/disc_wav.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISC_WAV_H__
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index e0acc5ef484..3b39c36a2d4 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  *
  *  MAME - Discrete sound system emulation library
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index ef674da5e8d..fc17c112a88 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DISCRETE_H__
diff --git a/src/emu/sound/es1373.c b/src/emu/sound/es1373.c
index 8b4a65456d4..ca5932c5812 100644
--- a/src/emu/sound/es1373.c
+++ b/src/emu/sound/es1373.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "es1373.h"
 
 #define LOG_ES            (0)
diff --git a/src/emu/sound/es1373.h b/src/emu/sound/es1373.h
index 4436c9ffdc0..38cc913b240 100644
--- a/src/emu/sound/es1373.h
+++ b/src/emu/sound/es1373.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Creative Labs Ensonic AudioPCI97 ES1373
 
 #pragma once
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 09f9bf2cc3e..bcb551703d1 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   ES5503 - Ensoniq ES5503 "DOC" emulator v2.1.1
diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h
index 14bda5a6228..7975b21406a 100644
--- a/src/emu/sound/es5503.h
+++ b/src/emu/sound/es5503.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ES5503_H__
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index 40baa046425..b3306e8970d 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
  *
  *  Streaming single channel ADPCM core for the ES8712 chip
diff --git a/src/emu/sound/es8712.h b/src/emu/sound/es8712.h
index 93419119307..5c2810f56d8 100644
--- a/src/emu/sound/es8712.h
+++ b/src/emu/sound/es8712.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* An interface for the ES8712 ADPCM chip */
 
 #pragma once
diff --git a/src/emu/sound/esqpump.c b/src/emu/sound/esqpump.c
index 73f325bceae..87f87011c9b 100644
--- a/src/emu/sound/esqpump.c
+++ b/src/emu/sound/esqpump.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   esqpump.c - Ensoniq 5505/5506 to 5510 interface.
diff --git a/src/emu/sound/esqpump.h b/src/emu/sound/esqpump.h
index eae3cebb32d..64229b78e15 100644
--- a/src/emu/sound/esqpump.h
+++ b/src/emu/sound/esqpump.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef _ESQPUMP_H_
diff --git a/src/emu/sound/filter.c b/src/emu/sound/filter.c
index efd6796de86..ee760fb569c 100644
--- a/src/emu/sound/filter.c
+++ b/src/emu/sound/filter.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "filter.h"
 
diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h
index b2ed922b642..9ce54348a84 100644
--- a/src/emu/sound/filter.h
+++ b/src/emu/sound/filter.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __FILTER_H__
diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c
index cec4ebd6bc4..37299b23536 100644
--- a/src/emu/sound/flt_rc.c
+++ b/src/emu/sound/flt_rc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "flt_rc.h"
 
diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h
index aed08d8c0fe..d99b27195bd 100644
--- a/src/emu/sound/flt_rc.h
+++ b/src/emu/sound/flt_rc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __FLT_RC_H__
diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c
index f291b2a6534..3f553704adb 100644
--- a/src/emu/sound/flt_vol.c
+++ b/src/emu/sound/flt_vol.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "flt_vol.h"
 
diff --git a/src/emu/sound/flt_vol.h b/src/emu/sound/flt_vol.h
index 8440989764a..437681d9851 100644
--- a/src/emu/sound/flt_vol.h
+++ b/src/emu/sound/flt_vol.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __FLT_VOL_H__
diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c
index 3563594a6a1..0772ee66d55 100644
--- a/src/emu/sound/fm.c
+++ b/src/emu/sound/fm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define YM2610B_WARNING
 
 /*
diff --git a/src/emu/sound/fm.h b/src/emu/sound/fm.h
index 901f59d229c..657628ac19d 100644
--- a/src/emu/sound/fm.h
+++ b/src/emu/sound/fm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   File: fm.h -- header file for software emulation for FM sound generator
 
diff --git a/src/emu/sound/fm2612.c b/src/emu/sound/fm2612.c
index 66c8cb11c9b..b30d6a75926 100644
--- a/src/emu/sound/fm2612.c
+++ b/src/emu/sound/fm2612.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **
 ** File: fm2612.c -- software implementation of Yamaha YM2612 FM sound generator
diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c
index 1670acb6c8d..d234cbc9c6e 100644
--- a/src/emu/sound/fmopl.c
+++ b/src/emu/sound/fmopl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **
 ** File: fmopl.c - software implementation of FM sound generator
diff --git a/src/emu/sound/fmopl.h b/src/emu/sound/fmopl.h
index 708bc1c7287..73e7bb1e5b7 100644
--- a/src/emu/sound/fmopl.h
+++ b/src/emu/sound/fmopl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __FMOPL_H__
diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c
index 09aff0416ca..b6501ed7448 100644
--- a/src/emu/sound/gaelco.c
+++ b/src/emu/sound/gaelco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                     Gaelco Sound Hardware
 
diff --git a/src/emu/sound/gaelco.h b/src/emu/sound/gaelco.h
index 83235e9f69c..25bb3df94f5 100644
--- a/src/emu/sound/gaelco.h
+++ b/src/emu/sound/gaelco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __GAELCO_SND_H__
diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c
index 2fbd4d2c0fe..929b27e0e9c 100644
--- a/src/emu/sound/hc55516.c
+++ b/src/emu/sound/hc55516.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Harris HC-55516 (and related) emulator
diff --git a/src/emu/sound/hc55516.h b/src/emu/sound/hc55516.h
index 31466822576..182bce3cc49 100644
--- a/src/emu/sound/hc55516.h
+++ b/src/emu/sound/hc55516.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __HC55516_H__
diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c
index b34959cd529..f83ba350747 100644
--- a/src/emu/sound/iremga20.c
+++ b/src/emu/sound/iremga20.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
 Irem GA20 PCM Sound Chip
diff --git a/src/emu/sound/iremga20.h b/src/emu/sound/iremga20.h
index f919065e749..575046e81e8 100644
--- a/src/emu/sound/iremga20.h
+++ b/src/emu/sound/iremga20.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Irem GA20 PCM Sound Chip
diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c
index 446cc5ef074..1fd04cb9a72 100644
--- a/src/emu/sound/k005289.c
+++ b/src/emu/sound/k005289.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami 005289 - SCC sound as used in Bubblesystem
diff --git a/src/emu/sound/k005289.h b/src/emu/sound/k005289.h
index 2a36da8ea50..2ace2138a30 100644
--- a/src/emu/sound/k005289.h
+++ b/src/emu/sound/k005289.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __K005289_H__
diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c
index 0cf4f50f9f1..fd7b61371ee 100644
--- a/src/emu/sound/k007232.c
+++ b/src/emu/sound/k007232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    Konami PCM controller                              */
 /*********************************************************/
diff --git a/src/emu/sound/k007232.h b/src/emu/sound/k007232.h
index 7645ab4b861..a52df169680 100644
--- a/src/emu/sound/k007232.h
+++ b/src/emu/sound/k007232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    Konami PCM controller                              */
 /*********************************************************/
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index 00e59790e12..5ee31ce5638 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami 051649 - SCC1 sound as used in Haunted Castle, City Bomber
diff --git a/src/emu/sound/k051649.h b/src/emu/sound/k051649.h
index 7dcb1fef5cc..d0e9faee86c 100644
--- a/src/emu/sound/k051649.h
+++ b/src/emu/sound/k051649.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __K051649_H__
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index 8eeac8553a3..75497314afe 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Konami 053260 KDSC
diff --git a/src/emu/sound/k053260.h b/src/emu/sound/k053260.h
index 735978fb32b..be2332ceb2b 100644
--- a/src/emu/sound/k053260.h
+++ b/src/emu/sound/k053260.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Konami 053260 KDSC
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index 7995d60926f..c749f38945e 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Konami 054539 (TOP) PCM Sound Chip
diff --git a/src/emu/sound/k054539.h b/src/emu/sound/k054539.h
index 3080c750f0c..c246089afdd 100644
--- a/src/emu/sound/k054539.h
+++ b/src/emu/sound/k054539.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Konami 054539 PCM Sound Chip
diff --git a/src/emu/sound/k056800.c b/src/emu/sound/k056800.c
index ed6d14f3c95..20842e1cf31 100644
--- a/src/emu/sound/k056800.c
+++ b/src/emu/sound/k056800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     Konami K056800 (MIRAC)
diff --git a/src/emu/sound/k056800.h b/src/emu/sound/k056800.h
index f7b6194913a..07aa408a2d2 100644
--- a/src/emu/sound/k056800.h
+++ b/src/emu/sound/k056800.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Konami 056800 MIRAC sound interface
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.c b/src/emu/sound/l7a1045_l6028_dsp_a.c
index 8d8effe6d2a..04cf10a392d 100644
--- a/src/emu/sound/l7a1045_l6028_dsp_a.c
+++ b/src/emu/sound/l7a1045_l6028_dsp_a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     L7A1045 L6028 DSP-A
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.h b/src/emu/sound/l7a1045_l6028_dsp_a.h
index da0cbb41c13..314fc34b554 100644
--- a/src/emu/sound/l7a1045_l6028_dsp_a.h
+++ b/src/emu/sound/l7a1045_l6028_dsp_a.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/emu/sound/lmc1992.c b/src/emu/sound/lmc1992.c
index e4fb58d5ea6..3984888f66f 100644
--- a/src/emu/sound/lmc1992.c
+++ b/src/emu/sound/lmc1992.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
diff --git a/src/emu/sound/lmc1992.h b/src/emu/sound/lmc1992.h
index cf15415b78e..fda581f028d 100644
--- a/src/emu/sound/lmc1992.h
+++ b/src/emu/sound/lmc1992.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
diff --git a/src/emu/sound/mas3507d.c b/src/emu/sound/mas3507d.c
index c9ad198b4a7..7f2bb4a9eb9 100644
--- a/src/emu/sound/mas3507d.c
+++ b/src/emu/sound/mas3507d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //
 // MAS 3507D MPEG audio decoder
 //
diff --git a/src/emu/sound/mas3507d.h b/src/emu/sound/mas3507d.h
index 4f2c12eadb0..49aee634813 100644
--- a/src/emu/sound/mas3507d.h
+++ b/src/emu/sound/mas3507d.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MAS3507D_H__
diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c
index 0c2704a2fa1..124bbf2d5f0 100644
--- a/src/emu/sound/mos6560.c
+++ b/src/emu/sound/mos6560.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MOS 6560 / 6561 Video Interface Chip
diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h
index 463411f357b..179a9f5ebd8 100644
--- a/src/emu/sound/mos6560.h
+++ b/src/emu/sound/mos6560.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MOS 6560/6561 Video Interface Chip (VIC) emulation
diff --git a/src/emu/sound/mos6581.c b/src/emu/sound/mos6581.c
index 62ac428a7c1..ee0eac4ef9d 100644
--- a/src/emu/sound/mos6581.c
+++ b/src/emu/sound/mos6581.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     MOS 6581/8580 Sound Interface Device emulation
diff --git a/src/emu/sound/mos6581.h b/src/emu/sound/mos6581.h
index ff6598ec3f1..c199827d291 100644
--- a/src/emu/sound/mos6581.h
+++ b/src/emu/sound/mos6581.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     MOS 6581/8580 Sound Interface Device emulation
diff --git a/src/emu/sound/mos7360.c b/src/emu/sound/mos7360.c
index 40b5b479337..5ab22be3734 100644
--- a/src/emu/sound/mos7360.c
+++ b/src/emu/sound/mos7360.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     MOS 7360/8360 Text Edit Device (TED) emulation
diff --git a/src/emu/sound/mos7360.h b/src/emu/sound/mos7360.h
index b83c9850fc1..803811e0758 100644
--- a/src/emu/sound/mos7360.h
+++ b/src/emu/sound/mos7360.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MOS 7360/8360 Text Edit Device (TED) emulation
diff --git a/src/emu/sound/mpeg_audio.c b/src/emu/sound/mpeg_audio.c
index 7df2b9c3fe5..db2763199af 100644
--- a/src/emu/sound/mpeg_audio.c
+++ b/src/emu/sound/mpeg_audio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MPEG audio support.  Only layer2 and variants for now.
diff --git a/src/emu/sound/mpeg_audio.h b/src/emu/sound/mpeg_audio.h
index 209af5655dc..a4bd27c7101 100644
--- a/src/emu/sound/mpeg_audio.h
+++ b/src/emu/sound/mpeg_audio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MPEG audio support.  Only layer2 and variants for now.
diff --git a/src/emu/sound/msm5205.h b/src/emu/sound/msm5205.h
index 2ccca75a468..d52f2ae076e 100644
--- a/src/emu/sound/msm5205.h
+++ b/src/emu/sound/msm5205.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MSM5205_H__
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index e682e7fc081..29fa99cb4d4 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "msm5232.h"
diff --git a/src/emu/sound/msm5232.h b/src/emu/sound/msm5232.h
index 0fc1a08127b..c0cb64d9306 100644
--- a/src/emu/sound/msm5232.h
+++ b/src/emu/sound/msm5232.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MSM5232_H__
diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index 20ee7e0b779..295e0c84cff 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Sega System 32 Multi/Model 1/Model 2 custom PCM chip (315-5560) emulation.
  *
diff --git a/src/emu/sound/multipcm.h b/src/emu/sound/multipcm.h
index b900d77f71d..fc9b192f87e 100644
--- a/src/emu/sound/multipcm.h
+++ b/src/emu/sound/multipcm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MULTIPCM_H__
diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c
index 28de671d04b..608a40d3bbf 100644
--- a/src/emu/sound/n63701x.c
+++ b/src/emu/sound/n63701x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 An Hitachi HD637A01X0 MCU programmed to act as a sample player.
diff --git a/src/emu/sound/n63701x.h b/src/emu/sound/n63701x.h
index 521d3d47353..4539c449179 100644
--- a/src/emu/sound/n63701x.h
+++ b/src/emu/sound/n63701x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __N63701X_H__
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index e9840816108..bb7e1019110 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NAMCO sound driver.
diff --git a/src/emu/sound/namco.h b/src/emu/sound/namco.h
index 3da05979fb3..a39684c7bb8 100644
--- a/src/emu/sound/namco.h
+++ b/src/emu/sound/namco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NAMCO_H__
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 0188e1a39b4..8ae41dcc925 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   MAME/MESS NES APU CORE
diff --git a/src/emu/sound/nes_apu.h b/src/emu/sound/nes_apu.h
index 3027c23d4b9..04d9c301474 100644
--- a/src/emu/sound/nes_apu.h
+++ b/src/emu/sound/nes_apu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   MAME/MESS NES APU CORE
diff --git a/src/emu/sound/nes_defs.h b/src/emu/sound/nes_defs.h
index 9890d8efb2a..8aafb486498 100644
--- a/src/emu/sound/nes_defs.h
+++ b/src/emu/sound/nes_defs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   MAME/MESS NES APU CORE
diff --git a/src/emu/sound/nile.c b/src/emu/sound/nile.c
index 47dacc55516..fcd684d5e5f 100644
--- a/src/emu/sound/nile.c
+++ b/src/emu/sound/nile.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************
       Seta custom Nile ST-0026 chip
       sound emulation by Tomasz Slanina
diff --git a/src/emu/sound/nile.h b/src/emu/sound/nile.h
index c6809e31eee..f301cf71cda 100644
--- a/src/emu/sound/nile.h
+++ b/src/emu/sound/nile.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NILE_H__
diff --git a/src/emu/sound/okiadpcm.c b/src/emu/sound/okiadpcm.c
index 5ad05a5bb32..e5431629232 100644
--- a/src/emu/sound/okiadpcm.c
+++ b/src/emu/sound/okiadpcm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okiadpcm.h
diff --git a/src/emu/sound/okiadpcm.h b/src/emu/sound/okiadpcm.h
index 2d002e79085..517714cb416 100644
--- a/src/emu/sound/okiadpcm.h
+++ b/src/emu/sound/okiadpcm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okiadpcm.h
diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c
index 0f1bbe5e3ed..d4e7c71aa19 100644
--- a/src/emu/sound/okim6258.c
+++ b/src/emu/sound/okim6258.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
  *
  *   OKI MSM6258 ADPCM
diff --git a/src/emu/sound/okim6258.h b/src/emu/sound/okim6258.h
index 57eaf465a1e..af1b662a3a9 100644
--- a/src/emu/sound/okim6258.h
+++ b/src/emu/sound/okim6258.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __OKIM6258_H__
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 1c823e93cae..a7d3b54d5aa 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okim6295.h
diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h
index 2159d7b6510..17cc2e0a7a4 100644
--- a/src/emu/sound/okim6295.h
+++ b/src/emu/sound/okim6295.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okim6295.h
diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c
index 71d1a389eda..a2e971e30f3 100644
--- a/src/emu/sound/okim6376.c
+++ b/src/emu/sound/okim6376.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
  *
  *   OKI MSM6376 ADPCM
diff --git a/src/emu/sound/okim6376.h b/src/emu/sound/okim6376.h
index dd5d5336e89..0df2af5f258 100644
--- a/src/emu/sound/okim6376.h
+++ b/src/emu/sound/okim6376.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __OKIM6376_H__
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 4ce7fc6eb68..1503d0e7c80 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okim9810.h
diff --git a/src/emu/sound/okim9810.h b/src/emu/sound/okim9810.h
index fbf05d16723..8d5a88c7252 100644
--- a/src/emu/sound/okim9810.h
+++ b/src/emu/sound/okim9810.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     okim9810.h
diff --git a/src/emu/sound/pci-ac97.c b/src/emu/sound/pci-ac97.c
index 6890b6add73..32b51669906 100644
--- a/src/emu/sound/pci-ac97.c
+++ b/src/emu/sound/pci-ac97.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pci-ac97.h"
 
 const device_type AC97 = &device_creator<ac97_device>;
diff --git a/src/emu/sound/pci-ac97.h b/src/emu/sound/pci-ac97.h
index ffe7c8165df..dd63bf93240 100644
--- a/src/emu/sound/pci-ac97.h
+++ b/src/emu/sound/pci-ac97.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCI_AC97_H
 #define PCI_AC97_H
 
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index d014e34a33d..4b994601480 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  POKEY chip emulator 4.6
diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h
index dbfeb8326d6..8e77bf89207 100644
--- a/src/emu/sound/pokey.h
+++ b/src/emu/sound/pokey.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  POKEY chip emulator 4.6
diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c
index 7da3b82b3d2..8be8794694c 100644
--- a/src/emu/sound/qs1000.c
+++ b/src/emu/sound/qs1000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     qs1000.c
diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h
index 3b5ce16ecae..180f05fab02 100644
--- a/src/emu/sound/qs1000.h
+++ b/src/emu/sound/qs1000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     qs1000.h
diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c
index 38d760c02ee..1015d981f8d 100644
--- a/src/emu/sound/qsound.c
+++ b/src/emu/sound/qsound.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Capcom System QSound(tm)
diff --git a/src/emu/sound/qsound.h b/src/emu/sound/qsound.h
index a29e5425ec6..698ebcf9448 100644
--- a/src/emu/sound/qsound.h
+++ b/src/emu/sound/qsound.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
     Capcom Q-Sound system
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 3d514c87eea..3253c447a5f 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Ricoh RF5C400 emulator
 
diff --git a/src/emu/sound/rf5c400.h b/src/emu/sound/rf5c400.h
index 46d35031d33..17c84309888 100644
--- a/src/emu/sound/rf5c400.h
+++ b/src/emu/sound/rf5c400.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Ricoh RF5C400 emulator */
 
 #pragma once
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 094760211d2..c4efa4e6045 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    ricoh RF5C68(or clone) PCM controller              */
 /*********************************************************/
diff --git a/src/emu/sound/rf5c68.h b/src/emu/sound/rf5c68.h
index ca6cebc3989..7e204e3021d 100644
--- a/src/emu/sound/rf5c68.h
+++ b/src/emu/sound/rf5c68.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    ricoh RF5C68(or clone) PCM controller              */
 /*********************************************************/
diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c
index 409610da341..48e02ac0893 100644
--- a/src/emu/sound/s14001a.c
+++ b/src/emu/sound/s14001a.c
@@ -601,16 +601,6 @@ s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, d
 {
 }
 
-//-------------------------------------------------
-//  device_config_complete - perform any
-//  operations now that the configuration is
-//  complete
-//-------------------------------------------------
-
-void s14001a_device::device_config_complete()
-{
-}
-
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
@@ -629,6 +619,27 @@ void s14001a_device::device_start()
 	}
 
 	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() ? clock() : machine().sample_rate());
+	
+	save_item(NAME(m_WordInput));
+	save_item(NAME(m_LatchedWord));
+	save_item(NAME(m_SyllableAddress));
+	save_item(NAME(m_PhoneAddress));
+	save_item(NAME(m_PlayParams));
+	save_item(NAME(m_PhoneOffset));
+	save_item(NAME(m_LengthCounter));
+	save_item(NAME(m_RepeatCounter));
+	save_item(NAME(m_OutputCounter));
+	save_item(NAME(m_machineState));
+	save_item(NAME(m_nextstate));
+	save_item(NAME(m_laststate));
+	save_item(NAME(m_resetState));
+	save_item(NAME(m_oddeven));
+	save_item(NAME(m_GlobalSilenceState));
+	save_item(NAME(m_OldDelta));
+	save_item(NAME(m_DACOutput));
+	save_item(NAME(m_audioout));
+	save_item(NAME(m_filtervals));
+	save_item(NAME(m_VSU1000_amp)); 
 }
 
 //-------------------------------------------------
diff --git a/src/emu/sound/s14001a.h b/src/emu/sound/s14001a.h
index 4c212fc05a4..074cab14f34 100644
--- a/src/emu/sound/s14001a.h
+++ b/src/emu/sound/s14001a.h
@@ -27,7 +27,6 @@ public:
 
 protected:
 	// device-level overrides
-	virtual void device_config_complete();
 	virtual void device_start();
 
 	// sound stream update overrides
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index 106d0c55935..fc08f5dc58b 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller, Manuel Abadia
 /***************************************************************************
 
     Philips SAA1099 Sound driver
diff --git a/src/emu/sound/saa1099.h b/src/emu/sound/saa1099.h
index b68626dee7a..311ac2a571e 100644
--- a/src/emu/sound/saa1099.h
+++ b/src/emu/sound/saa1099.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************
     Philips SAA1099 Sound driver
 **********************************************/
diff --git a/src/emu/sound/sb0400.c b/src/emu/sound/sb0400.c
index 6a8c522a525..238f7ff61aa 100644
--- a/src/emu/sound/sb0400.c
+++ b/src/emu/sound/sb0400.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sb0400.h"
 
 const device_type SB0400 = &device_creator<sb0400_device>;
diff --git a/src/emu/sound/sb0400.h b/src/emu/sound/sb0400.h
index cea968503d9..666d242eb0a 100644
--- a/src/emu/sound/sb0400.h
+++ b/src/emu/sound/sb0400.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Creative labs SB0400 Audigy2 Value
 
 #ifndef SB0400_H
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 7f88c73adfb..c60403f9e9a 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Sega/Yamaha YMF292-F (SCSP = Saturn Custom Sound Processor) emulation
     By ElSemi
diff --git a/src/emu/sound/scsp.h b/src/emu/sound/scsp.h
index 8440f62b7a0..0f287b20017 100644
--- a/src/emu/sound/scsp.h
+++ b/src/emu/sound/scsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SCSP (YMF292-F) header
 */
diff --git a/src/emu/sound/scspdsp.c b/src/emu/sound/scspdsp.c
index add8a3a1e03..aa0e92b6e5e 100644
--- a/src/emu/sound/scspdsp.c
+++ b/src/emu/sound/scspdsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "scspdsp.h"
 
diff --git a/src/emu/sound/scspdsp.h b/src/emu/sound/scspdsp.h
index 2260b2cceac..bdaa7368639 100644
--- a/src/emu/sound/scspdsp.h
+++ b/src/emu/sound/scspdsp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SCSPDSP_H__
diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c
index 553a372a8aa..112dba3d994 100644
--- a/src/emu/sound/segapcm.c
+++ b/src/emu/sound/segapcm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    SEGA 16ch 8bit PCM                                 */
 /*********************************************************/
diff --git a/src/emu/sound/segapcm.h b/src/emu/sound/segapcm.h
index af1b9d69e9f..45c567f141e 100644
--- a/src/emu/sound/segapcm.h
+++ b/src/emu/sound/segapcm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************/
 /*    SEGA 8bit PCM                                      */
 /*********************************************************/
diff --git a/src/emu/sound/sid.c b/src/emu/sound/sid.c
index 95b7b3a8fc5..48dec7a8053 100644
--- a/src/emu/sound/sid.c
+++ b/src/emu/sound/sid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   copyright peter trauner
 
diff --git a/src/emu/sound/sid.h b/src/emu/sound/sid.h
index e919b715e4c..2f1e613fe75 100644
--- a/src/emu/sound/sid.h
+++ b/src/emu/sound/sid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SID_H__
diff --git a/src/emu/sound/side6581.h b/src/emu/sound/side6581.h
index 184bd899ac7..89bd2be5cbf 100644
--- a/src/emu/sound/side6581.h
+++ b/src/emu/sound/side6581.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //
 // /home/ms/source/sidplay/libsidplay/emu/RCS/enve_dl.h,v
 //
diff --git a/src/emu/sound/sidenvel.c b/src/emu/sound/sidenvel.c
index fdf22d98946..1d61245bb18 100644
--- a/src/emu/sound/sidenvel.c
+++ b/src/emu/sound/sidenvel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*========================================================================= */
 /* This source implements the ADSR volume envelope of the SID-chip. */
 /* Two different envelope shapes are implemented, an exponential */
diff --git a/src/emu/sound/sidenvel.h b/src/emu/sound/sidenvel.h
index e0ff2a5761f..81fe9c73ade 100644
--- a/src/emu/sound/sidenvel.h
+++ b/src/emu/sound/sidenvel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //
 // /home/ms/source/sidplay/libsidplay/emu/RCS/envelope.h,v
 //
diff --git a/src/emu/sound/sidvoice.c b/src/emu/sound/sidvoice.c
index fd548680471..91ef64efb50 100644
--- a/src/emu/sound/sidvoice.c
+++ b/src/emu/sound/sidvoice.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sidvoice.h"
 #include "sid.h"
diff --git a/src/emu/sound/sidvoice.h b/src/emu/sound/sidvoice.h
index 942ddabe836..e66e861a255 100644
--- a/src/emu/sound/sidvoice.h
+++ b/src/emu/sound/sidvoice.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SIDVOICE_H__
diff --git a/src/emu/sound/sidw6581.h b/src/emu/sound/sidw6581.h
index 7ee07305200..c9846818d50 100644
--- a/src/emu/sound/sidw6581.h
+++ b/src/emu/sound/sidw6581.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef WAVE6581_h
 #define WAVE6581_h
 
diff --git a/src/emu/sound/sidw8580.h b/src/emu/sound/sidw8580.h
index 9a26011165d..737eb970553 100644
--- a/src/emu/sound/sidw8580.h
+++ b/src/emu/sound/sidw8580.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SIDW8580_H__
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index cf6fba26a11..cae6a641abc 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Texas Instruments SN76477 emulator
diff --git a/src/emu/sound/sn76477.h b/src/emu/sound/sn76477.h
index f0a4faefd85..315d935a494 100644
--- a/src/emu/sound/sn76477.h
+++ b/src/emu/sound/sn76477.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Texas Instruments SN76477 emulator
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c
index 03541b372b8..bd770bc629c 100644
--- a/src/emu/sound/sn76496.c
+++ b/src/emu/sound/sn76496.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   sn76496.c
diff --git a/src/emu/sound/sn76496.h b/src/emu/sound/sn76496.h
index a5dd1af5b45..fbbd1a33f34 100644
--- a/src/emu/sound/sn76496.h
+++ b/src/emu/sound/sn76496.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SN76496_H__
diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c
index 1f04d05178c..ffc56838e20 100644
--- a/src/emu/sound/snkwave.c
+++ b/src/emu/sound/snkwave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SNK Wave sound driver.
diff --git a/src/emu/sound/snkwave.h b/src/emu/sound/snkwave.h
index 97373410e37..89bc70c84a8 100644
--- a/src/emu/sound/snkwave.h
+++ b/src/emu/sound/snkwave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SNKWAVE_H__
diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c
index d03e3391f9b..524424767b5 100644
--- a/src/emu/sound/sp0250.c
+++ b/src/emu/sound/sp0250.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    GI SP0250 digital LPC sound synthesizer
 
diff --git a/src/emu/sound/sp0250.h b/src/emu/sound/sp0250.h
index 6f1b9d6ab25..6e7b19d1e2d 100644
--- a/src/emu/sound/sp0250.h
+++ b/src/emu/sound/sp0250.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SP0250_H__
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index c41c174ee5f..fcd105e598c 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    GI SP0256 Narrator Speech Processor
    GI SPB640 Speech Buffer
diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h
index fde2478f922..2cecfef3bd6 100644
--- a/src/emu/sound/sp0256.h
+++ b/src/emu/sound/sp0256.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     SP0256 Narrator Speech Processor emulation
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 3f1ded25dfe..83bc9697b74 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     speaker.c
diff --git a/src/emu/sound/speaker.h b/src/emu/sound/speaker.h
index ee6b3297f37..60849926f00 100644
--- a/src/emu/sound/speaker.h
+++ b/src/emu/sound/speaker.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     speaker.h
diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c
index 496c50265c6..1b66314277e 100644
--- a/src/emu/sound/spu.c
+++ b/src/emu/sound/spu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Sony PlayStation SPU (CXD2922BQ/CXD2925Q) emulator
diff --git a/src/emu/sound/spu.h b/src/emu/sound/spu.h
index 6dc4f2abad1..fa4930cafd6 100644
--- a/src/emu/sound/spu.h
+++ b/src/emu/sound/spu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SPU_H__
diff --git a/src/emu/sound/spu_tables.c b/src/emu/sound/spu_tables.c
index c76ed989bd5..b24979c2afa 100644
--- a/src/emu/sound/spu_tables.c
+++ b/src/emu/sound/spu_tables.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "spu.h"
 
diff --git a/src/emu/sound/spureverb.c b/src/emu/sound/spureverb.c
index c9a8407f12f..92097f84507 100644
--- a/src/emu/sound/spureverb.c
+++ b/src/emu/sound/spureverb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "spureverb.h"
 
diff --git a/src/emu/sound/spureverb.h b/src/emu/sound/spureverb.h
index 3bd814c07c4..58c060af03b 100644
--- a/src/emu/sound/spureverb.h
+++ b/src/emu/sound/spureverb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _included_reverb_
 	#define _included_reverb_
 
diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c
index c21c766481d..8f4778d18bb 100644
--- a/src/emu/sound/st0016.c
+++ b/src/emu/sound/st0016.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************
       Seta custom ST-0016 chip
       sound emulation by R. Belmont, Tomasz Slanina, and David Haywood
diff --git a/src/emu/sound/st0016.h b/src/emu/sound/st0016.h
index f4f8cb63e1e..6bddf3a85c7 100644
--- a/src/emu/sound/st0016.h
+++ b/src/emu/sound/st0016.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ST0016_H__
diff --git a/src/emu/sound/t6721a.c b/src/emu/sound/t6721a.c
index 803072d23f4..2cc9828f407 100644
--- a/src/emu/sound/t6721a.c
+++ b/src/emu/sound/t6721a.c
@@ -4,9 +4,6 @@
 
     Toshiba T6721A C2MOS Voice Synthesizing LSI emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "t6721a.h"
diff --git a/src/emu/sound/t6721a.h b/src/emu/sound/t6721a.h
index df50f630097..ff969fa60be 100644
--- a/src/emu/sound/t6721a.h
+++ b/src/emu/sound/t6721a.h
@@ -4,9 +4,6 @@
 
     Toshiba T6721A C2MOS Voice Synthesizing LSI emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    SP3   1 |*    \_/     | 42  Vdd
diff --git a/src/emu/sound/t6w28.c b/src/emu/sound/t6w28.c
index e8e7c3ca28d..b9c0b62775c 100644
--- a/src/emu/sound/t6w28.c
+++ b/src/emu/sound/t6w28.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   t6w28.c (based on sn74696.c)
diff --git a/src/emu/sound/t6w28.h b/src/emu/sound/t6w28.h
index 5a312f8b32c..ba996f8f992 100644
--- a/src/emu/sound/t6w28.h
+++ b/src/emu/sound/t6w28.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __T6W28_H__
diff --git a/src/emu/sound/tiaintf.c b/src/emu/sound/tiaintf.c
index 26ee206a7a0..2dfb9b158ae 100644
--- a/src/emu/sound/tiaintf.c
+++ b/src/emu/sound/tiaintf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "tiaintf.h"
 #include "tiasound.h"
diff --git a/src/emu/sound/tiaintf.h b/src/emu/sound/tiaintf.h
index 726ff2df21b..4cea41f39d5 100644
--- a/src/emu/sound/tiaintf.h
+++ b/src/emu/sound/tiaintf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TIAINTF_H__
diff --git a/src/emu/sound/tiasound.c b/src/emu/sound/tiasound.c
index 66e7ec6a82f..b2e9eb10a34 100644
--- a/src/emu/sound/tiasound.c
+++ b/src/emu/sound/tiasound.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************/
 /*                                                                           */
 /* Module:  TIA Chip Sound Simulator                                         */
diff --git a/src/emu/sound/tiasound.h b/src/emu/sound/tiasound.h
index 9ca92a2bfd1..8790ca2bbc2 100644
--- a/src/emu/sound/tiasound.h
+++ b/src/emu/sound/tiasound.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************/
 /*                                                                           */
 /* Module:  TIA Chip Sound Simulator Includes, V1.1                          */
diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c
index 7b5eb3d9e3a..b63deeffee3 100644
--- a/src/emu/sound/tms3615.c
+++ b/src/emu/sound/tms3615.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "tms3615.h"
 
diff --git a/src/emu/sound/tms3615.h b/src/emu/sound/tms3615.h
index 6b49d5db88f..da89a5ee18c 100644
--- a/src/emu/sound/tms3615.h
+++ b/src/emu/sound/tms3615.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS3615_H__
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index 87324f45ea4..74910a0813f 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "tms36xx.h"
 
diff --git a/src/emu/sound/tms36xx.h b/src/emu/sound/tms36xx.h
index a38552592a1..1dce15b0086 100644
--- a/src/emu/sound/tms36xx.h
+++ b/src/emu/sound/tms36xx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS36XX_H__
diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c
index d66f753c157..3900068bd44 100644
--- a/src/emu/sound/tms5110.c
+++ b/src/emu/sound/tms5110.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
 
      TMS5110 simulator (modified from TMS5220 by Jarek Burczynski)
diff --git a/src/emu/sound/tms5110.h b/src/emu/sound/tms5110.h
index 25d960f3353..abd93b80808 100644
--- a/src/emu/sound/tms5110.h
+++ b/src/emu/sound/tms5110.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS5110_H__
diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c
index 3d9e5abf899..a6de16f323b 100644
--- a/src/emu/sound/tms5220.c
+++ b/src/emu/sound/tms5220.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
 
      TMS5200/5220 simulator
diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h
index 6aab4638a13..a66ba9359b1 100644
--- a/src/emu/sound/tms5220.h
+++ b/src/emu/sound/tms5220.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TMS5220_H__
diff --git a/src/emu/sound/upd7752.c b/src/emu/sound/upd7752.c
index d35fddf2b14..9b996f111e8 100644
--- a/src/emu/sound/upd7752.c
+++ b/src/emu/sound/upd7752.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 NEC uPD7752 Voice Synthesizing LSI
diff --git a/src/emu/sound/upd7752.h b/src/emu/sound/upd7752.h
index cdeb05b3dbd..2a818102c09 100644
--- a/src/emu/sound/upd7752.h
+++ b/src/emu/sound/upd7752.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index b12ca62aa38..ff8accd0cb4 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Juergen Buchmueller, Mike Balfour, Howie Cohen, Olivier Galibert, Aaron Giles
 /************************************************************
 
     NEC uPD7759/55/56/P56/57/58 ADPCM Speech Processor
diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h
index 948f7224927..9b0d031b402 100644
--- a/src/emu/sound/upd7759.h
+++ b/src/emu/sound/upd7759.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __UPD7759_H__
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index 8e0ca86b8aa..658683b7628 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     vlm5030.c
 
diff --git a/src/emu/sound/vlm5030.h b/src/emu/sound/vlm5030.h
index e2287e5ba31..5c0a5a942ac 100644
--- a/src/emu/sound/vlm5030.h
+++ b/src/emu/sound/vlm5030.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __VLM5030_H__
diff --git a/src/emu/sound/vrc6.c b/src/emu/sound/vrc6.c
index 58be80a0bae..1d474ee0c69 100644
--- a/src/emu/sound/vrc6.c
+++ b/src/emu/sound/vrc6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     vrc6.c
diff --git a/src/emu/sound/vrc6.h b/src/emu/sound/vrc6.h
index f1d2b1192fa..0322fc690c6 100644
--- a/src/emu/sound/vrc6.h
+++ b/src/emu/sound/vrc6.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     vrc6.h
diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c
index 1306a426bed..459310c279a 100644
--- a/src/emu/sound/vrender0.c
+++ b/src/emu/sound/vrender0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "vrender0.h"
 
diff --git a/src/emu/sound/vrender0.h b/src/emu/sound/vrender0.h
index e44bdae2dc5..11d1e17e2c0 100644
--- a/src/emu/sound/vrender0.h
+++ b/src/emu/sound/vrender0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __VRENDER0_H__
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index f4fe828fe12..fab9d2c0126 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     wave.c
diff --git a/src/emu/sound/wave.h b/src/emu/sound/wave.h
index 1f67e950d91..64f948f7166 100644
--- a/src/emu/sound/wave.h
+++ b/src/emu/sound/wave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __WAVE_H__
diff --git a/src/emu/sound/wavwrite.c b/src/emu/sound/wavwrite.c
index 34e3ef559c3..5ffce59abb0 100644
--- a/src/emu/sound/wavwrite.c
+++ b/src/emu/sound/wavwrite.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/wavwrite.h"
 
diff --git a/src/emu/sound/wavwrite.h b/src/emu/sound/wavwrite.h
index 8776a0eed0b..c83ca75878b 100644
--- a/src/emu/sound/wavwrite.h
+++ b/src/emu/sound/wavwrite.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __WAVWRITE_H__
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 3c45c4dcd00..4828cf6cc1b 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Seta Hardware =-
diff --git a/src/emu/sound/x1_010.h b/src/emu/sound/x1_010.h
index 2f9827ef234..76aa6ddfff6 100644
--- a/src/emu/sound/x1_010.h
+++ b/src/emu/sound/x1_010.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __X1_010_H__
diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c
index 669115b1c9c..37cd762a33d 100644
--- a/src/emu/sound/ym2151.c
+++ b/src/emu/sound/ym2151.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 *
 *   Yamaha YM2151 driver (version 2.150 final beta)
diff --git a/src/emu/sound/ym2151.h b/src/emu/sound/ym2151.h
index b14f764d104..44f4ba87d5b 100644
--- a/src/emu/sound/ym2151.h
+++ b/src/emu/sound/ym2151.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** File: ym2151.h - header file for software implementation of YM2151
 **                                            FM Operator Type-M(OPM)
diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c
index 72f8d5a9e7e..217fdd7150b 100644
--- a/src/emu/sound/ym2413.c
+++ b/src/emu/sound/ym2413.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **
 ** File: ym2413.c - software implementation of YM2413
diff --git a/src/emu/sound/ym2413.h b/src/emu/sound/ym2413.h
index eb1b1a058f4..15add606629 100644
--- a/src/emu/sound/ym2413.h
+++ b/src/emu/sound/ym2413.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __YM2413_H__
diff --git a/src/emu/sound/ymdeltat.c b/src/emu/sound/ymdeltat.c
index 285fe23ffdb..6437c5824b5 100644
--- a/src/emu/sound/ymdeltat.c
+++ b/src/emu/sound/ymdeltat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **
 ** File: ymdeltat.c
diff --git a/src/emu/sound/ymdeltat.h b/src/emu/sound/ymdeltat.h
index 7118a1ae199..02dddc27734 100644
--- a/src/emu/sound/ymdeltat.h
+++ b/src/emu/sound/ymdeltat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __YMDELTAT_H__
diff --git a/src/emu/sound/ymf262.c b/src/emu/sound/ymf262.c
index 559dcd53605..90e9f7ae45d 100644
--- a/src/emu/sound/ymf262.c
+++ b/src/emu/sound/ymf262.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **
 ** File: ymf262.c - software implementation of YMF262
diff --git a/src/emu/sound/ymf262.h b/src/emu/sound/ymf262.h
index b805ed485d8..84c7887d793 100644
--- a/src/emu/sound/ymf262.h
+++ b/src/emu/sound/ymf262.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __YMF262_H__
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index d4bf179bdb0..e16735c60f5 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Yamaha YMF271-F "OPX" emulator v0.1
     By R. Belmont.
diff --git a/src/emu/sound/ymf271.h b/src/emu/sound/ymf271.h
index 86a5bd75272..736f6d50712 100644
--- a/src/emu/sound/ymf271.h
+++ b/src/emu/sound/ymf271.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __YMF271_H__
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index 1e97e2673d2..53399b36582 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
    YMF278B  FM + Wave table Synthesizer (OPL4)
diff --git a/src/emu/sound/ymf278b.h b/src/emu/sound/ymf278b.h
index 0cfc1cfbe9a..2af255cb12a 100644
--- a/src/emu/sound/ymf278b.h
+++ b/src/emu/sound/ymf278b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __YMF278B_H__
diff --git a/src/emu/sound/ymz770.c b/src/emu/sound/ymz770.c
index d872f270ddd..4f937bb318c 100644
--- a/src/emu/sound/ymz770.c
+++ b/src/emu/sound/ymz770.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ymz770.c
diff --git a/src/emu/sound/ymz770.h b/src/emu/sound/ymz770.h
index c83c242383d..25a8582a368 100644
--- a/src/emu/sound/ymz770.h
+++ b/src/emu/sound/ymz770.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ymz770.h
diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c
index ee4d3b6b9eb..bc96108449d 100644
--- a/src/emu/sound/zsg2.c
+++ b/src/emu/sound/zsg2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     ZOOM ZSG-2 custom wavetable synthesizer
 
diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h
index 63c10301a30..9901193d170 100644
--- a/src/emu/sound/zsg2.h
+++ b/src/emu/sound/zsg2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     ZOOM ZSG-2 custom wavetable synthesizer
 */
diff --git a/src/emu/ui/barcode.c b/src/emu/ui/barcode.c
index ef26c6244a4..820fb17a4e8 100644
--- a/src/emu/ui/barcode.c
+++ b/src/emu/ui/barcode.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/barcode.c
diff --git a/src/emu/ui/barcode.h b/src/emu/ui/barcode.h
index 06b49a3eb7e..7294e9e84f0 100644
--- a/src/emu/ui/barcode.h
+++ b/src/emu/ui/barcode.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/barcode.h
diff --git a/src/emu/ui/cheatopt.c b/src/emu/ui/cheatopt.c
index 4932fc23133..4022564c391 100644
--- a/src/emu/ui/cheatopt.c
+++ b/src/emu/ui/cheatopt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/cheatopt.c
diff --git a/src/emu/ui/cheatopt.h b/src/emu/ui/cheatopt.h
index 3dcac9d599f..dbbacc2eed1 100644
--- a/src/emu/ui/cheatopt.h
+++ b/src/emu/ui/cheatopt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/cheatopt.h
diff --git a/src/emu/ui/devctrl.h b/src/emu/ui/devctrl.h
index b5b008e4baa..1eb722c3990 100644
--- a/src/emu/ui/devctrl.h
+++ b/src/emu/ui/devctrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/devctrl.h
diff --git a/src/emu/ui/devopt.c b/src/emu/ui/devopt.c
index c009dc539db..5158abdf5e6 100644
--- a/src/emu/ui/devopt.c
+++ b/src/emu/ui/devopt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/devopt.c
diff --git a/src/emu/ui/devopt.h b/src/emu/ui/devopt.h
index 2319acbaeb1..7650570b129 100644
--- a/src/emu/ui/devopt.h
+++ b/src/emu/ui/devopt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/devopt.h
diff --git a/src/emu/ui/filemngr.c b/src/emu/ui/filemngr.c
index 578721b233b..9da54acda49 100644
--- a/src/emu/ui/filemngr.c
+++ b/src/emu/ui/filemngr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/filemngr.c
diff --git a/src/emu/ui/filemngr.h b/src/emu/ui/filemngr.h
index dbc4c72e50d..30dca33889a 100644
--- a/src/emu/ui/filemngr.h
+++ b/src/emu/ui/filemngr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/filemngr.h
diff --git a/src/emu/ui/filesel.c b/src/emu/ui/filesel.c
index 01dff2708b4..5f98a5e9f89 100644
--- a/src/emu/ui/filesel.c
+++ b/src/emu/ui/filesel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/filesel.c
diff --git a/src/emu/ui/filesel.h b/src/emu/ui/filesel.h
index 13db951f49a..b51daada987 100644
--- a/src/emu/ui/filesel.h
+++ b/src/emu/ui/filesel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/filesel.h
diff --git a/src/emu/ui/imgcntrl.c b/src/emu/ui/imgcntrl.c
index 132bf2662c5..82fd0bf9e9a 100644
--- a/src/emu/ui/imgcntrl.c
+++ b/src/emu/ui/imgcntrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/imgcntrl.c
diff --git a/src/emu/ui/imgcntrl.h b/src/emu/ui/imgcntrl.h
index d2db9404187..ad65fe0c18b 100644
--- a/src/emu/ui/imgcntrl.h
+++ b/src/emu/ui/imgcntrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/imgcntrl.h
diff --git a/src/emu/ui/info.c b/src/emu/ui/info.c
index caee68b8bce..a8cc85b2a48 100644
--- a/src/emu/ui/info.c
+++ b/src/emu/ui/info.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/info.c
diff --git a/src/emu/ui/info.h b/src/emu/ui/info.h
index 38783ae1707..83af1029f19 100644
--- a/src/emu/ui/info.h
+++ b/src/emu/ui/info.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/info.h
diff --git a/src/emu/ui/inputmap.c b/src/emu/ui/inputmap.c
index 129d933ae92..b84fdd0ab55 100644
--- a/src/emu/ui/inputmap.c
+++ b/src/emu/ui/inputmap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/inputmap.c
diff --git a/src/emu/ui/inputmap.h b/src/emu/ui/inputmap.h
index 2759b3adabc..300386dc0e1 100644
--- a/src/emu/ui/inputmap.h
+++ b/src/emu/ui/inputmap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/inputmap.h
diff --git a/src/emu/ui/mainmenu.c b/src/emu/ui/mainmenu.c
index 9e122ba7a2b..e6222a12947 100644
--- a/src/emu/ui/mainmenu.c
+++ b/src/emu/ui/mainmenu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/mainmenu.c
diff --git a/src/emu/ui/mainmenu.h b/src/emu/ui/mainmenu.h
index bef5808986f..ab799831adc 100644
--- a/src/emu/ui/mainmenu.h
+++ b/src/emu/ui/mainmenu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/mainmenu.h
diff --git a/src/emu/ui/menu.c b/src/emu/ui/menu.c
index 906aa507087..c5a5b1a82f6 100644
--- a/src/emu/ui/menu.c
+++ b/src/emu/ui/menu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/menu.c
diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h
index 253e3634ad7..7f3b47475cb 100644
--- a/src/emu/ui/menu.h
+++ b/src/emu/ui/menu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/menu.h
diff --git a/src/emu/ui/miscmenu.c b/src/emu/ui/miscmenu.c
index e06b8933de0..000fef2f235 100644
--- a/src/emu/ui/miscmenu.c
+++ b/src/emu/ui/miscmenu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     miscmenu.c
diff --git a/src/emu/ui/miscmenu.h b/src/emu/ui/miscmenu.h
index a5c433be34a..73dfc1bfa54 100644
--- a/src/emu/ui/miscmenu.h
+++ b/src/emu/ui/miscmenu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/miscmenu.h
diff --git a/src/emu/ui/selgame.c b/src/emu/ui/selgame.c
index 45faeac207a..537d9e8b084 100644
--- a/src/emu/ui/selgame.c
+++ b/src/emu/ui/selgame.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/selgame.c
diff --git a/src/emu/ui/selgame.h b/src/emu/ui/selgame.h
index bae669c3040..67c4bbe6e47 100644
--- a/src/emu/ui/selgame.h
+++ b/src/emu/ui/selgame.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/selgame.h
diff --git a/src/emu/ui/sliders.c b/src/emu/ui/sliders.c
index e547538bc76..ed07225a4fd 100644
--- a/src/emu/ui/sliders.c
+++ b/src/emu/ui/sliders.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     miscmenu.c
diff --git a/src/emu/ui/sliders.h b/src/emu/ui/sliders.h
index d7fdb081dc0..51c391087c2 100644
--- a/src/emu/ui/sliders.h
+++ b/src/emu/ui/sliders.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/miscmenu.h
diff --git a/src/emu/ui/slotopt.c b/src/emu/ui/slotopt.c
index 5a2314591a6..a4450840881 100644
--- a/src/emu/ui/slotopt.c
+++ b/src/emu/ui/slotopt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/slotopt.c
diff --git a/src/emu/ui/slotopt.h b/src/emu/ui/slotopt.h
index a3c4514f06b..294be687394 100644
--- a/src/emu/ui/slotopt.h
+++ b/src/emu/ui/slotopt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/slotopt.h
diff --git a/src/emu/ui/swlist.c b/src/emu/ui/swlist.c
index 847483edcc1..a6deb8d146f 100644
--- a/src/emu/ui/swlist.c
+++ b/src/emu/ui/swlist.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/swlist.c
diff --git a/src/emu/ui/swlist.h b/src/emu/ui/swlist.h
index 7ca6f7513b8..89ce65d32dc 100644
--- a/src/emu/ui/swlist.h
+++ b/src/emu/ui/swlist.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/swlist.h
diff --git a/src/emu/ui/tapectrl.c b/src/emu/ui/tapectrl.c
index c4bd850e232..dc38de17adb 100644
--- a/src/emu/ui/tapectrl.c
+++ b/src/emu/ui/tapectrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/tapectrl.c
diff --git a/src/emu/ui/tapectrl.h b/src/emu/ui/tapectrl.h
index dadaca63f6a..cebd4ead19a 100644
--- a/src/emu/ui/tapectrl.h
+++ b/src/emu/ui/tapectrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/tapectrl.h
diff --git a/src/emu/ui/ui.c b/src/emu/ui/ui.c
index 5ca1b3ddb13..547e6849097 100644
--- a/src/emu/ui/ui.c
+++ b/src/emu/ui/ui.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui.c
diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h
index 3f74eac6097..5a916337bb9 100644
--- a/src/emu/ui/ui.h
+++ b/src/emu/ui/ui.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui.h
diff --git a/src/emu/ui/videoopt.c b/src/emu/ui/videoopt.c
index 57e25ce5edc..a4eb6fe320e 100644
--- a/src/emu/ui/videoopt.c
+++ b/src/emu/ui/videoopt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/videoopt.c
diff --git a/src/emu/ui/videoopt.h b/src/emu/ui/videoopt.h
index 5acad62cd70..3b47932e2ad 100644
--- a/src/emu/ui/videoopt.h
+++ b/src/emu/ui/videoopt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/videoopt.h
diff --git a/src/emu/ui/viewgfx.c b/src/emu/ui/viewgfx.c
index db866c9780f..85038a3c98a 100644
--- a/src/emu/ui/viewgfx.c
+++ b/src/emu/ui/viewgfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ui/viewgfx.c
diff --git a/src/emu/ui/viewgfx.h b/src/emu/ui/viewgfx.h
index 4f1d63ccf24..3c4b977f7c2 100644
--- a/src/emu/ui/viewgfx.h
+++ b/src/emu/ui/viewgfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ui/viewgfx.h
diff --git a/src/emu/uiinput.c b/src/emu/uiinput.c
index 28e33c08971..6bf4d8b6fe3 100644
--- a/src/emu/uiinput.c
+++ b/src/emu/uiinput.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     uiinput.c
diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h
index 3cf30ccfed4..2fcb5ed6d71 100644
--- a/src/emu/uiinput.h
+++ b/src/emu/uiinput.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     uiinput.h
diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c
index 739026f08ec..e9d851bb1d3 100644
--- a/src/emu/video/315_5124.c
+++ b/src/emu/video/315_5124.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sega315_5124.c
diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h
index 04c5ff8cc65..75916c1d993 100644
--- a/src/emu/video/315_5124.h
+++ b/src/emu/video/315_5124.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     sega315_5124.h
diff --git a/src/emu/video/315_5313.c b/src/emu/video/315_5313.c
index 903b3de40ef..fcb144f54a1 100644
--- a/src/emu/video/315_5313.c
+++ b/src/emu/video/315_5313.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega 315-5313 - Megadrive VDP */
 
 #include "emu.h"
diff --git a/src/emu/video/315_5313.h b/src/emu/video/315_5313.h
index d69b86ca076..b2146896ac3 100644
--- a/src/emu/video/315_5313.h
+++ b/src/emu/video/315_5313.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega Megadrive / Genesis VDP */
 
 #pragma once
diff --git a/src/emu/video/cdp1861.c b/src/emu/video/cdp1861.c
index 9492b863150..a02309decca 100644
--- a/src/emu/video/cdp1861.c
+++ b/src/emu/video/cdp1861.c
@@ -4,9 +4,6 @@
 
     RCA CDP1861 Video Display Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/video/cdp1861.h b/src/emu/video/cdp1861.h
index 25a654b1f9f..ccf6938173b 100644
--- a/src/emu/video/cdp1861.h
+++ b/src/emu/video/cdp1861.h
@@ -4,9 +4,6 @@
 
     RCA CDP1861 Video Display Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   _CLK   1 |*    \_/     | 24  Vdd
diff --git a/src/emu/video/cdp1862.c b/src/emu/video/cdp1862.c
index 11ec5982edf..e75cb66c888 100644
--- a/src/emu/video/cdp1862.c
+++ b/src/emu/video/cdp1862.c
@@ -4,9 +4,6 @@
 
     RCA CDP1862 Video Display Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "cdp1862.h"
diff --git a/src/emu/video/cdp1862.h b/src/emu/video/cdp1862.h
index 4ad3f173641..159c12f8a3c 100644
--- a/src/emu/video/cdp1862.h
+++ b/src/emu/video/cdp1862.h
@@ -4,9 +4,6 @@
 
     RCA CDP1862 COS/MOS Color Generator Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     RD   1 |*    \_/     | 24  Vdd
diff --git a/src/emu/video/cgapal.c b/src/emu/video/cgapal.c
index 1205da6cf09..4647016e702 100644
--- a/src/emu/video/cgapal.c
+++ b/src/emu/video/cgapal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* CGA palettes
  *
diff --git a/src/emu/video/cgapal.h b/src/emu/video/cgapal.h
index 5bf3da06912..54e9ad10f6e 100644
--- a/src/emu/video/cgapal.h
+++ b/src/emu/video/cgapal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define CGA_PALETTE_SETS 83 /* one for colour, one for mono,
                  * 81 for colour composite */
 extern const unsigned char cga_palette[16 * CGA_PALETTE_SETS][3];
diff --git a/src/emu/video/clgd542x.c b/src/emu/video/clgd542x.c
index 8aab5564e62..4c1e0731e35 100644
--- a/src/emu/video/clgd542x.c
+++ b/src/emu/video/clgd542x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Cirrus Logic GD542x/3x video chipsets
diff --git a/src/emu/video/clgd542x.h b/src/emu/video/clgd542x.h
index 52d18c8a314..b4572ddc010 100644
--- a/src/emu/video/clgd542x.h
+++ b/src/emu/video/clgd542x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Cirrus Logic GD542x/3x video chipsets
diff --git a/src/emu/video/crt9007.c b/src/emu/video/crt9007.c
index ab3fcbbb51c..7a7a3f78f87 100644
--- a/src/emu/video/crt9007.c
+++ b/src/emu/video/crt9007.c
@@ -4,9 +4,6 @@
 
     SMC CRT9007 CRT Video Processor and Controller (VPAC) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/crt9007.h b/src/emu/video/crt9007.h
index 8ae231f36a0..95745ecece6 100644
--- a/src/emu/video/crt9007.h
+++ b/src/emu/video/crt9007.h
@@ -4,9 +4,6 @@
 
     SMC CRT9007 CRT Video Processor and Controller (VPAC) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    VA2   1 |*    \_/     | 40  GND
diff --git a/src/emu/video/crt9021.c b/src/emu/video/crt9021.c
index d666c6b49e7..d72baff2b2b 100644
--- a/src/emu/video/crt9021.c
+++ b/src/emu/video/crt9021.c
@@ -4,9 +4,6 @@
 
     SMC CRT9021 Video Attributes Controller (VAC) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/crt9021.h b/src/emu/video/crt9021.h
index 856e9718d45..f050f7d745c 100644
--- a/src/emu/video/crt9021.h
+++ b/src/emu/video/crt9021.h
@@ -4,9 +4,6 @@
 
     SMC CRT9021 Video Attributes Controller (VAC) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     D0   1 |*    \_/     | 28  D1
diff --git a/src/emu/video/crt9212.c b/src/emu/video/crt9212.c
index e847c59d6f0..0535afa169b 100644
--- a/src/emu/video/crt9212.c
+++ b/src/emu/video/crt9212.c
@@ -4,9 +4,6 @@
 
     SMC CRT9212 Double Row Buffer (DRB) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "crt9212.h"
diff --git a/src/emu/video/crt9212.h b/src/emu/video/crt9212.h
index 736c8bf91f7..71590ee35f8 100644
--- a/src/emu/video/crt9212.h
+++ b/src/emu/video/crt9212.h
@@ -4,9 +4,6 @@
 
     SMC CRT9212 Double Row Buffer (DRB) emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   DIN2   1 |*    \_/     | 28  DIN3
diff --git a/src/emu/video/crtc_ega.c b/src/emu/video/crtc_ega.c
index c81e86236f8..7f8e1e905d7 100644
--- a/src/emu/video/crtc_ega.c
+++ b/src/emu/video/crtc_ega.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     IBM EGA CRT Controller emulation
diff --git a/src/emu/video/crtc_ega.h b/src/emu/video/crtc_ega.h
index 3ea4d22d8a0..a6063fdbc22 100644
--- a/src/emu/video/crtc_ega.h
+++ b/src/emu/video/crtc_ega.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     IBM EGA CRT Controller emulation
diff --git a/src/emu/video/dl1416.c b/src/emu/video/dl1416.c
index 6f9ccd36779..331281045f0 100644
--- a/src/emu/video/dl1416.c
+++ b/src/emu/video/dl1416.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  DL1416
diff --git a/src/emu/video/dl1416.h b/src/emu/video/dl1416.h
index 5b497efdd39..a9862b47a94 100644
--- a/src/emu/video/dl1416.h
+++ b/src/emu/video/dl1416.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *  DL1416
diff --git a/src/emu/video/dm9368.c b/src/emu/video/dm9368.c
index a54e88474de..16dee4e420f 100644
--- a/src/emu/video/dm9368.c
+++ b/src/emu/video/dm9368.c
@@ -4,9 +4,6 @@
 
     Fairchild DM9368 7-Segment Decoder/Driver/Latch emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "dm9368.h"
diff --git a/src/emu/video/dm9368.h b/src/emu/video/dm9368.h
index ad413561f8b..35a2da3431d 100644
--- a/src/emu/video/dm9368.h
+++ b/src/emu/video/dm9368.h
@@ -4,9 +4,6 @@
 
     Fairchild DM9368 7-Segment Decoder/Driver/Latch emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                     A1   1 |*    \_/     | 16  Vcc
diff --git a/src/emu/video/ef9340_1.c b/src/emu/video/ef9340_1.c
index f4f022c3608..f74743d5724 100644
--- a/src/emu/video/ef9340_1.c
+++ b/src/emu/video/ef9340_1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ef9340_1.h
diff --git a/src/emu/video/ef9340_1.h b/src/emu/video/ef9340_1.h
index bb255e752f3..c76adf49437 100644
--- a/src/emu/video/ef9340_1.h
+++ b/src/emu/video/ef9340_1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ef9340_1.h
diff --git a/src/emu/video/ef9341_chargen.h b/src/emu/video/ef9341_chargen.h
index b8c72f65b26..40d844fd5be 100644
--- a/src/emu/video/ef9341_chargen.h
+++ b/src/emu/video/ef9341_chargen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static const UINT8 ef9341_char_set[2][128][10] = {
 	// Alphanumeric character set (128 characters)
 	{
diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c
index 95ab2293699..fc2817c69d5 100644
--- a/src/emu/video/epic12.c
+++ b/src/emu/video/epic12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* emulation of Altera Cyclone EPIC12 FPGA programmed as a blitter */
 
 #include "emu.h"
diff --git a/src/emu/video/epic12.h b/src/emu/video/epic12.h
index 9d68b26389e..835ae87dac0 100644
--- a/src/emu/video/epic12.h
+++ b/src/emu/video/epic12.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* emulation of Altera Cyclone EPIC12 FPGA programmed as a blitter */
 
 #define MCFG_EPIC12_ADD(_tag) \
diff --git a/src/emu/video/epic12_blit0.c b/src/emu/video/epic12_blit0.c
index 229b2c43699..2fdddde70dc 100644
--- a/src/emu/video/epic12_blit0.c
+++ b/src/emu/video/epic12_blit0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Non-Tinted, Transparent */
 #define FLIPX 0
diff --git a/src/emu/video/epic12_blit1.c b/src/emu/video/epic12_blit1.c
index 3067094a1ba..9bb907ff42e 100644
--- a/src/emu/video/epic12_blit1.c
+++ b/src/emu/video/epic12_blit1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Non-Tinted, Non-Transparent */
 #define FLIPX 0
diff --git a/src/emu/video/epic12_blit2.c b/src/emu/video/epic12_blit2.c
index 897dcad4db7..b0621849d45 100644
--- a/src/emu/video/epic12_blit2.c
+++ b/src/emu/video/epic12_blit2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* X-Flipped, Non-Tinted, Transparent */
 #define FLIPX 1
diff --git a/src/emu/video/epic12_blit3.c b/src/emu/video/epic12_blit3.c
index 32e7bdaf469..49d925c3442 100644
--- a/src/emu/video/epic12_blit3.c
+++ b/src/emu/video/epic12_blit3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* X-Flipped, Non-Tinted, Non-Transparent */
 #define FLIPX 1
diff --git a/src/emu/video/epic12_blit4.c b/src/emu/video/epic12_blit4.c
index c431a401666..5d5873e85eb 100644
--- a/src/emu/video/epic12_blit4.c
+++ b/src/emu/video/epic12_blit4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Tinted, Transparent */
 #define FLIPX 0
diff --git a/src/emu/video/epic12_blit5.c b/src/emu/video/epic12_blit5.c
index 3c52a61c078..db9b17fe340 100644
--- a/src/emu/video/epic12_blit5.c
+++ b/src/emu/video/epic12_blit5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Tinted, Non-Transparent */
 #define FLIPX 0
diff --git a/src/emu/video/epic12_blit6.c b/src/emu/video/epic12_blit6.c
index 7427c67f0c6..d25afe8088f 100644
--- a/src/emu/video/epic12_blit6.c
+++ b/src/emu/video/epic12_blit6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* X-Flipped, Tinted, Transparent */
 #define FLIPX 1
diff --git a/src/emu/video/epic12_blit7.c b/src/emu/video/epic12_blit7.c
index a01fd84a5ff..e53a93de73a 100644
--- a/src/emu/video/epic12_blit7.c
+++ b/src/emu/video/epic12_blit7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define REALLY_SIMPLE 0
 /* X-Flipped, Tinted, Non-Transparent */
 #define FLIPX 1
diff --git a/src/emu/video/epic12_blit8.c b/src/emu/video/epic12_blit8.c
index ed9de7c15ec..d73c919190e 100644
--- a/src/emu/video/epic12_blit8.c
+++ b/src/emu/video/epic12_blit8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Special case 'Really Simple' blitters, no blending, no tinting etc.*/
 
 #include "emu.h"
diff --git a/src/emu/video/fixfreq.c b/src/emu/video/fixfreq.c
index 0f1808b548a..7da41ed0a43 100644
--- a/src/emu/video/fixfreq.c
+++ b/src/emu/video/fixfreq.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     fixfreq.h
diff --git a/src/emu/video/fixfreq.h b/src/emu/video/fixfreq.h
index 37fef7871bb..fbc499c9b35 100644
--- a/src/emu/video/fixfreq.h
+++ b/src/emu/video/fixfreq.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     fixfreq.h
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index 6dc40dff0f9..77e51c473f0 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     generic.c
diff --git a/src/emu/video/generic.h b/src/emu/video/generic.h
index 7108c13b1a7..add6b711108 100644
--- a/src/emu/video/generic.h
+++ b/src/emu/video/generic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     generic.h
diff --git a/src/emu/video/gf4500.c b/src/emu/video/gf4500.c
index deef2dc1455..bb0e8c75742 100644
--- a/src/emu/video/gf4500.c
+++ b/src/emu/video/gf4500.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     NVIDIA GoForce 4500
diff --git a/src/emu/video/gf4500.h b/src/emu/video/gf4500.h
index 2e14c450562..fc78d535a80 100644
--- a/src/emu/video/gf4500.h
+++ b/src/emu/video/gf4500.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     NVIDIA GoForce 4500
diff --git a/src/emu/video/gf7600gs.c b/src/emu/video/gf7600gs.c
index 9c4cb44f1ee..ac718becf34 100644
--- a/src/emu/video/gf7600gs.c
+++ b/src/emu/video/gf7600gs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "gf7600gs.h"
 
 const device_type GEFORCE_7600GS = &device_creator<geforce_7600gs_device>;
diff --git a/src/emu/video/gf7600gs.h b/src/emu/video/gf7600gs.h
index 6338c0926c4..9a3b8b6e052 100644
--- a/src/emu/video/gf7600gs.h
+++ b/src/emu/video/gf7600gs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef GF7600GS_H
 #define GF7600GS_H
 
diff --git a/src/emu/video/h63484.h b/src/emu/video/h63484.h
index c5b7359e4ae..62c5d6b8a75 100644
--- a/src/emu/video/h63484.h
+++ b/src/emu/video/h63484.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   HD63484 ACRTC
diff --git a/src/emu/video/hd44102.c b/src/emu/video/hd44102.c
index f3a8c0c714d..204604e5c03 100644
--- a/src/emu/video/hd44102.c
+++ b/src/emu/video/hd44102.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     HD44102 Dot Matrix Liquid Crystal Graphic Display Column Driver emulation
diff --git a/src/emu/video/hd44102.h b/src/emu/video/hd44102.h
index 19b5262735c..5d1c254fd4a 100644
--- a/src/emu/video/hd44102.h
+++ b/src/emu/video/hd44102.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     HD44102 Dot Matrix Liquid Crystal Graphic Display Column Driver emulation
diff --git a/src/emu/video/hd61830.c b/src/emu/video/hd61830.c
index 17d6875a18a..a9a21e7dbc5 100644
--- a/src/emu/video/hd61830.c
+++ b/src/emu/video/hd61830.c
@@ -4,9 +4,6 @@
 
     Hitachi HD61830 LCD Timing Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "hd61830.h"
diff --git a/src/emu/video/hd61830.h b/src/emu/video/hd61830.h
index 8cf14df1779..359f2d78b1a 100644
--- a/src/emu/video/hd61830.h
+++ b/src/emu/video/hd61830.h
@@ -4,9 +4,6 @@
 
     Hitachi HD61830 LCD Timing Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c
index f533c38e933..90d9d355460 100644
--- a/src/emu/video/hd63484.c
+++ b/src/emu/video/hd63484.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   HD63484 ACRTC
diff --git a/src/emu/video/hd63484.h b/src/emu/video/hd63484.h
index c1491075bd4..7082bf75e8f 100644
--- a/src/emu/video/hd63484.h
+++ b/src/emu/video/hd63484.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   HD63484 ACRTC
diff --git a/src/emu/video/hd66421.c b/src/emu/video/hd66421.c
index 4c4253fe8bd..f023795dcee 100644
--- a/src/emu/video/hd66421.c
+++ b/src/emu/video/hd66421.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Hitachi HD66421 LCD Controller/Driver
diff --git a/src/emu/video/hd66421.h b/src/emu/video/hd66421.h
index 8360a26da99..2168c4d3d65 100644
--- a/src/emu/video/hd66421.h
+++ b/src/emu/video/hd66421.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Hitachi HD66421 LCD Controller
diff --git a/src/emu/video/huc6202.c b/src/emu/video/huc6202.c
index 18ac32daf9c..abd8095e851 100644
--- a/src/emu/video/huc6202.c
+++ b/src/emu/video/huc6202.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6202 Video Priority Controller
diff --git a/src/emu/video/huc6202.h b/src/emu/video/huc6202.h
index e5f16f679de..d4eb5982102 100644
--- a/src/emu/video/huc6202.h
+++ b/src/emu/video/huc6202.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6202 interface
diff --git a/src/emu/video/huc6260.c b/src/emu/video/huc6260.c
index 6a539b84ede..8ec77c56415 100644
--- a/src/emu/video/huc6260.c
+++ b/src/emu/video/huc6260.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6260 Video Colour Encoder
diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h
index a728ab83eb2..fad89e9ec33 100644
--- a/src/emu/video/huc6260.h
+++ b/src/emu/video/huc6260.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6260 interface and definitions
diff --git a/src/emu/video/huc6261.c b/src/emu/video/huc6261.c
index 97149e35330..e2d625439b8 100644
--- a/src/emu/video/huc6261.c
+++ b/src/emu/video/huc6261.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6261 Video Colour Encoder
diff --git a/src/emu/video/huc6261.h b/src/emu/video/huc6261.h
index 3c7487a738d..9973c46df68 100644
--- a/src/emu/video/huc6261.h
+++ b/src/emu/video/huc6261.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6261 interface and definitions
diff --git a/src/emu/video/huc6270.c b/src/emu/video/huc6270.c
index 85ecdce0f0e..e01a0d627d9 100644
--- a/src/emu/video/huc6270.c
+++ b/src/emu/video/huc6270.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NEC HuC6270 Video Display Controller
diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h
index 5a06d21cb27..155f90b4b14 100644
--- a/src/emu/video/huc6270.h
+++ b/src/emu/video/huc6270.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Hudson/NEC HuC6270 interface
diff --git a/src/emu/video/huc6272.c b/src/emu/video/huc6272.c
index bad0fb69da9..63317dffcaf 100644
--- a/src/emu/video/huc6272.c
+++ b/src/emu/video/huc6272.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hudson/NEC HuC6272 "King" device
diff --git a/src/emu/video/huc6272.h b/src/emu/video/huc6272.h
index b62a588b4ff..af796922601 100644
--- a/src/emu/video/huc6272.h
+++ b/src/emu/video/huc6272.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/video/i8244.c b/src/emu/video/i8244.c
index 1b711006901..36842f0b879 100644
--- a/src/emu/video/i8244.c
+++ b/src/emu/video/i8244.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8244.c
diff --git a/src/emu/video/i8244.h b/src/emu/video/i8244.h
index 87d022623a7..0ef59566e69 100644
--- a/src/emu/video/i8244.h
+++ b/src/emu/video/i8244.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     i8244.h
diff --git a/src/emu/video/i8275.c b/src/emu/video/i8275.c
index cf7b5d022ea..848ee9e8eed 100644
--- a/src/emu/video/i8275.c
+++ b/src/emu/video/i8275.c
@@ -4,9 +4,6 @@
 
     Intel 8275 Programmable CRT Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/i8275.h b/src/emu/video/i8275.h
index 033b4846df0..15451d4c7e8 100644
--- a/src/emu/video/i8275.h
+++ b/src/emu/video/i8275.h
@@ -4,9 +4,6 @@
 
     Intel 8275 Programmable CRT Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    LC3   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/video/m50458.h b/src/emu/video/m50458.h
index 0574a4153ff..f72cc843f29 100644
--- a/src/emu/video/m50458.h
+++ b/src/emu/video/m50458.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mitsubishi M50458 OSD chip
diff --git a/src/emu/video/mb90082.h b/src/emu/video/mb90082.h
index 0e53037d965..d86570618bd 100644
--- a/src/emu/video/mb90082.h
+++ b/src/emu/video/mb90082.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 095ee394199..35f64571d85 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Motorola MC6845 and compatible CRT controller emulation
diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h
index b12cb56875b..6e0a84314f7 100644
--- a/src/emu/video/mc6845.h
+++ b/src/emu/video/mc6845.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Motorola MC6845 and compatible CRT controller emulation
diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c
index 6d65b20993b..c2af61c41f3 100644
--- a/src/emu/video/mc6847.c
+++ b/src/emu/video/mc6847.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mc6847.c
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index eea69cbaa27..b35b731be01 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mc6847.h
diff --git a/src/emu/video/mos6566.c b/src/emu/video/mos6566.c
index 05c56cf85ac..739ad2a76d5 100644
--- a/src/emu/video/mos6566.c
+++ b/src/emu/video/mos6566.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MOS 6566/6567/6569 Video Interface Chip (VIC-II) emulation
diff --git a/src/emu/video/mos6566.h b/src/emu/video/mos6566.h
index c69b7523170..ab470de6c4a 100644
--- a/src/emu/video/mos6566.h
+++ b/src/emu/video/mos6566.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MOS 6566/6567/6569 Video Interface Chip II (VIC-II) emulation
diff --git a/src/emu/video/msm6222b.c b/src/emu/video/msm6222b.c
index f50e33ce041..54e2d117ec4 100644
--- a/src/emu/video/msm6222b.c
+++ b/src/emu/video/msm6222b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MSM6222B
diff --git a/src/emu/video/msm6222b.h b/src/emu/video/msm6222b.h
index 8e5d4c72356..0946169c180 100644
--- a/src/emu/video/msm6222b.h
+++ b/src/emu/video/msm6222b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MSM6222B
diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c
index 417fc1affe0..36fd36325d1 100644
--- a/src/emu/video/msm6255.c
+++ b/src/emu/video/msm6255.c
@@ -4,9 +4,6 @@
 
     OKI MSM6255 Dot Matrix LCD Controller implementation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "msm6255.h"
diff --git a/src/emu/video/msm6255.h b/src/emu/video/msm6255.h
index 92706f374ac..32975132cf6 100644
--- a/src/emu/video/msm6255.h
+++ b/src/emu/video/msm6255.h
@@ -4,9 +4,6 @@
 
     OKI MSM6255 Dot Matrix LCD Controller implementation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h
index c88b995ecab..05bce83c4a2 100644
--- a/src/emu/video/pc_vga.h
+++ b/src/emu/video/pc_vga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     pc_vga.h
diff --git a/src/emu/video/poly.h b/src/emu/video/poly.h
index 8c7df71249d..d9ba5062ce2 100644
--- a/src/emu/video/poly.h
+++ b/src/emu/video/poly.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     poly.h
diff --git a/src/emu/video/polylgcy.c b/src/emu/video/polylgcy.c
index a95d3f03527..a0a5d3952ea 100644
--- a/src/emu/video/polylgcy.c
+++ b/src/emu/video/polylgcy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     polylgcy.c
diff --git a/src/emu/video/polylgcy.h b/src/emu/video/polylgcy.h
index bf8b14aea68..99fef4f5317 100644
--- a/src/emu/video/polylgcy.h
+++ b/src/emu/video/polylgcy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     polylgcy.h
diff --git a/src/emu/video/ramdac.h b/src/emu/video/ramdac.h
index 967646c012b..0ae0805661e 100644
--- a/src/emu/video/ramdac.h
+++ b/src/emu/video/ramdac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Generic Palette RAMDAC device
diff --git a/src/emu/video/resnet.c b/src/emu/video/resnet.c
index e9b5a247070..82b2d73f4d8 100644
--- a/src/emu/video/resnet.c
+++ b/src/emu/video/resnet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     resnet.c
diff --git a/src/emu/video/resnet.h b/src/emu/video/resnet.h
index 233db9198ed..02b03f9ce02 100644
--- a/src/emu/video/resnet.h
+++ b/src/emu/video/resnet.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     resnet.h
diff --git a/src/emu/video/rgbgen.h b/src/emu/video/rgbgen.h
index 63e578108f0..b9412998c1a 100644
--- a/src/emu/video/rgbgen.h
+++ b/src/emu/video/rgbgen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rgbgen.h
diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h
index caf61179ec2..1f8ccaaa3d2 100644
--- a/src/emu/video/rgbsse.h
+++ b/src/emu/video/rgbsse.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rgbsse.h
diff --git a/src/emu/video/rgbutil.c b/src/emu/video/rgbutil.c
index 23fcc60e014..3899c8068b9 100644
--- a/src/emu/video/rgbutil.c
+++ b/src/emu/video/rgbutil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rgbutil.c
diff --git a/src/emu/video/rgbutil.h b/src/emu/video/rgbutil.h
index 88db0076540..ce3ead35e98 100644
--- a/src/emu/video/rgbutil.h
+++ b/src/emu/video/rgbutil.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     rgbutil.h
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index 9445e15282f..2440d0bc357 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -6,9 +6,6 @@
 
     http://www.bighole.nl/pub/mirror/homepage.ntlworld.com/kryten_droid/teletext/spec/teletext_spec_1974.htm
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h
index 2d322e7358f..0155da83e4e 100644
--- a/src/emu/video/saa5050.h
+++ b/src/emu/video/saa5050.h
@@ -4,9 +4,6 @@
 
     Mullard SAA5050 Teletext Character Generator emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    Vss   1 |*    \_/     | 28  DE
diff --git a/src/emu/video/scn2674.c b/src/emu/video/scn2674.c
index 33f9f1efa90..91902516df0 100644
--- a/src/emu/video/scn2674.c
+++ b/src/emu/video/scn2674.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SCN2674 - Advanced Video Display Controller (AVDC)  (Video Chip)
 */
diff --git a/src/emu/video/scn2674.h b/src/emu/video/scn2674.h
index 9a64eba0d83..2f790dd772d 100644
--- a/src/emu/video/scn2674.h
+++ b/src/emu/video/scn2674.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef SCN2674_H
 #define SCN2674_H
 
diff --git a/src/emu/video/sed1200.c b/src/emu/video/sed1200.c
index 22f84aedd39..dd7af441f1d 100644
--- a/src/emu/video/sed1200.c
+++ b/src/emu/video/sed1200.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SED1200
diff --git a/src/emu/video/sed1200.h b/src/emu/video/sed1200.h
index 84fa7c174b6..5b77f0e8bf8 100644
--- a/src/emu/video/sed1200.h
+++ b/src/emu/video/sed1200.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SED1200
diff --git a/src/emu/video/sed1330.c b/src/emu/video/sed1330.c
index 8a2ec83a834..2ced64a8170 100644
--- a/src/emu/video/sed1330.c
+++ b/src/emu/video/sed1330.c
@@ -4,9 +4,6 @@
 
     Seiko-Epson SED1330 LCD Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "emu.h"
diff --git a/src/emu/video/sed1330.h b/src/emu/video/sed1330.h
index aa3e6625a89..a78c71ef3a3 100644
--- a/src/emu/video/sed1330.h
+++ b/src/emu/video/sed1330.h
@@ -4,9 +4,6 @@
 
     Seiko-Epson SED1330 LCD Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/emu/video/snes_ppu.c b/src/emu/video/snes_ppu.c
index 459adb0bb8a..04c3ab3f5aa 100644
--- a/src/emu/video/snes_ppu.c
+++ b/src/emu/video/snes_ppu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   snes.c
diff --git a/src/emu/video/snes_ppu.h b/src/emu/video/snes_ppu.h
index fa141e84e92..02d94e7071c 100644
--- a/src/emu/video/snes_ppu.h
+++ b/src/emu/video/snes_ppu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         SNES PPU
diff --git a/src/emu/video/stvvdp1.c b/src/emu/video/stvvdp1.c
index 16ce4bbad5e..937c221f4c7 100644
--- a/src/emu/video/stvvdp1.c
+++ b/src/emu/video/stvvdp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 STV - VDP1
diff --git a/src/emu/video/stvvdp2.c b/src/emu/video/stvvdp2.c
index 5632882f2e9..221bb116188 100644
--- a/src/emu/video/stvvdp2.c
+++ b/src/emu/video/stvvdp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega Saturn VDP2 */
 
 #define DEBUG_MODE 0
diff --git a/src/emu/video/tea1002.c b/src/emu/video/tea1002.c
index 2784e45382b..22f733ae998 100644
--- a/src/emu/video/tea1002.c
+++ b/src/emu/video/tea1002.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TEA1002
diff --git a/src/emu/video/tea1002.h b/src/emu/video/tea1002.h
index d4e20c56e6d..614a8f152f6 100644
--- a/src/emu/video/tea1002.h
+++ b/src/emu/video/tea1002.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TEA1002
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index cf5ee62ef9f..5862d4f1c44 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     tlc34076.c
diff --git a/src/emu/video/tlc34076.h b/src/emu/video/tlc34076.h
index 675b77b2f52..1bdeb70ce49 100644
--- a/src/emu/video/tlc34076.h
+++ b/src/emu/video/tlc34076.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     tlc34076.h
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index 2e1667d991f..ff5ba2449c6 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
  *                                                                          *
  *  Functions to emulate the TMS34061 video controller                      *
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index 030fdf38cfe..74b6104fd26 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
  *                                                                          *
  *  Function prototypes and constants used by the TMS34061 emulator         *
diff --git a/src/emu/video/tms3556.c b/src/emu/video/tms3556.c
index 38cf1fa5cf7..fe9b8ce4d6c 100644
--- a/src/emu/video/tms3556.c
+++ b/src/emu/video/tms3556.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     tms3556 emulation
 
diff --git a/src/emu/video/tms3556.h b/src/emu/video/tms3556.h
index 5914780397f..2a4131f78d3 100644
--- a/src/emu/video/tms3556.h
+++ b/src/emu/video/tms3556.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Texas Instruments TMS3556 Video Display Processor
diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c
index 18e84ac2397..127459bc191 100644
--- a/src/emu/video/tms9927.c
+++ b/src/emu/video/tms9927.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     TI TMS9927 and compatible CRT controller emulation
diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h
index a4ddae6833d..394add7355f 100644
--- a/src/emu/video/tms9927.h
+++ b/src/emu/video/tms9927.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     TI TMS9927 and compatible CRT controller emulation
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index a48862f93b2..a58df4d5e02 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** File: tms9928a.c -- software implementation of the Texas Instruments
 **                     TMS9918(A), TMS9928(A) and TMS9929(A), used by the Coleco, MSX and
diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h
index 4baebba655a..53e8ff1407b 100644
--- a/src/emu/video/tms9928a.h
+++ b/src/emu/video/tms9928a.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** File: tms9928a.h -- software implementation of the TMS9928A VDP.
 **
diff --git a/src/emu/video/upd3301.c b/src/emu/video/upd3301.c
index 15885cc6896..8370f52c85c 100644
--- a/src/emu/video/upd3301.c
+++ b/src/emu/video/upd3301.c
@@ -4,9 +4,6 @@
 
     NEC uPD3301 Programmable CRT Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/upd3301.h b/src/emu/video/upd3301.h
index ec3910deaed..cef42e08627 100644
--- a/src/emu/video/upd3301.h
+++ b/src/emu/video/upd3301.h
@@ -4,9 +4,6 @@
 
     NEC uPD3301 Programmable CRT Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                   VRTC   1 |*    \_/     | 40  Vcc
diff --git a/src/emu/video/upd7220.c b/src/emu/video/upd7220.c
index 80261387a19..be26c06d692 100644
--- a/src/emu/video/upd7220.c
+++ b/src/emu/video/upd7220.c
@@ -4,9 +4,6 @@
 
     Intel 82720 Graphics Display Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/emu/video/upd7220.h b/src/emu/video/upd7220.h
index a9617fcf986..4490ad20596 100644
--- a/src/emu/video/upd7220.h
+++ b/src/emu/video/upd7220.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NEC uPD7220 Graphics Display Controller emulation
diff --git a/src/emu/video/upd7227.c b/src/emu/video/upd7227.c
index 4448c925cc5..2ed1a7ac2de 100644
--- a/src/emu/video/upd7227.c
+++ b/src/emu/video/upd7227.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     uPD7227 Intelligent Dot-Matrix LCD Controller/Driver emulation
diff --git a/src/emu/video/upd7227.h b/src/emu/video/upd7227.h
index cc6a27f7b31..e6f10688ebc 100644
--- a/src/emu/video/upd7227.h
+++ b/src/emu/video/upd7227.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     uPD7227 Intelligent Dot-Matrix LCD Controller/Driver emulation
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index bcbad3c3056..d70f64e962b 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /***************************************************************************
 
diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h
index ff9fef48bb4..ef342c35e66 100644
--- a/src/emu/video/v9938.h
+++ b/src/emu/video/v9938.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     v9938 / v9958 emulation
diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c
index 8fc32f3f3ff..c8a5bf6cca8 100644
--- a/src/emu/video/vector.c
+++ b/src/emu/video/vector.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  *
  * vector.c
diff --git a/src/emu/video/vector.h b/src/emu/video/vector.h
index d4a22eee177..ff154673bc8 100644
--- a/src/emu/video/vector.h
+++ b/src/emu/video/vector.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VECTOR__
 #define __VECTOR__
 
diff --git a/src/emu/video/vic4567.c b/src/emu/video/vic4567.c
index dd405522bff..0aac42f5396 100644
--- a/src/emu/video/vic4567.c
+++ b/src/emu/video/vic4567.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Video Interface Chip (4567)
diff --git a/src/emu/video/vic4567.h b/src/emu/video/vic4567.h
index 0b6f5439d65..223d4f74190 100644
--- a/src/emu/video/vic4567.h
+++ b/src/emu/video/vic4567.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * video/vic4567.h
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h
index 094b6f0eb32..a64b0c22f66 100644
--- a/src/emu/video/vooddefs.h
+++ b/src/emu/video/vooddefs.h
@@ -1619,6 +1619,7 @@ struct raster_info
 	UINT32              eff_fbz_mode;           /* effective fbzMode value */
 	UINT32              eff_tex_mode_0;         /* effective textureMode value for TMU #0 */
 	UINT32              eff_tex_mode_1;         /* effective textureMode value for TMU #1 */
+	UINT32              hash;
 };
 
 
@@ -2420,9 +2421,8 @@ do
 	if (ALPHAMODE_ALPHABLEND(ALPHAMODE))                                        \
 	{                                                                           \
 		int dpix = dest[XX];                                                    \
-		int dr = (dpix >> 8) & 0xf8;                                            \
-		int dg = (dpix >> 3) & 0xfc;                                            \
-		int db = (dpix << 3) & 0xf8;                                            \
+		int dr, dg, db;                                                         \
+		EXTRACT_565_TO_888(dpix, dr, dg, db);                                   \
 		int da = FBZMODE_ENABLE_ALPHA_PLANES(FBZMODE) ? depth[XX] : 0xff;       \
 		int sr = (RR);                                                          \
 		int sg = (GG);                                                          \
@@ -2623,12 +2623,12 @@ do
 			{                                                                   \
 				case 0:     /* fog table */                                     \
 				{                                                               \
-					INT32 delta = (VV)->fbi.fogdelta[wfloat >> 10];             \
+					INT32 delta = (VV)->fbi.fogdelta[fogdepth >> 10];             \
 					INT32 deltaval;                                             \
 																				\
 					/* perform the multiply against lower 8 bits of wfloat */   \
 					deltaval = (delta & (VV)->fbi.fogdelta_mask) *              \
-								((wfloat >> 2) & 0xff);                         \
+								((fogdepth >> 2) & 0xff);                         \
 																				\
 					/* fog zones allow for negating this value */               \
 					if (FOGMODE_FOG_ZONES(FOGMODE) && (delta & 2))              \
@@ -2641,7 +2641,7 @@ do
 					deltaval >>= 4;                                             \
 																				\
 					/* add to the blending factor */                            \
-					fogblend = (VV)->fbi.fogblend[wfloat >> 10] + deltaval;     \
+					fogblend = (VV)->fbi.fogblend[fogdepth >> 10] + deltaval;     \
 					break;                                                      \
 				}                                                               \
 																				\
@@ -3040,7 +3040,7 @@ while (0)
 #define PIXEL_PIPELINE_BEGIN(VV, STATS, XX, YY, FBZCOLORPATH, FBZMODE, ITERZ, ITERW)    \
 do                                                                              \
 {                                                                               \
-	INT32 depthval, wfloat;                                                     \
+	INT32 depthval, wfloat, fogdepth, biasdepth;                                  \
 	INT32 prefogr, prefogg, prefogb;                                            \
 	INT32 r, g, b, a;                                                           \
 																				\
@@ -3080,33 +3080,27 @@ do
 		wfloat = 0x0000;                                                        \
 	else                                                                        \
 	{                                                                           \
-		UINT32 temp = (UINT32)(ITERW);                                          \
-		if ((temp & 0xffff0000) == 0)                                           \
+		UINT32 temp = (UINT32)(ITERW);                                \
+		if (!(temp & 0xffff0000))                                           \
 			wfloat = 0xffff;                                                    \
 		else                                                                    \
 		{                                                                       \
 			int exp = count_leading_zeros(temp);                                \
-			temp &=0x7fff0000;                                \
 			wfloat = ((exp << 12) | ((~temp >> (19 - exp)) & 0xfff)) + 1;       \
 		}                                                                       \
 	}                                                                           \
+	fogdepth = wfloat;                                                         \
 	/* add the bias for fog selection*/                                         \
 	if (FBZMODE_ENABLE_DEPTH_BIAS(FBZMODE))                                     \
 	{                                                                           \
-		wfloat += (INT16)(VV)->reg[zaColor].u;                                \
-		CLAMP(wfloat, 0, 0xffff);                                             \
+		fogdepth += (INT16)(VV)->reg[zaColor].u;                                \
+		CLAMP(fogdepth, 0, 0xffff);                                             \
 	}                                                                           \
 																				\
 	/* compute depth value (W or Z) for this pixel */                           \
 	if (FBZMODE_WBUFFER_SELECT(FBZMODE) == 0)                                   \
 	{                                                                           \
 		CLAMPED_Z(ITERZ, FBZCOLORPATH, depthval);                               \
-		/* add the bias */                                                          \
-		if (FBZMODE_ENABLE_DEPTH_BIAS(FBZMODE))                                     \
-		{                                                                           \
-			depthval += (INT16)(VV)->reg[zaColor].u;                                \
-			CLAMP(depthval, 0, 0xffff);                                             \
-		}                                                                           \
 	}                                                                           \
 	else if (FBZMODE_DEPTH_FLOAT_SELECT(FBZMODE) == 0)                          \
 		depthval = wfloat;                                                      \
@@ -3116,25 +3110,28 @@ do
 			depthval = 0x0000;                                                  \
 		else                                                                    \
 		{                                                                       \
-			UINT32 temp = (ITERZ) << 4;                                         \
-			if ((temp & 0xffff0000) == 0)                                       \
+			UINT32 temp = (ITERZ << 4);                             \
+			if (!(temp & 0xffff0000))                                                           \
 				depthval = 0xffff;                                              \
 			else                                                                \
 			{                                                                   \
 				int exp = count_leading_zeros(temp);                            \
-				temp &=0x7fff0000;                                \
 				depthval = ((exp << 12) | ((~temp >> (19 - exp)) & 0xfff)) + 1; \
 			}                                                                   \
 		}                                                                       \
-		/* add the bias */                                                          \
-		if (FBZMODE_ENABLE_DEPTH_BIAS(FBZMODE))                                     \
-		{                                                                           \
-			depthval += (INT16)(VV)->reg[zaColor].u;                                \
-			CLAMP(depthval, 0, 0xffff);                                             \
-		}                                                                           \
-	}                                                                           \
-																				\
-																				\
+	}                                                                            \
+	/* add the bias */                                                          \
+	biasdepth = depthval;                                                     \
+	if (FBZMODE_ENABLE_DEPTH_BIAS(FBZMODE))                                     \
+	{                                                                           \
+		biasdepth += (INT16)(VV)->reg[zaColor].u;                                \
+		CLAMP(biasdepth, 0, 0xffff);                                             \
+	}
+
+
+#define DEPTH_TEST(VV, STATS, XX, FBZMODE)    \
+do                                                                              \
+{                                                                               \
 	/* handle depth buffer testing */                                           \
 	if (FBZMODE_ENABLE_DEPTHBUF(FBZMODE))                                       \
 	{                                                                           \
@@ -3143,7 +3140,7 @@ do
 		/* the source depth is either the iterated W/Z+bias or a */             \
 		/* constant value */                                                    \
 		if (FBZMODE_DEPTH_SOURCE_COMPARE(FBZMODE) == 0)                         \
-			depthsource = depthval;                                             \
+			depthsource = biasdepth;                                             \
 		else                                                                    \
 			depthsource = (UINT16)(VV)->reg[zaColor].u;                         \
 																				\
@@ -3205,7 +3202,9 @@ do
 			case 7:     /* depthOP = always */                                  \
 				break;                                                          \
 		}                                                                       \
-	}
+	}                                                                       \
+}                                                                               \
+while (0)
 
 
 #define PIXEL_PIPELINE_END(VV, STATS, DITHER, DITHER4, DITHER_LOOKUP, XX, dest, depth, FBZMODE, FBZCOLORPATH, ALPHAMODE, FOGMODE, ITERZ, ITERW, ITERAXXX) \
@@ -3235,7 +3234,7 @@ do
 	if (depth && FBZMODE_AUX_BUFFER_MASK(FBZMODE))                              \
 	{                                                                           \
 		if (FBZMODE_ENABLE_ALPHA_PLANES(FBZMODE) == 0)                          \
-			depth[XX] = depthval;                                               \
+			depth[XX] = biasdepth;                                               \
 		else                                                                    \
 			depth[XX] = a;                                                      \
 	}                                                                           \
@@ -3315,7 +3314,7 @@ do
 			c_other.u = (VV)->reg[color1].u;                                    \
 			break;                                                              \
 																				\
-		default:    /* reserved */                                              \
+		default:    /* reserved - voodoo3 framebufferRGB */                   \
 			c_other.u = 0;                                                      \
 			break;                                                              \
 	}                                                                           \
@@ -3647,9 +3646,11 @@ static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, co
 		rgb_union iterargb = { 0 };                                             \
 		rgb_union texel = { 0 };                                                \
 																				\
-		/* pixel pipeline part 1 handles depth testing and stippling */         \
+		/* pixel pipeline part 1 handles depth setup and stippling */         \
 		PIXEL_PIPELINE_BEGIN(v, stats, x, y, FBZCOLORPATH, FBZMODE,             \
 								iterz, iterw);                                  \
+		/* depth testing */         \
+		DEPTH_TEST(v, stats, x, FBZMODE);    \
 																				\
 		/* run the texture pipeline on TMU1 to produce a value in texel */      \
 		/* note that they set LOD min to 8 to "disable" a TMU */                \
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index a29bb711570..b27c794723c 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -211,7 +211,7 @@ static TIMER_CALLBACK( stall_cpu_callback );
 static void stall_cpu(voodoo_state *v, int state, attotime current_time);
 static TIMER_CALLBACK( vblank_callback );
 static INT32 register_w(voodoo_state *v, offs_t offset, UINT32 data);
-static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask, int forcefront);
+static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask, bool lfb_3d);
 static INT32 texture_w(voodoo_state *v, offs_t offset, UINT32 data);
 static INT32 banshee_2d_w(voodoo_state *v, offs_t offset, UINT32 data);
 
@@ -1725,7 +1725,7 @@ static UINT32 cmdfifo_execute(voodoo_state *v, cmdfifo_info *f)
 			/* loop over all registers and write them one at a time */
 			for (i = 3; i <= 31; i++)
 				if (command & (1 << i))
-					cycles += register_w(v, bltSrcBaseAddr + (i - 3), *src++);
+					cycles += register_w(v, banshee2D_clip0Min + (i - 3), *src++);
 			break;
 
 		/*
@@ -1874,11 +1874,12 @@ static UINT32 cmdfifo_execute(voodoo_state *v, cmdfifo_info *f)
 				//  Banshee/Voodoo3 2D register writes
 
 				/* loop over all registers and write them one at a time */
+				target &= 0xff;
 				for (i = 15; i <= 28; i++)
 				{
 					if (command & (1 << i))
 					{
-						cycles += banshee_2d_w(v, target & 0xff, *src);
+						cycles += banshee_2d_w(v, target + (i - 15), *src);
 						//logerror("    2d reg: %03x = %08X\n", target & 0x7ff, *src);
 						src++;
 					}
@@ -1942,7 +1943,7 @@ static UINT32 cmdfifo_execute(voodoo_state *v, cmdfifo_info *f)
 
 					/* loop over words */
 					for (i = 0; i < count; i++)
-						cycles += lfb_w(v, target++, *src++, 0xffffffff, FALSE);
+						cycles += lfb_w(v, target++, *src++, 0xffffffff, true);
 
 					break;
 				}
@@ -2931,7 +2932,7 @@ default_case:
  *
  *************************************/
 
-static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask, int forcefront)
+static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask, bool lfb_3d)
 {
 	UINT16 *dest, *depth;
 	UINT32 destmax, depthmax;
@@ -2942,6 +2943,29 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 	/* statistics */
 	v->stats.lfb_writes++;
 
+	// TODO: This direct write is not verified.
+	// For direct lfb access just write the data
+	if (!lfb_3d) {
+		UINT32 bufoffs;
+		/* compute X,Y */
+		offset <<= 1;
+		x = offset & ((1 << v->fbi.lfb_stride) - 1);
+		y = (offset >> v->fbi.lfb_stride);
+		dest = (UINT16 *)(v->fbi.ram + v->fbi.lfb_base*4);
+		destmax = (v->fbi.mask + 1 - v->fbi.lfb_base*4) / 2;
+		bufoffs = y * v->fbi.rowpixels + x;
+		if (bufoffs >= destmax) {
+			logerror("LFB_W: Buffer offset out of bounds x=%i y=%i lfb_3d=%i offset=%08X bufoffs=%08X data=%08X\n", x, y, lfb_3d, offset, (UINT32) bufoffs, data);
+			return 0;
+		}
+		if (ACCESSING_BITS_0_15)
+			dest[bufoffs + 0] = data&0xffff;
+		if (ACCESSING_BITS_16_31)
+			dest[bufoffs + 1] = data>>16;
+		if (LOG_LFB) logerror("VOODOO.%d.LFB:write direct (%d,%d) = %08X & %08X\n", v->index, x, y, data, mem_mask);
+		return 0;
+	}
+
 	/* byte swizzling */
 	if (LFBMODE_BYTE_SWIZZLE_WRITES(v->reg[lfbMode].u))
 	{
@@ -3128,12 +3152,13 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 			break;
 
 		default:            /* reserved */
+			logerror("lfb_w: Unknown format\n");
 			return 0;
 	}
 
 	/* compute X,Y */
-	x = (offset << 0) & ((1 << v->fbi.lfb_stride) - 1);
-	y = (offset >> v->fbi.lfb_stride) & ((1 << v->fbi.lfb_stride) - 1);
+	x = offset & ((1 << v->fbi.lfb_stride) - 1);
+	y = (offset >> v->fbi.lfb_stride) & 0x3ff;
 
 	/* adjust the mask based on which half of the data is written */
 	if (!ACCESSING_BITS_0_15)
@@ -3142,7 +3167,7 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 		mask &= ~(0xf0 + LFB_DEPTH_PRESENT_MSW);
 
 	/* select the target buffer */
-	destbuf = (v->type >= TYPE_VOODOO_BANSHEE) ? (!forcefront) : LFBMODE_WRITE_BUFFER_SELECT(v->reg[lfbMode].u);
+	destbuf = (v->type >= TYPE_VOODOO_BANSHEE) ? 1 : LFBMODE_WRITE_BUFFER_SELECT(v->reg[lfbMode].u);
 	switch (destbuf)
 	{
 		case 0:         /* front buffer */
@@ -3250,12 +3275,14 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 				stats_block *stats = &v->fbi.lfb_stats;
 				INT64 iterw;
 				if (LFBMODE_WRITE_W_SELECT(v->reg[lfbMode].u)) {
-					iterw = (UINT32) (v->reg[zaColor].u & 0xffff) << 16;
+					iterw = (UINT32) v->reg[zaColor].u << 16;
 				} else {
+					// The most significant fractional bits of 16.32 W are set to z
 					iterw = (UINT32) sw[pix] << 16;
 				}
 				INT32 iterz = sw[pix] << 12;
 				rgb_union color;
+				rgb_union iterargb = { 0 };
 
 				/* apply clipping */
 				if (FBZMODE_ENABLE_CLIPPING(v->reg[fbzMode].u))
@@ -3272,7 +3299,52 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 				}
 
 				/* pixel pipeline part 1 handles depth testing and stippling */
-				PIXEL_PIPELINE_BEGIN(v, stats, x, y, v->reg[fbzColorPath].u, v->reg[fbzMode].u, iterz, iterw);
+				//PIXEL_PIPELINE_BEGIN(v, stats, x, y, v->reg[fbzColorPath].u, v->reg[fbzMode].u, iterz, iterw);
+// Start PIXEL_PIPE_BEGIN copy
+				//#define PIXEL_PIPELINE_BEGIN(VV, STATS, XX, YY, FBZCOLORPATH, FBZMODE, ITERZ, ITERW)
+				do
+				{
+					INT32 fogdepth, biasdepth;
+					INT32 prefogr, prefogg, prefogb;
+					INT32 r, g, b, a;
+
+					(stats)->pixels_in++;
+
+					/* apply clipping */
+					/* note that for perf reasons, we assume the caller has done clipping */
+
+					/* handle stippling */
+					if (FBZMODE_ENABLE_STIPPLE(v->reg[fbzMode].u))
+					{
+						/* rotate mode */
+						if (FBZMODE_STIPPLE_PATTERN(v->reg[fbzMode].u) == 0)
+						{
+							v->reg[stipple].u = (v->reg[stipple].u << 1) | (v->reg[stipple].u >> 31);
+							if ((v->reg[stipple].u & 0x80000000) == 0)
+							{
+								v->stats.total_stippled++;
+								goto skipdrawdepth;
+							}
+						}
+
+						/* pattern mode */
+						else
+						{
+							int stipple_index = ((y & 3) << 3) | (~x & 7);
+							if (((v->reg[stipple].u >> stipple_index) & 1) == 0)
+							{
+								v->stats.total_stippled++;
+								goto skipdrawdepth;
+							}
+						}
+					}
+// End PIXEL_PIPELINE_BEGIN COPY
+
+				// Depth testing value for lfb pipeline writes is directly from write data, no biasing is used
+				fogdepth = biasdepth = (UINT32) sw[pix];
+
+				/* Perform depth testing */
+				DEPTH_TEST(v, stats, x, v->reg[fbzMode].u);
 
 				/* use the RGBA we stashed above */
 				color.rgb.r = r = sr[pix];
@@ -3286,7 +3358,9 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
 				APPLY_ALPHATEST(v, stats, v->reg[alphaMode].u, color.rgb.a);
 
 				/* pixel pipeline part 2 handles color combine, fog, alpha, and final output */
-				PIXEL_PIPELINE_END(v, stats, dither, dither4, dither_lookup, x, dest, depth, v->reg[fbzMode].u, v->reg[fbzColorPath].u, v->reg[alphaMode].u, v->reg[fogMode].u, iterz, iterw, v->reg[zaColor]);
+				PIXEL_PIPELINE_END(v, stats, dither, dither4, dither_lookup, x, dest, depth,
+					v->reg[fbzMode].u, v->reg[fbzColorPath].u, v->reg[alphaMode].u, v->reg[fogMode].u,
+					iterz, iterw, iterargb);
 			}
 nextpixel:
 			/* advance our pointers */
@@ -3368,7 +3442,7 @@ static INT32 texture_w(voodoo_state *v, offs_t offset, UINT32 data)
 		{
 			tbaseaddr = t->lodoffset[0] + offset*4;
 
-			if (LOG_TEXTURE_RAM) logerror("Texture 16-bit w: offset=%X data=%08X\n", offset*4, data);
+			if (LOG_TEXTURE_RAM) logerror("Texture 8-bit w: offset=%X data=%08X\n", offset*4, data);
 		}
 
 		/* write the four bytes in little-endian order */
@@ -3520,7 +3594,7 @@ static void flush_fifos(voodoo_state *v, attotime current_time)
 						mem_mask &= 0xffff0000;
 					address &= 0xffffff;
 
-					cycles = lfb_w(v, address, data, mem_mask, FALSE);
+					cycles = lfb_w(v, address, data, mem_mask, true);
 				}
 			}
 
@@ -3646,7 +3720,7 @@ WRITE32_MEMBER( voodoo_device::voodoo_w )
 		else if (offset & (0x800000/4))
 			cycles = texture_w(v, offset, data);
 		else
-			cycles = lfb_w(v, offset, data, mem_mask, FALSE);
+			cycles = lfb_w(v, offset, data, mem_mask, true);
 
 		/* if we ended up with cycles, mark the operation pending */
 		if (cycles)
@@ -3916,7 +3990,7 @@ static UINT32 register_r(voodoo_state *v, offs_t offset)
  *
  *************************************/
 
-static UINT32 lfb_r(voodoo_state *v, offs_t offset, int forcefront)
+static UINT32 lfb_r(voodoo_state *v, offs_t offset, bool lfb_3d)
 {
 	UINT16 *buffer;
 	UINT32 bufmax;
@@ -3928,43 +4002,54 @@ static UINT32 lfb_r(voodoo_state *v, offs_t offset, int forcefront)
 	v->stats.lfb_reads++;
 
 	/* compute X,Y */
-	x = (offset << 1) & 0x3fe;
-	y = (offset >> 9) & 0x3ff;
+	offset <<= 1;
+	x = offset & ((1 << v->fbi.lfb_stride) - 1);
+	y = (offset >> v->fbi.lfb_stride);
 
 	/* select the target buffer */
-	destbuf = (v->type >= TYPE_VOODOO_BANSHEE) ? (!forcefront) : LFBMODE_READ_BUFFER_SELECT(v->reg[lfbMode].u);
-	switch (destbuf)
-	{
-		case 0:         /* front buffer */
-			buffer = (UINT16 *)(v->fbi.ram + v->fbi.rgboffs[v->fbi.frontbuf]);
-			bufmax = (v->fbi.mask + 1 - v->fbi.rgboffs[v->fbi.frontbuf]) / 2;
-			break;
+	if (lfb_3d) {
+		y &= 0x3ff;
+		destbuf = (v->type >= TYPE_VOODOO_BANSHEE) ? 1 : LFBMODE_READ_BUFFER_SELECT(v->reg[lfbMode].u);
+		switch (destbuf)
+		{
+			case 0:         /* front buffer */
+				buffer = (UINT16 *)(v->fbi.ram + v->fbi.rgboffs[v->fbi.frontbuf]);
+				bufmax = (v->fbi.mask + 1 - v->fbi.rgboffs[v->fbi.frontbuf]) / 2;
+				break;
 
-		case 1:         /* back buffer */
-			buffer = (UINT16 *)(v->fbi.ram + v->fbi.rgboffs[v->fbi.backbuf]);
-			bufmax = (v->fbi.mask + 1 - v->fbi.rgboffs[v->fbi.backbuf]) / 2;
-			break;
+			case 1:         /* back buffer */
+				buffer = (UINT16 *)(v->fbi.ram + v->fbi.rgboffs[v->fbi.backbuf]);
+				bufmax = (v->fbi.mask + 1 - v->fbi.rgboffs[v->fbi.backbuf]) / 2;
+				break;
 
-		case 2:         /* aux buffer */
-			if (v->fbi.auxoffs == ~0)
+			case 2:         /* aux buffer */
+				if (v->fbi.auxoffs == ~0)
+					return 0xffffffff;
+				buffer = (UINT16 *)(v->fbi.ram + v->fbi.auxoffs);
+				bufmax = (v->fbi.mask + 1 - v->fbi.auxoffs) / 2;
+				break;
+
+			default:        /* reserved */
 				return 0xffffffff;
-			buffer = (UINT16 *)(v->fbi.ram + v->fbi.auxoffs);
-			bufmax = (v->fbi.mask + 1 - v->fbi.auxoffs) / 2;
-			break;
+		}
 
-		default:        /* reserved */
-			return 0xffffffff;
+		/* determine the screen Y */
+		scry = y;
+		if (LFBMODE_Y_ORIGIN(v->reg[lfbMode].u))
+			scry = (v->fbi.yorigin - y) & 0x3ff;
+	} else {
+		// Direct lfb access
+		buffer = (UINT16 *)(v->fbi.ram + v->fbi.lfb_base*4);
+		bufmax = (v->fbi.mask + 1 - v->fbi.lfb_base*4) / 2;
+		scry = y;
 	}
 
-	/* determine the screen Y */
-	scry = y;
-	if (LFBMODE_Y_ORIGIN(v->reg[lfbMode].u))
-		scry = (v->fbi.yorigin - y) & 0x3ff;
-
 	/* advance pointers to the proper row */
 	bufoffs = scry * v->fbi.rowpixels + x;
-	if (bufoffs >= bufmax)
+	if (bufoffs >= bufmax) {
+		logerror("LFB_R: Buffer offset out of bounds x=%i y=%i lfb_3d=%i offset=%08X bufoffs=%08X\n", x, y, lfb_3d, offset, (UINT32) bufoffs);
 		return 0xffffffff;
+	}
 
 	/* wait for any outstanding work to finish */
 	poly_wait(v->poly, "LFB read");
@@ -4005,7 +4090,7 @@ READ32_MEMBER( voodoo_device::voodoo_r )
 	if (!(offset & (0xc00000/4)))
 		return register_r(v, offset);
 	else if (!(offset & (0x800000/4)))
-		return lfb_r(v, offset, FALSE);
+		return lfb_r(v, offset, true);
 
 	return 0xffffffff;
 }
@@ -4098,17 +4183,18 @@ READ32_MEMBER( voodoo_banshee_device::banshee_r )
 	else if (offset < 0x600000/4)
 		result = register_r(v, offset & 0x1fffff/4);
 	else if (offset < 0x800000/4)
-		logerror("%s:banshee_r(TEX:%X)\n", machine().describe_context(), (offset*4) & 0x1fffff);
+		logerror("%s:banshee_r(TEX0:%X)\n", machine().describe_context(), (offset*4) & 0x1fffff);
+	else if (offset < 0xa00000/4)
+		logerror("%s:banshee_r(TEX1:%X)\n", machine().describe_context(), (offset*4) & 0x1fffff);
 	else if (offset < 0xc00000/4)
-		logerror("%s:banshee_r(RES:%X)\n", machine().describe_context(), (offset*4) & 0x3fffff);
+		logerror("%s:banshee_r(FLASH Bios ROM:%X)\n", machine().describe_context(), (offset*4) & 0x3fffff);
 	else if (offset < 0x1000000/4)
 		logerror("%s:banshee_r(YUV:%X)\n", machine().describe_context(), (offset*4) & 0x3fffff);
 	else if (offset < 0x2000000/4)
 	{
-		UINT8 temp = v->fbi.lfb_stride;
-		v->fbi.lfb_stride = 11;
-		result = lfb_r(v, offset & 0xffffff/4, FALSE);
-		v->fbi.lfb_stride = temp;
+		result = lfb_r(v, offset & 0xffffff/4, true);
+	} else {
+			logerror("%s:banshee_r(%X) Access out of bounds\n", machine().describe_context(), offset*4);
 	}
 	return result;
 }
@@ -4130,9 +4216,14 @@ READ32_MEMBER( voodoo_banshee_device::banshee_fb_r )
 #endif
 		if (offset*4 <= v->fbi.mask)
 			result = ((UINT32 *)v->fbi.ram)[offset];
+		else
+			logerror("%s:banshee_fb_r(%X) Access out of bounds\n", machine().describe_context(), offset*4);
+	}
+	else {
+		if (LOG_LFB)
+			logerror("%s:banshee_fb_r(%X) to lfb_r: %08X lfb_base=%08X\n", machine().describe_context(), offset*4, offset - v->fbi.lfb_base, v->fbi.lfb_base);
+		result = lfb_r(v, offset - v->fbi.lfb_base, false);
 	}
-	else
-		result = lfb_r(v, offset - v->fbi.lfb_base, FALSE);
 	return result;
 }
 
@@ -4657,17 +4748,18 @@ WRITE32_MEMBER( voodoo_banshee_device::banshee_w )
 	else if (offset < 0x600000/4)
 		register_w(v, offset & 0x1fffff/4, data);
 	else if (offset < 0x800000/4)
-		logerror("%s:banshee_w(TEX:%X) = %08X & %08X\n", machine().describe_context(), (offset*4) & 0x1fffff, data, mem_mask);
+		logerror("%s:banshee_w(TEX0:%X) = %08X & %08X\n", machine().describe_context(), (offset*4) & 0x1fffff, data, mem_mask);
+	else if (offset < 0xa00000/4)
+		logerror("%s:banshee_w(TEX1:%X) = %08X & %08X\n", machine().describe_context(), (offset*4) & 0x1fffff, data, mem_mask);
 	else if (offset < 0xc00000/4)
-		logerror("%s:banshee_w(RES:%X) = %08X & %08X\n", machine().describe_context(), (offset*4) & 0x3fffff, data, mem_mask);
+		logerror("%s:banshee_r(FLASH Bios ROM:%X)\n", machine().describe_context(), (offset*4) & 0x3fffff);
 	else if (offset < 0x1000000/4)
 		logerror("%s:banshee_w(YUV:%X) = %08X & %08X\n", machine().describe_context(), (offset*4) & 0x3fffff, data, mem_mask);
 	else if (offset < 0x2000000/4)
 	{
-		UINT8 temp = v->fbi.lfb_stride;
-		v->fbi.lfb_stride = 11;
-		lfb_w(v, offset & 0xffffff/4, data, mem_mask, FALSE);
-		v->fbi.lfb_stride = temp;
+		lfb_w(v, offset & 0xffffff/4, data, mem_mask, true);
+	} else {
+		logerror("%s:banshee_w Address out of range %08X = %08X & %08X\n", machine().describe_context(), (offset*4), data, mem_mask);
 	}
 }
 
@@ -4691,13 +4783,15 @@ WRITE32_MEMBER( voodoo_banshee_device::banshee_fb_w )
 		{
 			if (offset*4 <= v->fbi.mask)
 				COMBINE_DATA(&((UINT32 *)v->fbi.ram)[offset]);
+			else
+				logerror("%s:banshee_fb_w Out of bounds (%X) = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask);
 #if LOG_LFB
 			logerror("%s:banshee_fb_w(%X) = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask);
 #endif
 		}
 	}
 	else
-		lfb_w(v, offset - v->fbi.lfb_base, data, mem_mask, FALSE);
+		lfb_w(v, offset - v->fbi.lfb_base, data, mem_mask, false);
 }
 
 
@@ -4828,7 +4922,7 @@ WRITE32_MEMBER( voodoo_banshee_device::banshee_io_w )
 		}
 
 		case io_lfbMemoryConfig:
-			v->fbi.lfb_base = (data & 0x1fff) << 10;
+			v->fbi.lfb_base = (data & 0x1fff) << (12-2);
 			v->fbi.lfb_stride = ((data >> 13) & 7) + 9;
 			if (LOG_REGISTERS)
 				logerror("%s:banshee_io_w(%s) = %08X & %08X\n", machine().describe_context(), banshee_io_reg_name[offset], data, mem_mask);
@@ -4870,7 +4964,7 @@ void voodoo_device::common_start_voodoo(UINT8 type)
 	voodoo_state *v = get_safe_token(this);
 	const raster_info *info;
 	void *fbmem, *tmumem[2];
-	UINT32 tmumem0;
+	UINT32 tmumem0, tmumem1;
 	int val;
 
 	/* validate configuration */
@@ -4993,6 +5087,7 @@ void voodoo_device::common_start_voodoo(UINT8 type)
 
 	/* allocate memory */
 	tmumem0 = m_tmumem0;
+	tmumem1 = m_tmumem1;
 	if (v->type <= TYPE_VOODOO_2)
 	{
 		/* separate FB/TMU memory */
@@ -5005,6 +5100,8 @@ void voodoo_device::common_start_voodoo(UINT8 type)
 		/* shared memory */
 		tmumem[0] = tmumem[1] = fbmem = auto_alloc_array(machine(), UINT8, m_fbmem << 20);
 		tmumem0 = m_fbmem;
+		if (v->type == TYPE_VOODOO_3)
+			tmumem1 = m_fbmem;
 	}
 
 	/* set up frame buffer */
@@ -5016,9 +5113,9 @@ void voodoo_device::common_start_voodoo(UINT8 type)
 	/* set up the TMUs */
 	init_tmu(v, &v->tmu[0], &v->reg[0x100], tmumem[0], tmumem0 << 20);
 	v->chipmask |= 0x02;
-	if (m_tmumem1 != 0 || v->type == TYPE_VOODOO_3)
+	if (tmumem1 != 0)
 	{
-		init_tmu(v, &v->tmu[1], &v->reg[0x200], tmumem[1], m_tmumem1 << 20);
+		init_tmu(v, &v->tmu[1], &v->reg[0x200], tmumem[1], tmumem1 << 20);
 		v->chipmask |= 0x04;
 		v->tmu_config |= 0x40;
 	}
@@ -5567,7 +5664,7 @@ static raster_info *add_rasterizer(voodoo_state *v, const raster_info *cinfo)
 	v->raster_hash[hash] = info;
 
 	if (LOG_RASTERIZERS)
-		printf("Adding rasterizer @ %p : %08X %08X %08X %08X %08X %08X (hash=%d)\n",
+		printf("Adding rasterizer @ %p : cp=%08X am=%08X %08X fbzM=%08X tm0=%08X tm1=%08X (hash=%d)\n",
 				info->callback,
 				info->eff_color_path, info->eff_alpha_mode, info->eff_fog_mode, info->eff_fbz_mode,
 				info->eff_tex_mode_0, info->eff_tex_mode_1, hash);
@@ -5627,6 +5724,7 @@ static raster_info *find_rasterizer(voodoo_state *v, int texcount)
 	curinfo.polys = 0;
 	curinfo.hits = 0;
 	curinfo.next = 0;
+	curinfo.hash = hash;
 
 	return add_rasterizer(v, &curinfo);
 }
diff --git a/src/emu/video/voodoo_pci.c b/src/emu/video/voodoo_pci.c
index 99b37b4fb18..609d6cf2628 100644
--- a/src/emu/video/voodoo_pci.c
+++ b/src/emu/video/voodoo_pci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "voodoo_pci.h"
 
 static MACHINE_CONFIG_FRAGMENT( voodoo_pci )
diff --git a/src/emu/video/voodoo_pci.h b/src/emu/video/voodoo_pci.h
index 428b8eca0fe..46d876fb083 100644
--- a/src/emu/video/voodoo_pci.h
+++ b/src/emu/video/voodoo_pci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // 3dfx Voodoo Graphics SST-1/2 emulator.
 
 #ifndef VOODOO_PCI_H
diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c
index 2c954ef4b75..b1edf88d28c 100644
--- a/src/ldplayer/ldplayer.c
+++ b/src/ldplayer/ldplayer.c
@@ -1,12 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /*************************************************************************
 
     ldplayer.c
 
     Laserdisc player driver.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **************************************************************************/
 
 #include "emu.h"
diff --git a/src/ldplayer/ldplayer.lst b/src/ldplayer/ldplayer.lst
index 805421e7f7e..836a4d245a5 100644
--- a/src/ldplayer/ldplayer.lst
+++ b/src/ldplayer/ldplayer.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     ldpdriv.c
@@ -5,37 +7,6 @@
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.
 
-****************************************************************************
-
-    Copyright Aaron Giles
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in
-          the documentation and/or other materials provided with the
-          distribution.
-        * Neither the name 'MAME' nor the names of its contributors may be
-          used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
 ******************************************************************************/
 
 ldv1000     // Pioneer LD-V1000
diff --git a/src/lib/formats/a26_cas.c b/src/lib/formats/a26_cas.c
index 7ee425fd1af..3c9d6ad4831 100644
--- a/src/lib/formats/a26_cas.c
+++ b/src/lib/formats/a26_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Atari 2600 SuperCharger support
diff --git a/src/lib/formats/a26_cas.h b/src/lib/formats/a26_cas.h
index 3d5e74bfd6d..e7c6fff6b18 100644
--- a/src/lib/formats/a26_cas.h
+++ b/src/lib/formats/a26_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     a26_cas.h
 
diff --git a/src/lib/formats/a5105_dsk.h b/src/lib/formats/a5105_dsk.h
index 2a34e9e1bc8..a7f08cc2a26 100644
--- a/src/lib/formats/a5105_dsk.h
+++ b/src/lib/formats/a5105_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/a5105_dsk.h
diff --git a/src/lib/formats/ace_tap.c b/src/lib/formats/ace_tap.c
index 8d6d4694b05..4465a587e16 100644
--- a/src/lib/formats/ace_tap.c
+++ b/src/lib/formats/ace_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Support for Jupiter Ace .tap cassette images
diff --git a/src/lib/formats/ace_tap.h b/src/lib/formats/ace_tap.h
index 620b75d13d3..f920a5f23e2 100644
--- a/src/lib/formats/ace_tap.h
+++ b/src/lib/formats/ace_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ace_tap.h
diff --git a/src/lib/formats/adam_cas.c b/src/lib/formats/adam_cas.c
index 83f873c5f00..fdc3a5fd6c7 100644
--- a/src/lib/formats/adam_cas.c
+++ b/src/lib/formats/adam_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include <assert.h>
 
diff --git a/src/lib/formats/adam_cas.h b/src/lib/formats/adam_cas.h
index 55eea661e0d..b5eaa761eff 100644
--- a/src/lib/formats/adam_cas.h
+++ b/src/lib/formats/adam_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     adam_cas.h
diff --git a/src/lib/formats/ami_dsk.h b/src/lib/formats/ami_dsk.h
index ff2713f3945..c2c70a9878c 100644
--- a/src/lib/formats/ami_dsk.h
+++ b/src/lib/formats/ami_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/ami_dsk.h
diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c
index b7ad6885ab4..5b3dc3a46fe 100644
--- a/src/lib/formats/ap2_dsk.c
+++ b/src/lib/formats/ap2_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ap2_dsk.c
diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h
index af5ac956dee..7a183bfbeec 100644
--- a/src/lib/formats/ap2_dsk.h
+++ b/src/lib/formats/ap2_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ap2_dsk.h
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index f218c996abd..1bb334f2a39 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ap_dsk35.c
diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h
index d113d3481a0..815ecfd9b62 100644
--- a/src/lib/formats/ap_dsk35.h
+++ b/src/lib/formats/ap_dsk35.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ap_dsk35.h
diff --git a/src/lib/formats/apf_apt.h b/src/lib/formats/apf_apt.h
index faea27669c2..76e7f266dc8 100644
--- a/src/lib/formats/apf_apt.h
+++ b/src/lib/formats/apf_apt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef APFCAS_H
 #define APFCAS_H
 
diff --git a/src/lib/formats/apollo_dsk.h b/src/lib/formats/apollo_dsk.h
index 864329a74ff..2ea2026a239 100644
--- a/src/lib/formats/apollo_dsk.h
+++ b/src/lib/formats/apollo_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/apollo_dsk.h
diff --git a/src/lib/formats/applix_dsk.h b/src/lib/formats/applix_dsk.h
index 5648fd25172..b98b8ddb85f 100644
--- a/src/lib/formats/applix_dsk.h
+++ b/src/lib/formats/applix_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/applix_dsk.h
diff --git a/src/lib/formats/apridisk.c b/src/lib/formats/apridisk.c
index e835d169210..02d472ebe5e 100644
--- a/src/lib/formats/apridisk.c
+++ b/src/lib/formats/apridisk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     APRIDISK disk image format
diff --git a/src/lib/formats/apridisk.h b/src/lib/formats/apridisk.h
index e7c39993016..8ff40b790f9 100644
--- a/src/lib/formats/apridisk.h
+++ b/src/lib/formats/apridisk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     APRIDISK disk image format
diff --git a/src/lib/formats/asst128_dsk.h b/src/lib/formats/asst128_dsk.h
index 4c030798c77..a4eb46cee13 100644
--- a/src/lib/formats/asst128_dsk.h
+++ b/src/lib/formats/asst128_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/asst128_dsk.h
diff --git a/src/lib/formats/atari_dsk.c b/src/lib/formats/atari_dsk.c
index cbfbcc3d21f..90a998018c0 100644
--- a/src/lib/formats/atari_dsk.c
+++ b/src/lib/formats/atari_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atari_dsk.c
diff --git a/src/lib/formats/atari_dsk.h b/src/lib/formats/atari_dsk.h
index c7dbc4ee7a8..1948725af0e 100644
--- a/src/lib/formats/atari_dsk.h
+++ b/src/lib/formats/atari_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atari_dsk.h
diff --git a/src/lib/formats/atarist_dsk.c b/src/lib/formats/atarist_dsk.c
index aa0761465bf..fd9178184ea 100644
--- a/src/lib/formats/atarist_dsk.c
+++ b/src/lib/formats/atarist_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atarist_dsk.c
diff --git a/src/lib/formats/atarist_dsk.h b/src/lib/formats/atarist_dsk.h
index b6da0616cd0..9b65ddbdc4e 100644
--- a/src/lib/formats/atarist_dsk.h
+++ b/src/lib/formats/atarist_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atarist_dsk.h
diff --git a/src/lib/formats/atom_tap.c b/src/lib/formats/atom_tap.c
index 99335fa4230..eff2e125e2e 100644
--- a/src/lib/formats/atom_tap.c
+++ b/src/lib/formats/atom_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atom_tap.c
diff --git a/src/lib/formats/atom_tap.h b/src/lib/formats/atom_tap.h
index 6ef9e4ba3f6..4b8829e89b8 100644
--- a/src/lib/formats/atom_tap.h
+++ b/src/lib/formats/atom_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/atom_tap.h
diff --git a/src/lib/formats/basicdsk.c b/src/lib/formats/basicdsk.c
index 6b6b11ee4d1..16b137397df 100644
--- a/src/lib/formats/basicdsk.c
+++ b/src/lib/formats/basicdsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/basicdsk.c
diff --git a/src/lib/formats/basicdsk.h b/src/lib/formats/basicdsk.h
index eb9b42e3de7..098d8d47b92 100644
--- a/src/lib/formats/basicdsk.h
+++ b/src/lib/formats/basicdsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/basicdsk.h
diff --git a/src/lib/formats/bw12_dsk.h b/src/lib/formats/bw12_dsk.h
index 2f0599428d2..4d15c364c8a 100644
--- a/src/lib/formats/bw12_dsk.h
+++ b/src/lib/formats/bw12_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/bw12_dsk.h
diff --git a/src/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h
index c56d228d5ff..7c5ce51ca41 100644
--- a/src/lib/formats/bw2_dsk.h
+++ b/src/lib/formats/bw2_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/bw2_dsk.h
diff --git a/src/lib/formats/cassimg.c b/src/lib/formats/cassimg.c
index fefcabe1cb6..f1c9fbf8b21 100644
--- a/src/lib/formats/cassimg.c
+++ b/src/lib/formats/cassimg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cassimg.c
diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
index 6b4199e14fc..692e5cbc354 100644
--- a/src/lib/formats/cassimg.h
+++ b/src/lib/formats/cassimg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cassimg.h
diff --git a/src/lib/formats/cbm_tap.c b/src/lib/formats/cbm_tap.c
index f02b4ac1968..13119ad1f8f 100644
--- a/src/lib/formats/cbm_tap.c
+++ b/src/lib/formats/cbm_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Tape support for C16 / C64 / VIC20 TAP format
diff --git a/src/lib/formats/cbm_tap.h b/src/lib/formats/cbm_tap.h
index 81e4b20bcb0..6a339e9d95e 100644
--- a/src/lib/formats/cbm_tap.h
+++ b/src/lib/formats/cbm_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cbm_tap.h
diff --git a/src/lib/formats/cgen_cas.c b/src/lib/formats/cgen_cas.c
index 5d29f7e2b61..db499a1e5c1 100644
--- a/src/lib/formats/cgen_cas.c
+++ b/src/lib/formats/cgen_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Support for EACA Colour Genie .cas cassette images
diff --git a/src/lib/formats/cgen_cas.h b/src/lib/formats/cgen_cas.h
index bea550ff8a2..fe01d49713b 100644
--- a/src/lib/formats/cgen_cas.h
+++ b/src/lib/formats/cgen_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cgen_cas.h
diff --git a/src/lib/formats/coco_cas.c b/src/lib/formats/coco_cas.c
index efc660943e3..edc2e96a3a8 100644
--- a/src/lib/formats/coco_cas.c
+++ b/src/lib/formats/coco_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
     coco_cas.c
diff --git a/src/lib/formats/coco_cas.h b/src/lib/formats/coco_cas.h
index e90a8e5be28..2648b89fded 100644
--- a/src/lib/formats/coco_cas.h
+++ b/src/lib/formats/coco_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     coco_cas.h
diff --git a/src/lib/formats/coco_dsk.c b/src/lib/formats/coco_dsk.c
index c94cc74d57a..bcd6104bf3e 100644
--- a/src/lib/formats/coco_dsk.c
+++ b/src/lib/formats/coco_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/coco_dsk.c
diff --git a/src/lib/formats/coco_dsk.h b/src/lib/formats/coco_dsk.h
index a54d5d44aac..7495724aa1f 100644
--- a/src/lib/formats/coco_dsk.h
+++ b/src/lib/formats/coco_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/coco_dsk.h
diff --git a/src/lib/formats/concept_dsk.h b/src/lib/formats/concept_dsk.h
index 012d01cc7d1..1c194114bef 100644
--- a/src/lib/formats/concept_dsk.h
+++ b/src/lib/formats/concept_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/concept_dsk.h
diff --git a/src/lib/formats/coupedsk.c b/src/lib/formats/coupedsk.c
index e57d01abadf..c7c397f6e5b 100644
--- a/src/lib/formats/coupedsk.c
+++ b/src/lib/formats/coupedsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     formats/coupedsk.c
diff --git a/src/lib/formats/coupedsk.h b/src/lib/formats/coupedsk.h
index ea381a96752..c67448f71c9 100644
--- a/src/lib/formats/coupedsk.h
+++ b/src/lib/formats/coupedsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     formats/coupedsk.h
diff --git a/src/lib/formats/cpis_dsk.c b/src/lib/formats/cpis_dsk.c
index d5a763acfb6..fd9d4e4e610 100644
--- a/src/lib/formats/cpis_dsk.c
+++ b/src/lib/formats/cpis_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/cpis_dsk.c
diff --git a/src/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h
index 002f5dd2e54..05f014fded9 100644
--- a/src/lib/formats/cpis_dsk.h
+++ b/src/lib/formats/cpis_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/cpis_dsk.h
diff --git a/src/lib/formats/cqm_dsk.c b/src/lib/formats/cqm_dsk.c
index f30749f9e9b..df3f98462d8 100644
--- a/src/lib/formats/cqm_dsk.c
+++ b/src/lib/formats/cqm_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/cqm_dsk.c
diff --git a/src/lib/formats/cqm_dsk.h b/src/lib/formats/cqm_dsk.h
index 9cb436a3bc3..93db124f54c 100644
--- a/src/lib/formats/cqm_dsk.h
+++ b/src/lib/formats/cqm_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/cqm_dsk.h
diff --git a/src/lib/formats/csw_cas.c b/src/lib/formats/csw_cas.c
index b328a35f572..ae9640d8a10 100644
--- a/src/lib/formats/csw_cas.c
+++ b/src/lib/formats/csw_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 CSW format
 ----------
diff --git a/src/lib/formats/csw_cas.h b/src/lib/formats/csw_cas.h
index 89e7800aa51..cd7c1a53790 100644
--- a/src/lib/formats/csw_cas.h
+++ b/src/lib/formats/csw_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     csw_cas.h
 
diff --git a/src/lib/formats/d88_dsk.c b/src/lib/formats/d88_dsk.c
index 23363acdcc1..8c64f41b51c 100644
--- a/src/lib/formats/d88_dsk.c
+++ b/src/lib/formats/d88_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *   D77 and D88 disk images
  *
diff --git a/src/lib/formats/d88_dsk.h b/src/lib/formats/d88_dsk.h
index f4bf58fe0f3..209797caa97 100644
--- a/src/lib/formats/d88_dsk.h
+++ b/src/lib/formats/d88_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/d88_dsk.h
diff --git a/src/lib/formats/dcp_dsk.h b/src/lib/formats/dcp_dsk.h
index 4a5df0cbe73..1a1756faf2d 100644
--- a/src/lib/formats/dcp_dsk.h
+++ b/src/lib/formats/dcp_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dcp_dsk.h
diff --git a/src/lib/formats/dfi_dsk.h b/src/lib/formats/dfi_dsk.h
index 97ae4e3deb8..e8115020381 100644
--- a/src/lib/formats/dfi_dsk.h
+++ b/src/lib/formats/dfi_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef DFI_DSK_H
 #define DFI_DSK_H
 
diff --git a/src/lib/formats/dim_dsk.c b/src/lib/formats/dim_dsk.c
index b78bec1ba31..3cf84536c9c 100644
--- a/src/lib/formats/dim_dsk.c
+++ b/src/lib/formats/dim_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dim_dsk.c
diff --git a/src/lib/formats/dim_dsk.h b/src/lib/formats/dim_dsk.h
index fbbe5083226..ce586a21975 100644
--- a/src/lib/formats/dim_dsk.h
+++ b/src/lib/formats/dim_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dim_dsk.h
diff --git a/src/lib/formats/dip_dsk.h b/src/lib/formats/dip_dsk.h
index 761d70363e8..8f90364ecfe 100644
--- a/src/lib/formats/dip_dsk.h
+++ b/src/lib/formats/dip_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dip_dsk.h
diff --git a/src/lib/formats/dmk_dsk.h b/src/lib/formats/dmk_dsk.h
index 5167f0502cc..2fb50fa81ab 100644
--- a/src/lib/formats/dmk_dsk.h
+++ b/src/lib/formats/dmk_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dmk_dsk.h
diff --git a/src/lib/formats/dmv_dsk.h b/src/lib/formats/dmv_dsk.h
index 0e505b37d87..a3138c5cac9 100644
--- a/src/lib/formats/dmv_dsk.h
+++ b/src/lib/formats/dmv_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dmv_dsk.h
diff --git a/src/lib/formats/dsk_dsk.c b/src/lib/formats/dsk_dsk.c
index 6129ff72b77..88ec2917ed8 100644
--- a/src/lib/formats/dsk_dsk.c
+++ b/src/lib/formats/dsk_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dsk_dsk.c
diff --git a/src/lib/formats/dsk_dsk.h b/src/lib/formats/dsk_dsk.h
index fcee4926e9b..9ca89c04685 100644
--- a/src/lib/formats/dsk_dsk.h
+++ b/src/lib/formats/dsk_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/dsk_dsk.h
diff --git a/src/lib/formats/esq16_dsk.c b/src/lib/formats/esq16_dsk.c
index 01b1120e677..5e3fe626656 100644
--- a/src/lib/formats/esq16_dsk.c
+++ b/src/lib/formats/esq16_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/esq16_dsk.c
diff --git a/src/lib/formats/esq16_dsk.h b/src/lib/formats/esq16_dsk.h
index 476e14106f6..5c2e78095df 100644
--- a/src/lib/formats/esq16_dsk.h
+++ b/src/lib/formats/esq16_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/esq16_dsk.h
diff --git a/src/lib/formats/esq8_dsk.c b/src/lib/formats/esq8_dsk.c
index 763c303d20a..9d4b047acd6 100644
--- a/src/lib/formats/esq8_dsk.c
+++ b/src/lib/formats/esq8_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/esq8_dsk.c
diff --git a/src/lib/formats/esq8_dsk.h b/src/lib/formats/esq8_dsk.h
index 3df6400e5c7..0d6d823e66c 100644
--- a/src/lib/formats/esq8_dsk.h
+++ b/src/lib/formats/esq8_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/esq8_dsk.h
diff --git a/src/lib/formats/excali64_dsk.h b/src/lib/formats/excali64_dsk.h
index 37b62265c1c..7df8ee79ff5 100644
--- a/src/lib/formats/excali64_dsk.h
+++ b/src/lib/formats/excali64_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/excali64_dsk.h
diff --git a/src/lib/formats/fdd_dsk.h b/src/lib/formats/fdd_dsk.h
index 8fd7a7ff878..909980a0815 100644
--- a/src/lib/formats/fdd_dsk.h
+++ b/src/lib/formats/fdd_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/fdd_dsk.h
diff --git a/src/lib/formats/fdi_dsk.c b/src/lib/formats/fdi_dsk.c
index 9d556f66e9a..15de54005f4 100644
--- a/src/lib/formats/fdi_dsk.c
+++ b/src/lib/formats/fdi_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/fdi_dsk.h
diff --git a/src/lib/formats/flex_dsk.c b/src/lib/formats/flex_dsk.c
index f4934d8e436..03a288e9efd 100644
--- a/src/lib/formats/flex_dsk.c
+++ b/src/lib/formats/flex_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * flex_dsk.c  -  FLEX compatible disk images
  *
diff --git a/src/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h
index 9348fecd5db..7d680002b05 100644
--- a/src/lib/formats/flex_dsk.h
+++ b/src/lib/formats/flex_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * flex_dsk.h
  *
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 35ab1af359d..be11304a173 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     flopimg.c
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index 59b652643b6..6643823d77e 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     flopimg.h
diff --git a/src/lib/formats/fm7_cas.c b/src/lib/formats/fm7_cas.c
index 48b0239f738..b1a605ea55a 100644
--- a/src/lib/formats/fm7_cas.c
+++ b/src/lib/formats/fm7_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Fujitsu FM-7 series cassette handling
  */
diff --git a/src/lib/formats/fm7_cas.h b/src/lib/formats/fm7_cas.h
index 11d3438942b..e8ca98933ae 100644
--- a/src/lib/formats/fm7_cas.h
+++ b/src/lib/formats/fm7_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Fujitsu FM-7 cassette format handling
  */
diff --git a/src/lib/formats/fmsx_cas.c b/src/lib/formats/fmsx_cas.c
index 54b64ae4d01..32bf6e62d6e 100644
--- a/src/lib/formats/fmsx_cas.c
+++ b/src/lib/formats/fmsx_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 
 #include "formats/fmsx_cas.h"
diff --git a/src/lib/formats/fmsx_cas.h b/src/lib/formats/fmsx_cas.h
index eb242aeb2fa..d9998345367 100644
--- a/src/lib/formats/fmsx_cas.h
+++ b/src/lib/formats/fmsx_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     fmsx_cas.h
diff --git a/src/lib/formats/fmtowns_dsk.c b/src/lib/formats/fmtowns_dsk.c
index 6baede6fb07..32409019cc3 100644
--- a/src/lib/formats/fmtowns_dsk.c
+++ b/src/lib/formats/fmtowns_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * fmtowns_dsk.c
  *
diff --git a/src/lib/formats/fmtowns_dsk.h b/src/lib/formats/fmtowns_dsk.h
index 390bc3b8a41..c6361fe2316 100644
--- a/src/lib/formats/fmtowns_dsk.h
+++ b/src/lib/formats/fmtowns_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * fmtowns_dsk.h
  *
diff --git a/src/lib/formats/gtp_cas.c b/src/lib/formats/gtp_cas.c
index 0fe391e9767..9cb28dabe76 100644
--- a/src/lib/formats/gtp_cas.c
+++ b/src/lib/formats/gtp_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Tape support for Glaksija GTP format
diff --git a/src/lib/formats/gtp_cas.h b/src/lib/formats/gtp_cas.h
index ee31a42caf6..b78b68deaba 100644
--- a/src/lib/formats/gtp_cas.h
+++ b/src/lib/formats/gtp_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
        gtp_cas.h
diff --git a/src/lib/formats/hect_dsk.c b/src/lib/formats/hect_dsk.c
index 50e112f0774..5ae102ad5d1 100644
--- a/src/lib/formats/hect_dsk.c
+++ b/src/lib/formats/hect_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/hect_dsk.c
diff --git a/src/lib/formats/hect_dsk.h b/src/lib/formats/hect_dsk.h
index f8ea5d46a54..c334ed60d27 100644
--- a/src/lib/formats/hect_dsk.h
+++ b/src/lib/formats/hect_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/hect_dsk.h
diff --git a/src/lib/formats/hect_tap.c b/src/lib/formats/hect_tap.c
index 745cf2a0038..26ad7f7b607 100644
--- a/src/lib/formats/hect_tap.c
+++ b/src/lib/formats/hect_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Support for Micronique machine .K7 and *.FOR cassette images
diff --git a/src/lib/formats/hect_tap.h b/src/lib/formats/hect_tap.h
index fb1798ccca0..1abaabab23b 100644
--- a/src/lib/formats/hect_tap.h
+++ b/src/lib/formats/hect_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     hect_tap.h
diff --git a/src/lib/formats/hxcmfm_dsk.h b/src/lib/formats/hxcmfm_dsk.h
index c185f31a264..8a788f9afa9 100644
--- a/src/lib/formats/hxcmfm_dsk.h
+++ b/src/lib/formats/hxcmfm_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/hxcmfm_dsk.h
diff --git a/src/lib/formats/imd_dsk.c b/src/lib/formats/imd_dsk.c
index 8600590c735..2e8501de6af 100644
--- a/src/lib/formats/imd_dsk.c
+++ b/src/lib/formats/imd_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/imd_dsk.c
diff --git a/src/lib/formats/imd_dsk.h b/src/lib/formats/imd_dsk.h
index 7124503be89..596552e6837 100644
--- a/src/lib/formats/imd_dsk.h
+++ b/src/lib/formats/imd_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/imd_dsk.h
diff --git a/src/lib/formats/ioprocs.c b/src/lib/formats/ioprocs.c
index b1771bf3774..04daf16b1c6 100644
--- a/src/lib/formats/ioprocs.c
+++ b/src/lib/formats/ioprocs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/lib/formats/ioprocs.h b/src/lib/formats/ioprocs.h
index 94239c1ba56..c8cd45226a0 100644
--- a/src/lib/formats/ioprocs.h
+++ b/src/lib/formats/ioprocs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ioprocs.h
diff --git a/src/lib/formats/ipf_dsk.c b/src/lib/formats/ipf_dsk.c
index edaea40181f..0d1900f41fa 100644
--- a/src/lib/formats/ipf_dsk.c
+++ b/src/lib/formats/ipf_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 #include "ipf_dsk.h"
 
diff --git a/src/lib/formats/ipf_dsk.h b/src/lib/formats/ipf_dsk.h
index 172478ef038..5ad2bb75b0b 100644
--- a/src/lib/formats/ipf_dsk.h
+++ b/src/lib/formats/ipf_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef IPF_DSK_H_
 #define IPF_DSK_H_
 
diff --git a/src/lib/formats/iq151_dsk.h b/src/lib/formats/iq151_dsk.h
index 093a78cd76b..699c84482f6 100644
--- a/src/lib/formats/iq151_dsk.h
+++ b/src/lib/formats/iq151_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/iq151_dsk.h
diff --git a/src/lib/formats/itt3030_dsk.h b/src/lib/formats/itt3030_dsk.h
index 6502ee23600..8d35a842f4e 100644
--- a/src/lib/formats/itt3030_dsk.h
+++ b/src/lib/formats/itt3030_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/itt3030_dsk.h
diff --git a/src/lib/formats/kaypro_dsk.h b/src/lib/formats/kaypro_dsk.h
index c02826ac81f..f633a779c88 100644
--- a/src/lib/formats/kaypro_dsk.h
+++ b/src/lib/formats/kaypro_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/kaypro_dsk.h
diff --git a/src/lib/formats/kc85_dsk.h b/src/lib/formats/kc85_dsk.h
index dd724f77677..ab582a4f71d 100644
--- a/src/lib/formats/kc85_dsk.h
+++ b/src/lib/formats/kc85_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/kc85_dsk.h
diff --git a/src/lib/formats/kim1_cas.c b/src/lib/formats/kim1_cas.c
index b8433c0eea0..b10a9980b34 100644
--- a/src/lib/formats/kim1_cas.c
+++ b/src/lib/formats/kim1_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 
 #include "kim1_cas.h"
diff --git a/src/lib/formats/kim1_cas.h b/src/lib/formats/kim1_cas.h
index ba86def635a..5cde2a30baf 100644
--- a/src/lib/formats/kim1_cas.h
+++ b/src/lib/formats/kim1_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     kim1_cas.h
diff --git a/src/lib/formats/lviv_lvt.c b/src/lib/formats/lviv_lvt.c
index 87a56a6e2c2..c381da94c1c 100644
--- a/src/lib/formats/lviv_lvt.c
+++ b/src/lib/formats/lviv_lvt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* .LVT tape images */
 #include <assert.h>
 
diff --git a/src/lib/formats/lviv_lvt.h b/src/lib/formats/lviv_lvt.h
index 76e8fb81c83..19663b893a1 100644
--- a/src/lib/formats/lviv_lvt.h
+++ b/src/lib/formats/lviv_lvt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     lviv_lvt.h
diff --git a/src/lib/formats/m20_dsk.c b/src/lib/formats/m20_dsk.c
index abd2cf1b2cb..33fa283a63d 100644
--- a/src/lib/formats/m20_dsk.c
+++ b/src/lib/formats/m20_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/m20_dsk.c
diff --git a/src/lib/formats/m20_dsk.h b/src/lib/formats/m20_dsk.h
index 6b91a82910a..39f7c1ce3d7 100644
--- a/src/lib/formats/m20_dsk.h
+++ b/src/lib/formats/m20_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/m20_dsk.c
diff --git a/src/lib/formats/m5_dsk.h b/src/lib/formats/m5_dsk.h
index 09998cf3d62..65378e6405d 100644
--- a/src/lib/formats/m5_dsk.h
+++ b/src/lib/formats/m5_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/m5_dsk.h
diff --git a/src/lib/formats/mfi_dsk.h b/src/lib/formats/mfi_dsk.h
index cca3fce527e..386bd7ab983 100644
--- a/src/lib/formats/mfi_dsk.h
+++ b/src/lib/formats/mfi_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef MFI_DSK_H
 #define MFI_DSK_H
 
diff --git a/src/lib/formats/mm_dsk.h b/src/lib/formats/mm_dsk.h
index 2be378348d6..52a436254d8 100644
--- a/src/lib/formats/mm_dsk.h
+++ b/src/lib/formats/mm_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/mm_dsk.h
diff --git a/src/lib/formats/msx_dsk.c b/src/lib/formats/msx_dsk.c
index 11817d8ab32..fbbcb2b0de0 100644
--- a/src/lib/formats/msx_dsk.c
+++ b/src/lib/formats/msx_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/msx_dsk.c
diff --git a/src/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h
index 57a9f73535d..c175f5ba80f 100644
--- a/src/lib/formats/msx_dsk.h
+++ b/src/lib/formats/msx_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     msx_dsk.h
diff --git a/src/lib/formats/mz_cas.c b/src/lib/formats/mz_cas.c
index 56662f6c760..6ea6022e6b9 100644
--- a/src/lib/formats/mz_cas.c
+++ b/src/lib/formats/mz_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <string.h>
 #include <assert.h>
 #include "mz_cas.h"
diff --git a/src/lib/formats/mz_cas.h b/src/lib/formats/mz_cas.h
index fac69f69cc3..49080f8608b 100644
--- a/src/lib/formats/mz_cas.h
+++ b/src/lib/formats/mz_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     mz_cas.h
diff --git a/src/lib/formats/nanos_dsk.h b/src/lib/formats/nanos_dsk.h
index 39007c39cce..79db83dcc1d 100644
--- a/src/lib/formats/nanos_dsk.h
+++ b/src/lib/formats/nanos_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/nanos_dsk.h
diff --git a/src/lib/formats/nes_dsk.c b/src/lib/formats/nes_dsk.c
index ce62b4fba0e..dd1f3cf74b9 100644
--- a/src/lib/formats/nes_dsk.c
+++ b/src/lib/formats/nes_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/nes_dsk.c
diff --git a/src/lib/formats/nes_dsk.h b/src/lib/formats/nes_dsk.h
index 391ba221034..4f3f1b51e2b 100644
--- a/src/lib/formats/nes_dsk.h
+++ b/src/lib/formats/nes_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/nes_dsk.h
diff --git a/src/lib/formats/nfd_dsk.h b/src/lib/formats/nfd_dsk.h
index 820d6a573b2..ca7b25c7d9c 100644
--- a/src/lib/formats/nfd_dsk.h
+++ b/src/lib/formats/nfd_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/nfd_dsk.h
diff --git a/src/lib/formats/orao_cas.c b/src/lib/formats/orao_cas.c
index c771b234dda..36df3d98422 100644
--- a/src/lib/formats/orao_cas.c
+++ b/src/lib/formats/orao_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Tape support for Orao  TAP format
diff --git a/src/lib/formats/orao_cas.h b/src/lib/formats/orao_cas.h
index 8e7bce9b752..187664ca870 100644
--- a/src/lib/formats/orao_cas.h
+++ b/src/lib/formats/orao_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
        orao_cas.h
diff --git a/src/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h
index 98d5458f082..77a1c162ad4 100644
--- a/src/lib/formats/oric_dsk.h
+++ b/src/lib/formats/oric_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/oric_dsk.h
diff --git a/src/lib/formats/oric_tap.c b/src/lib/formats/oric_tap.c
index 123552eea7a..1c5ca227b93 100644
--- a/src/lib/formats/oric_tap.c
+++ b/src/lib/formats/oric_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 
 #include "oric_tap.h"
diff --git a/src/lib/formats/oric_tap.h b/src/lib/formats/oric_tap.h
index 2ec73b654fc..793f84fb37c 100644
--- a/src/lib/formats/oric_tap.h
+++ b/src/lib/formats/oric_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     oric_tap.h
diff --git a/src/lib/formats/p6001_cas.c b/src/lib/formats/p6001_cas.c
index debe3f3b261..724d3f23bb5 100644
--- a/src/lib/formats/p6001_cas.c
+++ b/src/lib/formats/p6001_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * NEC PC-6001 cassette format handling
  */
diff --git a/src/lib/formats/p6001_cas.h b/src/lib/formats/p6001_cas.h
index 2006bbb9794..a6365a4ed96 100644
--- a/src/lib/formats/p6001_cas.h
+++ b/src/lib/formats/p6001_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * NEC PC-6001 cassette format handling
  */
diff --git a/src/lib/formats/pasti_dsk.c b/src/lib/formats/pasti_dsk.c
index 9329600b1fd..c0e8668cdab 100644
--- a/src/lib/formats/pasti_dsk.c
+++ b/src/lib/formats/pasti_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h" // logerror
 #include "pasti_dsk.h"
 
diff --git a/src/lib/formats/pasti_dsk.h b/src/lib/formats/pasti_dsk.h
index 104efa1f6bf..46e7df42131 100644
--- a/src/lib/formats/pasti_dsk.h
+++ b/src/lib/formats/pasti_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PASTI_DSK_H_
 #define PASTI_DSK_H_
 
diff --git a/src/lib/formats/pc98_dsk.c b/src/lib/formats/pc98_dsk.c
index 6ef28d01eeb..b6a46bd2e23 100644
--- a/src/lib/formats/pc98_dsk.c
+++ b/src/lib/formats/pc98_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pc98_dsk.c
diff --git a/src/lib/formats/pc98_dsk.h b/src/lib/formats/pc98_dsk.h
index 50fe38676a6..6694feaeb17 100644
--- a/src/lib/formats/pc98_dsk.h
+++ b/src/lib/formats/pc98_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pc98_dsk.h
diff --git a/src/lib/formats/pc98fdi_dsk.h b/src/lib/formats/pc98fdi_dsk.h
index 4dd475a11b4..cd69a60892d 100644
--- a/src/lib/formats/pc98fdi_dsk.h
+++ b/src/lib/formats/pc98fdi_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pc98fdi_dsk.h
diff --git a/src/lib/formats/pc_dsk.c b/src/lib/formats/pc_dsk.c
index 152dffed15a..2fccabaaef6 100644
--- a/src/lib/formats/pc_dsk.c
+++ b/src/lib/formats/pc_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pc_dsk.c
diff --git a/src/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h
index d6f9041d24c..7bf8e2b3779 100644
--- a/src/lib/formats/pc_dsk.h
+++ b/src/lib/formats/pc_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pc_dsk.h
diff --git a/src/lib/formats/primoptp.c b/src/lib/formats/primoptp.c
index 6373d43fd4f..f2c53975049 100644
--- a/src/lib/formats/primoptp.c
+++ b/src/lib/formats/primoptp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* .PTP Microkey Primo tape images */
 
 
diff --git a/src/lib/formats/primoptp.h b/src/lib/formats/primoptp.h
index 48577653098..e0788745998 100644
--- a/src/lib/formats/primoptp.h
+++ b/src/lib/formats/primoptp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     primoptp.h
diff --git a/src/lib/formats/pyldin_dsk.h b/src/lib/formats/pyldin_dsk.h
index 1c186e4a6e1..67e37e6144e 100644
--- a/src/lib/formats/pyldin_dsk.h
+++ b/src/lib/formats/pyldin_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/pyldin_dsk.h
diff --git a/src/lib/formats/rk_cas.c b/src/lib/formats/rk_cas.c
index 150b17c8f3b..9fba1803223 100644
--- a/src/lib/formats/rk_cas.c
+++ b/src/lib/formats/rk_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Tape support for RK format
diff --git a/src/lib/formats/rk_cas.h b/src/lib/formats/rk_cas.h
index 204324b82c6..6878b40b666 100644
--- a/src/lib/formats/rk_cas.h
+++ b/src/lib/formats/rk_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
        rk_cas.h
diff --git a/src/lib/formats/rx50_dsk.c b/src/lib/formats/rx50_dsk.c
index 429f22eafec..58e4cfc86a9 100644
--- a/src/lib/formats/rx50_dsk.c
+++ b/src/lib/formats/rx50_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     formats/rx50_dsk.c
diff --git a/src/lib/formats/rx50_dsk.h b/src/lib/formats/rx50_dsk.h
index 29db583f5b4..4ac73575c2b 100644
--- a/src/lib/formats/rx50_dsk.h
+++ b/src/lib/formats/rx50_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/rx50_dsk.h
diff --git a/src/lib/formats/sc3000_bit.c b/src/lib/formats/sc3000_bit.c
index f38f5a8d8c6..f06a7eae085 100644
--- a/src/lib/formats/sc3000_bit.c
+++ b/src/lib/formats/sc3000_bit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/sc3000_bit.c
diff --git a/src/lib/formats/sc3000_bit.h b/src/lib/formats/sc3000_bit.h
index 8950c187837..b8de99bd2e0 100644
--- a/src/lib/formats/sc3000_bit.h
+++ b/src/lib/formats/sc3000_bit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/sc3000_bit.h
diff --git a/src/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h
index fdae3c3902d..a989134e2c8 100644
--- a/src/lib/formats/smx_dsk.h
+++ b/src/lib/formats/smx_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/smx_dsk.h
diff --git a/src/lib/formats/sorc_dsk.c b/src/lib/formats/sorc_dsk.c
index 3c7aee10c33..426ea6884c0 100644
--- a/src/lib/formats/sorc_dsk.c
+++ b/src/lib/formats/sorc_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/sorc_dsk.c
diff --git a/src/lib/formats/sorc_dsk.h b/src/lib/formats/sorc_dsk.h
index 3bf59bdfe28..8ba6e1750ed 100644
--- a/src/lib/formats/sorc_dsk.h
+++ b/src/lib/formats/sorc_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/sorc_dsk.h
diff --git a/src/lib/formats/sord_cas.c b/src/lib/formats/sord_cas.c
index a2834931a2a..0e82254df09 100644
--- a/src/lib/formats/sord_cas.c
+++ b/src/lib/formats/sord_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
     sord_cas.c
diff --git a/src/lib/formats/sord_cas.h b/src/lib/formats/sord_cas.h
index 92c079f6cdd..4e55094e13f 100644
--- a/src/lib/formats/sord_cas.h
+++ b/src/lib/formats/sord_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sord_cas.h
diff --git a/src/lib/formats/st_dsk.h b/src/lib/formats/st_dsk.h
index 7dd54967acb..21d85e04686 100644
--- a/src/lib/formats/st_dsk.h
+++ b/src/lib/formats/st_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/st_dsk.h
diff --git a/src/lib/formats/svi_cas.c b/src/lib/formats/svi_cas.c
index 6b693b4d461..b0606b50c81 100644
--- a/src/lib/formats/svi_cas.c
+++ b/src/lib/formats/svi_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 
 #include "svi_cas.h"
diff --git a/src/lib/formats/svi_cas.h b/src/lib/formats/svi_cas.h
index 78129c9ac87..a90272c5277 100644
--- a/src/lib/formats/svi_cas.h
+++ b/src/lib/formats/svi_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     svi_cas.h
diff --git a/src/lib/formats/svi_dsk.c b/src/lib/formats/svi_dsk.c
index 23dbb9a17e2..caf2b76f441 100644
--- a/src/lib/formats/svi_dsk.c
+++ b/src/lib/formats/svi_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/svi_dsk.c
diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
index a1798d5331e..23575853a46 100644
--- a/src/lib/formats/svi_dsk.h
+++ b/src/lib/formats/svi_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/svi_dsk.h
diff --git a/src/lib/formats/td0_dsk.c b/src/lib/formats/td0_dsk.c
index a4df2524344..6be875e3f20 100644
--- a/src/lib/formats/td0_dsk.c
+++ b/src/lib/formats/td0_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/td0_dsk.c
diff --git a/src/lib/formats/td0_dsk.h b/src/lib/formats/td0_dsk.h
index 3e5b8e843c5..1fd817be323 100644
--- a/src/lib/formats/td0_dsk.h
+++ b/src/lib/formats/td0_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef TD0_DSK_H_
 #define TD0_DSK_H_
 
diff --git a/src/lib/formats/thom_cas.c b/src/lib/formats/thom_cas.c
index 36fb6e4de51..caf02bd4b6b 100644
--- a/src/lib/formats/thom_cas.c
+++ b/src/lib/formats/thom_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/lib/formats/thom_cas.h b/src/lib/formats/thom_cas.h
index 892615aae52..a37ae958551 100644
--- a/src/lib/formats/thom_cas.h
+++ b/src/lib/formats/thom_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/lib/formats/thom_dsk.c b/src/lib/formats/thom_dsk.c
index 4f7230f2421..303064b2926 100644
--- a/src/lib/formats/thom_dsk.c
+++ b/src/lib/formats/thom_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/thom_dsk.c
diff --git a/src/lib/formats/thom_dsk.h b/src/lib/formats/thom_dsk.h
index 92e0972a3bf..2b05b69fbb2 100644
--- a/src/lib/formats/thom_dsk.h
+++ b/src/lib/formats/thom_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef THOM_DSK
 #define THOM_DSK
 
diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
index 64498f01a8e..d5439c9c0be 100644
--- a/src/lib/formats/ti99_dsk.h
+++ b/src/lib/formats/ti99_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/ti99_dsk.c
diff --git a/src/lib/formats/trd_dsk.c b/src/lib/formats/trd_dsk.c
index 7cacd98fb4a..61897e270ee 100644
--- a/src/lib/formats/trd_dsk.c
+++ b/src/lib/formats/trd_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/trd_dsk.c
diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
index f4b2998c179..5ad4765692d 100644
--- a/src/lib/formats/trd_dsk.h
+++ b/src/lib/formats/trd_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/trd_dsk.h
diff --git a/src/lib/formats/trs_cas.c b/src/lib/formats/trs_cas.c
index 6e143200bc9..98710a2e8b5 100644
--- a/src/lib/formats/trs_cas.c
+++ b/src/lib/formats/trs_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Support for TRS80 .cas cassette images
diff --git a/src/lib/formats/trs_cas.h b/src/lib/formats/trs_cas.h
index 7ec0408beb1..5d3fe9bcc6e 100644
--- a/src/lib/formats/trs_cas.h
+++ b/src/lib/formats/trs_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     trs_cas.h
diff --git a/src/lib/formats/trs_dsk.c b/src/lib/formats/trs_dsk.c
index ebe6090bcdc..b7c0981bc02 100644
--- a/src/lib/formats/trs_dsk.c
+++ b/src/lib/formats/trs_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <string.h>
 #include <assert.h>
 #include "trs_dsk.h"
diff --git a/src/lib/formats/trs_dsk.h b/src/lib/formats/trs_dsk.h
index b4ac0d853e8..39205df94bc 100644
--- a/src/lib/formats/trs_dsk.h
+++ b/src/lib/formats/trs_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/trs_dsk.h
diff --git a/src/lib/formats/tvc_dsk.h b/src/lib/formats/tvc_dsk.h
index 4125f29650e..56cd3ea0490 100644
--- a/src/lib/formats/tvc_dsk.h
+++ b/src/lib/formats/tvc_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/tvc_dsk.h
diff --git a/src/lib/formats/tzx_cas.c b/src/lib/formats/tzx_cas.c
index 71ad4c747f5..b517f3ca829 100644
--- a/src/lib/formats/tzx_cas.c
+++ b/src/lib/formats/tzx_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 TZX (currently spectrum only) and spectrum TAP cassette format support by Wilbert Pol
diff --git a/src/lib/formats/tzx_cas.h b/src/lib/formats/tzx_cas.h
index 5f8c4caf661..bb0f8f7f0a4 100644
--- a/src/lib/formats/tzx_cas.h
+++ b/src/lib/formats/tzx_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
        tzx_cas.h
diff --git a/src/lib/formats/uef_cas.c b/src/lib/formats/uef_cas.c
index 6a5c8668c8e..35224f2b00c 100644
--- a/src/lib/formats/uef_cas.c
+++ b/src/lib/formats/uef_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 UEF format support (for electron driver)
diff --git a/src/lib/formats/uef_cas.h b/src/lib/formats/uef_cas.h
index 6c77d63a9a3..b8e7fba83a4 100644
--- a/src/lib/formats/uef_cas.h
+++ b/src/lib/formats/uef_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     uef_cas.h
 
diff --git a/src/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h
index 18b9f968d60..3f647876da2 100644
--- a/src/lib/formats/upd765_dsk.h
+++ b/src/lib/formats/upd765_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/upd765_dsk.h
diff --git a/src/lib/formats/vt_cas.c b/src/lib/formats/vt_cas.c
index 734954a2ab6..15adbaddbc6 100644
--- a/src/lib/formats/vt_cas.c
+++ b/src/lib/formats/vt_cas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <assert.h>
 
 #include "formats/vt_cas.h"
diff --git a/src/lib/formats/vt_cas.h b/src/lib/formats/vt_cas.h
index 15b42e8d082..4f1408d87d2 100644
--- a/src/lib/formats/vt_cas.h
+++ b/src/lib/formats/vt_cas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     vt_cas.h
diff --git a/src/lib/formats/vt_dsk.c b/src/lib/formats/vt_dsk.c
index 0021b66eaa4..26f810030b5 100644
--- a/src/lib/formats/vt_dsk.c
+++ b/src/lib/formats/vt_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/vt_dsk.c
diff --git a/src/lib/formats/vt_dsk.h b/src/lib/formats/vt_dsk.h
index f0fecd2ec68..97f9b687c3b 100644
--- a/src/lib/formats/vt_dsk.h
+++ b/src/lib/formats/vt_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/vt_dsk.h
diff --git a/src/lib/formats/vtech1_dsk.c b/src/lib/formats/vtech1_dsk.c
index d7194224ebd..b50ac8a1092 100644
--- a/src/lib/formats/vtech1_dsk.c
+++ b/src/lib/formats/vtech1_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/vtech1_dsk.c
diff --git a/src/lib/formats/vtech1_dsk.h b/src/lib/formats/vtech1_dsk.h
index f85cc160af8..d9ccfa73479 100644
--- a/src/lib/formats/vtech1_dsk.h
+++ b/src/lib/formats/vtech1_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/vtech1_dsk.h
diff --git a/src/lib/formats/wavfile.c b/src/lib/formats/wavfile.c
index e332110fbff..8ffbe102058 100644
--- a/src/lib/formats/wavfile.c
+++ b/src/lib/formats/wavfile.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     wavfile.c
diff --git a/src/lib/formats/wavfile.h b/src/lib/formats/wavfile.h
index ab769de5537..0f7ea3c1f0a 100644
--- a/src/lib/formats/wavfile.h
+++ b/src/lib/formats/wavfile.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     wavfile.h
diff --git a/src/lib/formats/wd177x_dsk.h b/src/lib/formats/wd177x_dsk.h
index 20b42927bf0..657032b50c8 100644
--- a/src/lib/formats/wd177x_dsk.h
+++ b/src/lib/formats/wd177x_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/wd177x_sk.h
diff --git a/src/lib/formats/x1_tap.c b/src/lib/formats/x1_tap.c
index 880037c8f3a..1b8f825dac3 100644
--- a/src/lib/formats/x1_tap.c
+++ b/src/lib/formats/x1_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *
  *   Sharp X1 TAP image format
diff --git a/src/lib/formats/x1_tap.h b/src/lib/formats/x1_tap.h
index 94d9a671fd8..018eff56aa0 100644
--- a/src/lib/formats/x1_tap.h
+++ b/src/lib/formats/x1_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *
  *   Sharp X1 TAP image format
diff --git a/src/lib/formats/xdf_dsk.h b/src/lib/formats/xdf_dsk.h
index 64e02732df9..5d460db2285 100644
--- a/src/lib/formats/xdf_dsk.h
+++ b/src/lib/formats/xdf_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/xdf_dsk.h
diff --git a/src/lib/formats/z80ne_dsk.c b/src/lib/formats/z80ne_dsk.c
index d399c1ac441..384338e3ff2 100644
--- a/src/lib/formats/z80ne_dsk.c
+++ b/src/lib/formats/z80ne_dsk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/z80ne_dsk.c
diff --git a/src/lib/formats/z80ne_dsk.h b/src/lib/formats/z80ne_dsk.h
index 9a3d0dee9b9..4294d75ec44 100644
--- a/src/lib/formats/z80ne_dsk.h
+++ b/src/lib/formats/z80ne_dsk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     formats/z80ne_dsk.h
diff --git a/src/lib/formats/zx81_p.c b/src/lib/formats/zx81_p.c
index e2e1e33f035..760539cea0c 100644
--- a/src/lib/formats/zx81_p.c
+++ b/src/lib/formats/zx81_p.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Taken from nocash ZX81 docs by Martin Korth.
diff --git a/src/lib/formats/zx81_p.h b/src/lib/formats/zx81_p.h
index 748f1ab8011..cb7276c7ac8 100644
--- a/src/lib/formats/zx81_p.h
+++ b/src/lib/formats/zx81_p.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     zx81_p.h
diff --git a/src/lib/util/chdcd.c b/src/lib/util/chdcd.c
index 992c95bfeae..8d3cd447db4 100644
--- a/src/lib/util/chdcd.c
+++ b/src/lib/util/chdcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TOC parser for CHD compression frontend
diff --git a/src/lib/util/chdcd.h b/src/lib/util/chdcd.h
index b0f3623ce61..a411a7999ab 100644
--- a/src/lib/util/chdcd.h
+++ b/src/lib/util/chdcd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     CDRDAO TOC parser for CHD compression frontend
diff --git a/src/lib/util/cstrpool.c b/src/lib/util/cstrpool.c
index ea5c637e4d4..f23e852bf3a 100644
--- a/src/lib/util/cstrpool.c
+++ b/src/lib/util/cstrpool.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cstrpool.c
diff --git a/src/lib/util/cstrpool.h b/src/lib/util/cstrpool.h
index 6058cc43ffb..2457ece879e 100644
--- a/src/lib/util/cstrpool.h
+++ b/src/lib/util/cstrpool.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     cstrpool.h
diff --git a/src/lib/util/md5.c b/src/lib/util/md5.c
index 55ca7c70c1f..1bb70a8f695 100644
--- a/src/lib/util/md5.c
+++ b/src/lib/util/md5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * This code implements the MD5 message-digest algorithm.
  * The algorithm is due to Ron Rivest.  This code was
diff --git a/src/lib/util/md5.h b/src/lib/util/md5.h
index 5270f1b4f95..62e4df4428b 100644
--- a/src/lib/util/md5.h
+++ b/src/lib/util/md5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * This is the header file for the MD5 message-digest algorithm.
  * The algorithm is due to Ron Rivest.  This code was
diff --git a/src/lib/util/opresolv.c b/src/lib/util/opresolv.c
index b7870842b08..b1e159b362e 100644
--- a/src/lib/util/opresolv.c
+++ b/src/lib/util/opresolv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     opresolv.h
diff --git a/src/lib/util/opresolv.h b/src/lib/util/opresolv.h
index da1389d2328..5a8d67a273c 100644
--- a/src/lib/util/opresolv.h
+++ b/src/lib/util/opresolv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     opresolv.h
diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index 0a3327d7fc0..2331b3d347f 100644
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* sha1.h
  *
  * The sha1 hash function.
diff --git a/src/lib/util/sha1.h b/src/lib/util/sha1.h
index dcec92e453d..e77a9c1fd10 100644
--- a/src/lib/util/sha1.h
+++ b/src/lib/util/sha1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* sha1.h
  *
  * The sha1 hash function.
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index e4433ac0fc4..d650b3d3132 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     zippath.c
diff --git a/src/lib/util/zippath.h b/src/lib/util/zippath.h
index ff79409f0e8..ad2e5048425 100644
--- a/src/lib/util/zippath.h
+++ b/src/lib/util/zippath.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     zippath.h
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 46b288009c4..ee5fc22d38c 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 8080bw.c *******************************************/
 
 #include "emu.h"
diff --git a/src/mame/audio/asteroid.c b/src/mame/audio/asteroid.c
index 0b013d9e09d..ee9be14aeed 100644
--- a/src/mame/audio/asteroid.c
+++ b/src/mame/audio/asteroid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * Asteroids Analog Sound system interface
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index 6fffe476509..eb6feb54665 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Astro Fighter hardware
diff --git a/src/mame/audio/atarifb.c b/src/mame/audio/atarifb.c
index bafc66ad786..328c17eca65 100644
--- a/src/mame/audio/atarifb.c
+++ b/src/mame/audio/atarifb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\atarifb.c
diff --git a/src/mame/audio/avalnche.c b/src/mame/audio/avalnche.c
index cd5725666ea..990c9a8b753 100644
--- a/src/mame/audio/avalnche.c
+++ b/src/mame/audio/avalnche.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\avalnche.c
diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c
index 1e9ec5f293e..2349a3fed86 100644
--- a/src/mame/audio/aztarac.c
+++ b/src/mame/audio/aztarac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Centuri Aztarac hardware
diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c
index 62e665b2fae..2d43801c55d 100644
--- a/src/mame/audio/beezer.c
+++ b/src/mame/audio/beezer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Beezer 6522+6840 audio hardware
diff --git a/src/mame/audio/blockade.c b/src/mame/audio/blockade.c
index 39571615f69..479a3bfa613 100644
--- a/src/mame/audio/blockade.c
+++ b/src/mame/audio/blockade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "includes/blockade.h"
diff --git a/src/mame/audio/bsktball.c b/src/mame/audio/bsktball.c
index 86137e3e767..e67b3c04b4a 100644
--- a/src/mame/audio/bsktball.c
+++ b/src/mame/audio/bsktball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\bsktball.c
diff --git a/src/mame/audio/bwidow.c b/src/mame/audio/bwidow.c
index b4963ec56bd..8de697b31a1 100644
--- a/src/mame/audio/bwidow.c
+++ b/src/mame/audio/bwidow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c
index 4b6f9057bc1..d3d21abfb12 100644
--- a/src/mame/audio/bzone.c
+++ b/src/mame/audio/bzone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Battlezone sound info, courtesy of Al Kossow:
diff --git a/src/mame/audio/canyon.c b/src/mame/audio/canyon.c
index 422dceaa5a0..08e7a554147 100644
--- a/src/mame/audio/canyon.c
+++ b/src/mame/audio/canyon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\canyon.c
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index 5e15afc4dca..b527135594c 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************/
 /*                                                                           */
 /*                    (C) Copyright       Peter J.C.Clare                    */
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index c2eb637d108..76e8545ec47 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cinematronics Cosmic Chasm hardware
diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c
index 2a7a19814c6..7205c5307ac 100644
--- a/src/mame/audio/cclimber.c
+++ b/src/mame/audio/cclimber.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/ay8910.h"
 #include "audio/cclimber.h"
diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c
index feaff0ed9df..508e4619c61 100644
--- a/src/mame/audio/circus.c
+++ b/src/mame/audio/circus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/samples.h"
 #include "includes/circus.h"
diff --git a/src/mame/audio/cliffhgr.c b/src/mame/audio/cliffhgr.c
index d7063ab1166..df51aa44f40 100644
--- a/src/mame/audio/cliffhgr.c
+++ b/src/mame/audio/cliffhgr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/audio/copsnrob.c b/src/mame/audio/copsnrob.c
index ef3b69d0576..d5386e9ab8c 100644
--- a/src/mame/audio/copsnrob.c
+++ b/src/mame/audio/copsnrob.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * copsnrob Sound System Analog emulation
  * Nov 2010, Derrick Renaud
diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c
index a5a97d48fdd..eb7b1c10114 100644
--- a/src/mame/audio/cps3.c
+++ b/src/mame/audio/cps3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Capcom CPS-3 Sound Hardware
diff --git a/src/mame/audio/cps3.h b/src/mame/audio/cps3.h
index 7964fff83a4..abb4428c4c1 100644
--- a/src/mame/audio/cps3.h
+++ b/src/mame/audio/cps3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Capcom CPS-3 Sound Hardware
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index 69728df122a..10ec3140161 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Crazy Balloon hardware
diff --git a/src/mame/audio/decobsmt.c b/src/mame/audio/decobsmt.c
index 6c4e252a615..45b0ac7a0fc 100644
--- a/src/mame/audio/decobsmt.c
+++ b/src/mame/audio/decobsmt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Data East Pinball BSMT2000 sound board
diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h
index 7bca00d1c20..3b3a4e52e3b 100644
--- a/src/mame/audio/decobsmt.h
+++ b/src/mame/audio/decobsmt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DECOBSMT_H__
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 393687f9fdb..61c753e3edc 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Depth Charge audio routines
  */
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 4680b3ac5e0..4d81627de05 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/nes_apu.h"
diff --git a/src/mame/audio/dragrace.c b/src/mame/audio/dragrace.c
index ed3d9dd7723..183f1c1811e 100644
--- a/src/mame/audio/dragrace.c
+++ b/src/mame/audio/dragrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\dragrace.c
diff --git a/src/mame/audio/dsbz80.c b/src/mame/audio/dsbz80.c
index f4a57abaca2..dff38bda980 100644
--- a/src/mame/audio/dsbz80.c
+++ b/src/mame/audio/dsbz80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sega Z80 Digital Sound Board
diff --git a/src/mame/audio/dsbz80.h b/src/mame/audio/dsbz80.h
index 5e9a2d222de..fb5a487f235 100644
--- a/src/mame/audio/dsbz80.h
+++ b/src/mame/audio/dsbz80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __DSBZ80_H__
diff --git a/src/mame/audio/firetrk.c b/src/mame/audio/firetrk.c
index 7b086a3c92b..d64b539fbc9 100644
--- a/src/mame/audio/firetrk.c
+++ b/src/mame/audio/firetrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\firetrk.c
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index 9896b556004..3ab2923a284 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Clarue Flower sound driver.
 Initial version was based on the Wiping sound driver, which was based on the old namco.c sound driver.
 
diff --git a/src/mame/audio/galaga.c b/src/mame/audio/galaga.c
index 8a6a93e99ee..887f629636b 100644
--- a/src/mame/audio/galaga.c
+++ b/src/mame/audio/galaga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     galaga.c
     Sound handler
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 15b0ba69bff..36a6c86ca70 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Galaxian-derived sound hardware
diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h
index 1217436580c..6a6f8f25252 100644
--- a/src/mame/audio/galaxian.h
+++ b/src/mame/audio/galaxian.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 #define GAL_AUDIO   "discrete"
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index f408afd010a..ab84daf034b 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /****************************************************************************
  *
  * geebee.c
diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c
index 8a7338fa69f..d34aabd6a53 100644
--- a/src/mame/audio/gomoku.c
+++ b/src/mame/audio/gomoku.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gomoku sound driver (quick hack of the Wiping sound driver)
diff --git a/src/mame/audio/gorf.c b/src/mame/audio/gorf.c
index 697ff2033ac..23a082cc8bb 100644
--- a/src/mame/audio/gorf.c
+++ b/src/mame/audio/gorf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
     Gorf/Votrax SC-01 Emulator
diff --git a/src/mame/audio/gotya.c b/src/mame/audio/gotya.c
index 63cbfcd10b1..565f88657b3 100644
--- a/src/mame/audio/gotya.c
+++ b/src/mame/audio/gotya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/samples.h"
 #include "includes/gotya.h"
diff --git a/src/mame/audio/grchamp.c b/src/mame/audio/grchamp.c
index 236ae9d447d..ab51dcd39dc 100644
--- a/src/mame/audio/grchamp.c
+++ b/src/mame/audio/grchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\grchamp.c
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index a1aafc76405..c629eb7f32c 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -17,19 +17,54 @@
 #define CYCLES_PER_BIO      (5000000 / BIO_FREQUENCY)
 
 
-/*************************************
- *
- *  Driver init
- *
- *************************************/
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
 
-void harddriv_state::hdsnd_init()
+//-------------------------------------------------
+//  harddriv_sound_board_device - constructor
+//-------------------------------------------------
+
+const device_type HARDDRIV_SOUND_BOARD_DEVICE = &device_creator<harddriv_sound_board_device>;
+
+harddriv_sound_board_device::harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, HARDDRIV_SOUND_BOARD_DEVICE, "Hard Drivin' Sound Board", tag, owner, clock, "harddriv_sound", __FILE__),
+	m_soundcpu(*this, "soundcpu"),
+	m_dac(*this, "dac"),
+	m_sounddsp(*this, "sounddsp"),
+	m_sounddsp_ram(*this, "sounddsp_ram"),
+	m_sound_rom(*this, "serialroms"),
+	m_soundflag(0),
+	m_mainflag(0),
+	m_sounddata(0),
+	m_maindata(0),
+	m_dacmute(0),
+	m_cramen(0),
+	m_irq68k(0),
+	m_sound_rom_offs(0),
+	m_last_bio_cycles(0)
 {
-	m_rombase = (UINT8 *)memregion("serialroms")->base();
-	m_romsize = memregion("serialroms")->bytes();
+	memset(m_comram, 0 , sizeof(m_comram));
 }
 
 
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void harddriv_sound_board_device::device_start()
+{
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void harddriv_sound_board_device::device_reset()
+{
+	m_last_bio_cycles = 0;
+	m_sounddsp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
+}
 
 /*************************************
  *
@@ -37,10 +72,10 @@ void harddriv_state::hdsnd_init()
  *
  *************************************/
 
-void harddriv_state::update_68k_interrupts()
+void harddriv_sound_board_device::update_68k_interrupts()
 {
-	if (m_soundcpu) m_soundcpu->set_input_line(1, m_mainflag ? ASSERT_LINE : CLEAR_LINE);
-	if (m_soundcpu) m_soundcpu->set_input_line(3, m_irq68k   ? ASSERT_LINE : CLEAR_LINE);
+	m_soundcpu->set_input_line(1, m_mainflag ? ASSERT_LINE : CLEAR_LINE);
+	m_soundcpu->set_input_line(3, m_irq68k   ? ASSERT_LINE : CLEAR_LINE);
 }
 
 
@@ -51,7 +86,7 @@ void harddriv_state::update_68k_interrupts()
  *
  *************************************/
 
-READ16_MEMBER(harddriv_state::hd68k_snd_data_r)
+READ16_MEMBER(harddriv_sound_board_device::hd68k_snd_data_r)
 {
 	m_soundflag = 0;
 	logerror("%06X:main read from sound=%04X\n", space.device().safe_pcbase(), m_sounddata);
@@ -59,13 +94,13 @@ READ16_MEMBER(harddriv_state::hd68k_snd_data_r)
 }
 
 
-READ16_MEMBER(harddriv_state::hd68k_snd_status_r)
+READ16_MEMBER(harddriv_sound_board_device::hd68k_snd_status_r)
 {
 	return (m_mainflag << 15) | (m_soundflag << 14) | 0x1fff;
 }
 
 
-TIMER_CALLBACK_MEMBER( harddriv_state::delayed_68k_w )
+TIMER_CALLBACK_MEMBER( harddriv_sound_board_device::delayed_68k_w )
 {
 	m_maindata = param;
 	m_mainflag = 1;
@@ -73,17 +108,17 @@ TIMER_CALLBACK_MEMBER( harddriv_state::delayed_68k_w )
 }
 
 
-WRITE16_MEMBER(harddriv_state::hd68k_snd_data_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hd68k_snd_data_w)
 {
-	machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::delayed_68k_w), this), data);
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_sound_board_device::delayed_68k_w), this), data);
 	logerror("%06X:main write to sound=%04X\n", space.device().safe_pcbase(), data);
 }
 
 
-WRITE16_MEMBER(harddriv_state::hd68k_snd_reset_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hd68k_snd_reset_w)
 {
-	if (m_soundcpu) m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	if (m_soundcpu) m_soundcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
+	m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	m_soundcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
 	m_mainflag = m_soundflag = 0;
 	update_68k_interrupts();
 	logerror("%06X:Reset sound\n", space.device().safe_pcbase());
@@ -97,7 +132,7 @@ WRITE16_MEMBER(harddriv_state::hd68k_snd_reset_w)
  *
  *************************************/
 
-READ16_MEMBER(harddriv_state::hdsnd68k_data_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_data_r)
 {
 	m_mainflag = 0;
 	update_68k_interrupts();
@@ -106,7 +141,7 @@ READ16_MEMBER(harddriv_state::hdsnd68k_data_r)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_data_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_data_w)
 {
 	COMBINE_DATA(&m_sounddata);
 	m_soundflag = 1;
@@ -121,21 +156,21 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_data_w)
  *
  *************************************/
 
-READ16_MEMBER(harddriv_state::hdsnd68k_switches_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_switches_r)
 {
 	logerror("%06X:hdsnd68k_switches_r(%04X)\n", space.device().safe_pcbase(), offset);
 	return 0;
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnd68k_320port_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_320port_r)
 {
 	logerror("%06X:hdsnd68k_320port_r(%04X)\n", space.device().safe_pcbase(), offset);
 	return 0;
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnd68k_status_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_status_r)
 {
 //FFFF 3000 R   READSTAT    Read Status
 //            D15 = 'Main Flag'
@@ -154,7 +189,7 @@ READ16_MEMBER(harddriv_state::hdsnd68k_status_r)
  *
  *************************************/
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_latches_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_latches_w)
 {
 	/* bit 3 selects the value; data is ignored */
 	data = (offset >> 3) & 1;
@@ -185,8 +220,7 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_latches_w)
 
 		case 4: /* RES320 */
 			logerror("%06X:RES320=%d\n", space.device().safe_pcbase(), data);
-			if (m_sounddsp != NULL)
-				m_sounddsp->set_input_line(INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE);
+			m_sounddsp->set_input_line(INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE);
 			break;
 
 		case 7: /* LED */
@@ -195,13 +229,13 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_latches_w)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_speech_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_speech_w)
 {
 	logerror("%06X:hdsnd68k_speech_w(%04X)=%04X\n", space.device().safe_pcbase(), offset, data);
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_irqclr_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_irqclr_w)
 {
 	m_irq68k = 0;
 	update_68k_interrupts();
@@ -215,31 +249,31 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_irqclr_w)
  *
  *************************************/
 
-READ16_MEMBER(harddriv_state::hdsnd68k_320ram_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_320ram_r)
 {
 	return m_sounddsp_ram[offset & 0xfff];
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_320ram_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_320ram_w)
 {
 	COMBINE_DATA(&m_sounddsp_ram[offset & 0xfff]);
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnd68k_320ports_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_320ports_r)
 {
 	return m_sounddsp->space(AS_IO).read_word((offset & 7) << 1);
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_320ports_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_320ports_w)
 {
-	if (m_sounddsp) m_sounddsp->space(AS_IO).write_word((offset & 7) << 1, data);
+	m_sounddsp->space(AS_IO).write_word((offset & 7) << 1, data);
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnd68k_320com_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnd68k_320com_r)
 {
 	if (m_cramen)
 		return m_comram[offset & 0x1ff];
@@ -249,7 +283,7 @@ READ16_MEMBER(harddriv_state::hdsnd68k_320com_r)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnd68k_320com_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnd68k_320com_w)
 {
 	if (m_cramen)
 		COMBINE_DATA(&m_comram[offset & 0x1ff]);
@@ -265,7 +299,7 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_320com_w)
  *
  *************************************/
 
-READ16_MEMBER(harddriv_state::hdsnddsp_get_bio)
+READ16_MEMBER(harddriv_sound_board_device::hdsnddsp_get_bio)
 {
 	UINT64 cycles_since_last_bio = m_sounddsp->total_cycles() - m_last_bio_cycles;
 	INT32 cycles_until_bio = CYCLES_PER_BIO - cycles_since_last_bio;
@@ -289,7 +323,7 @@ READ16_MEMBER(harddriv_state::hdsnddsp_get_bio)
  *
  *************************************/
 
-WRITE16_MEMBER(harddriv_state::hdsnddsp_dac_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnddsp_dac_w)
 {
 	/* DAC L */
 	if (!m_dacmute)
@@ -297,14 +331,14 @@ WRITE16_MEMBER(harddriv_state::hdsnddsp_dac_w)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnddsp_comport_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnddsp_comport_w)
 {
 	/* COM port TD0-7 */
 	logerror("%06X:hdsnddsp_comport_w=%d\n", space.device().safe_pcbase(), data);
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnddsp_mute_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnddsp_mute_w)
 {
 	/* mute DAC audio, D0=1 */
 /*  m_dacmute = data & 1;     -- NOT STUFFED */
@@ -312,7 +346,7 @@ WRITE16_MEMBER(harddriv_state::hdsnddsp_mute_w)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnddsp_gen68kirq_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnddsp_gen68kirq_w)
 {
 	/* generate 68k IRQ */
 	m_irq68k = 1;
@@ -320,7 +354,7 @@ WRITE16_MEMBER(harddriv_state::hdsnddsp_gen68kirq_w)
 }
 
 
-WRITE16_MEMBER(harddriv_state::hdsnddsp_soundaddr_w)
+WRITE16_MEMBER(harddriv_sound_board_device::hdsnddsp_soundaddr_w)
 {
 	if (offset == 0)
 	{
@@ -335,23 +369,86 @@ WRITE16_MEMBER(harddriv_state::hdsnddsp_soundaddr_w)
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnddsp_rom_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnddsp_rom_r)
 {
-	if (m_sound_rom_offs < m_romsize)
-		return m_rombase[m_sound_rom_offs++] << 7;
+	if (m_sound_rom_offs < m_sound_rom.length())
+		return m_sound_rom[m_sound_rom_offs++] << 7;
 	m_sound_rom_offs++;
 	return 0;
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnddsp_comram_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnddsp_comram_r)
 {
 	return m_comram[m_sound_rom_offs++ & 0x1ff];
 }
 
 
-READ16_MEMBER(harddriv_state::hdsnddsp_compare_r)
+READ16_MEMBER(harddriv_sound_board_device::hdsnddsp_compare_r)
 {
 	logerror("%06X:hdsnddsp_compare_r(%04X)\n", space.device().safe_pcbase(), offset);
 	return 0;
 }
+
+static ADDRESS_MAP_START( driversnd_68k_map, AS_PROGRAM, 16, harddriv_sound_board_device )
+	ADDRESS_MAP_UNMAP_HIGH
+	AM_RANGE(0x000000, 0x01ffff) AM_ROM
+	AM_RANGE(0xff0000, 0xff0fff) AM_READWRITE(hdsnd68k_data_r, hdsnd68k_data_w)
+	AM_RANGE(0xff1000, 0xff1fff) AM_READWRITE(hdsnd68k_switches_r, hdsnd68k_latches_w)
+	AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(hdsnd68k_320port_r, hdsnd68k_speech_w)
+	AM_RANGE(0xff3000, 0xff3fff) AM_READWRITE(hdsnd68k_status_r, hdsnd68k_irqclr_w)
+	AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(hdsnd68k_320ram_r, hdsnd68k_320ram_w)
+	AM_RANGE(0xff6000, 0xff7fff) AM_READWRITE(hdsnd68k_320ports_r, hdsnd68k_320ports_w)
+	AM_RANGE(0xff8000, 0xffbfff) AM_READWRITE(hdsnd68k_320com_r, hdsnd68k_320com_w)
+	AM_RANGE(0xffc000, 0xffffff) AM_RAM
+ADDRESS_MAP_END
+
+
+static ADDRESS_MAP_START( driversnd_dsp_program_map, AS_PROGRAM, 16, harddriv_sound_board_device )
+	ADDRESS_MAP_UNMAP_HIGH
+	AM_RANGE(0x000, 0xfff) AM_RAM AM_SHARE("sounddsp_ram")
+ADDRESS_MAP_END
+
+
+/* $000 - 08F  TMS32010 Internal Data RAM in Data Address Space */
+
+static ADDRESS_MAP_START( driversnd_dsp_io_map, AS_IO, 16, harddriv_sound_board_device )
+	AM_RANGE(0, 0) AM_READWRITE(hdsnddsp_rom_r, hdsnddsp_dac_w)
+	AM_RANGE(1, 1) AM_READ(hdsnddsp_comram_r)
+	AM_RANGE(2, 2) AM_READ(hdsnddsp_compare_r)
+	AM_RANGE(1, 2) AM_WRITENOP
+	AM_RANGE(3, 3) AM_WRITE(hdsnddsp_comport_w)
+	AM_RANGE(4, 4) AM_WRITE(hdsnddsp_mute_w)
+	AM_RANGE(5, 5) AM_WRITE(hdsnddsp_gen68kirq_w)
+	AM_RANGE(6, 7) AM_WRITE(hdsnddsp_soundaddr_w)
+	AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(hdsnddsp_get_bio)
+ADDRESS_MAP_END
+
+
+static MACHINE_CONFIG_FRAGMENT( harddriv_snd )
+
+	/* basic machine hardware */
+	MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2)
+	MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
+
+	MCFG_CPU_ADD("sounddsp", TMS32010, XTAL_20MHz)
+	MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
+	/* Data Map is internal to the CPU */
+	MCFG_CPU_IO_MAP(driversnd_dsp_io_map)
+
+	/* sound hardware */
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+
+	MCFG_DAC_ADD("dac")
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+MACHINE_CONFIG_END
+
+//-------------------------------------------------
+//  machine_config_additions - device-specific
+//  machine configurations
+//-------------------------------------------------
+
+machine_config_constructor harddriv_sound_board_device::device_mconfig_additions() const
+{
+	return MACHINE_CONFIG_NAME( harddriv_snd );
+}
diff --git a/src/mame/audio/hng64.c b/src/mame/audio/hng64.c
index b2ce91fe6ef..1bdbb331cda 100644
--- a/src/mame/audio/hng64.c
+++ b/src/mame/audio/hng64.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hyper NeoGeo 64 Audio */
 
 // uses a V53A ( == V33A with extra peripherals eg. DMA, Timers, MMU giving virtual 24-bit address space etc.)
diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c
index 7e5dff3c66b..5c01b10f000 100644
--- a/src/mame/audio/hyprolyb.c
+++ b/src/mame/audio/hyprolyb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6800/m6800.h"
 #include "audio/hyprolyb.h"
diff --git a/src/mame/audio/hyprolyb.h b/src/mame/audio/hyprolyb.h
index 33e61372c78..2a8c66e1777 100644
--- a/src/mame/audio/hyprolyb.h
+++ b/src/mame/audio/hyprolyb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class hyprolyb_adpcm_device : public device_t,
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index 2f8a4c21916..0998ecc9054 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Invinco sound routines
  */
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 78e67dfd85a..be7380cb695 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M52/M62 sound hardware
diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h
index 12e3b871191..625b32ab049 100644
--- a/src/mame/audio/irem.h
+++ b/src/mame/audio/irem.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index 6466a0ae0d6..26d8381e5ce 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Return of the Jedi hardware
diff --git a/src/mame/audio/laserbat.c b/src/mame/audio/laserbat.c
index 4d7a708a42e..96c904246b7 100644
--- a/src/mame/audio/laserbat.c
+++ b/src/mame/audio/laserbat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/tms3615.h"
 #include "includes/laserbat.h"
diff --git a/src/mame/audio/llander.c b/src/mame/audio/llander.c
index bb8286a300b..432ab873a2e 100644
--- a/src/mame/audio/llander.c
+++ b/src/mame/audio/llander.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Lunar Lander Specific Sound Code
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 701b1d04277..5166d66cceb 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 IREM "M72" sound hardware
diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h
index 10782d6d717..0fc019e64cf 100644
--- a/src/mame/audio/m72.h
+++ b/src/mame/audio/m72.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     M72 audio interface
diff --git a/src/mame/audio/m79amb.c b/src/mame/audio/m79amb.c
index f4ef2ddabf9..c6cd061866e 100644
--- a/src/mame/audio/m79amb.c
+++ b/src/mame/audio/m79amb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * m79amb Sound System Analog emulation
  * Nov 2008, Derrick Renaud
diff --git a/src/mame/audio/madalien.c b/src/mame/audio/madalien.c
index c64180a17d4..6ef708a5bbc 100644
--- a/src/mame/audio/madalien.c
+++ b/src/mame/audio/madalien.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * madalien Sound System Analog emulation
  * Aug 2008, Derrick Renaud
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 28afa60ede3..104b47b69b2 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/audio/meadows.c b/src/mame/audio/meadows.c
index e503fd11bf2..6899b696f79 100644
--- a/src/mame/audio/meadows.c
+++ b/src/mame/audio/meadows.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     meadows.c
     Sound handler
diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c
index 59a9d67dedc..4ade8f973c7 100644
--- a/src/mame/audio/micro3d.c
+++ b/src/mame/audio/micro3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microprose sound hardware
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index bb4973ab5d9..50a3fab8ef8 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index c1ae5765161..4ffeaeb0d95 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo 8080 sound emulation
diff --git a/src/mame/audio/nitedrvr.c b/src/mame/audio/nitedrvr.c
index 0ebd0a5c5de..468474de7b2 100644
--- a/src/mame/audio/nitedrvr.c
+++ b/src/mame/audio/nitedrvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\nitedrvr.c
diff --git a/src/mame/audio/norautp.c b/src/mame/audio/norautp.c
index 1545739ff97..f8da0115510 100644
--- a/src/mame/audio/norautp.c
+++ b/src/mame/audio/norautp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * Noraut/Kimble/Kramer Poker Sound System Analog emulation
  * Sept 2009, Derrick Renaud & Roberto Fresca.
diff --git a/src/mame/audio/orbit.c b/src/mame/audio/orbit.c
index f9ddc775f28..fefb9cb83da 100644
--- a/src/mame/audio/orbit.c
+++ b/src/mame/audio/orbit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\orbit.c
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index 4f9833a2f75..89709e1d9a2 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /****************************************************************************
  *
  * Phoenix sound hardware simulation - still very ALPHA!
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index 4bbaaf5ce3a..19c5d694774 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /****************************************************************************
  *
  * Sound hardware for Pleiades, Naughty Boy and Pop Flamer.
diff --git a/src/mame/audio/pleiads.h b/src/mame/audio/pleiads.h
index 4fc9b75bdf4..a1ddb679e4f 100644
--- a/src/mame/audio/pleiads.h
+++ b/src/mame/audio/pleiads.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/tms36xx.h"
 
 struct pl_t_state
diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c
index 3b97a06e5cb..e83ac6cf58a 100644
--- a/src/mame/audio/polepos.c
+++ b/src/mame/audio/polepos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     polepos.c
     Sound handler
diff --git a/src/mame/audio/polyplay.c b/src/mame/audio/polyplay.c
index 6149e81d441..3adcc890069 100644
--- a/src/mame/audio/polyplay.c
+++ b/src/mame/audio/polyplay.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Poly-Play
diff --git a/src/mame/audio/poolshrk.c b/src/mame/audio/poolshrk.c
index 9eaaf16c2d5..d60663bdd0d 100644
--- a/src/mame/audio/poolshrk.c
+++ b/src/mame/audio/poolshrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\poolshrk.c
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index b3ee4c64d9a..492a7eefe77 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Pulsar sound routines
  *
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 1f6f2da03b5..6ff9e093126 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\qix.c
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index a66547dbd52..e779d210db4 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem Red Alert hardware
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 09682515160..6387e80a44d 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Red Baron sound hardware
diff --git a/src/mame/audio/redbaron.h b/src/mame/audio/redbaron.h
index 35d90b70bcc..9ce9d8ee3b2 100644
--- a/src/mame/audio/redbaron.h
+++ b/src/mame/audio/redbaron.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/mame/audio/s11c_bg.c b/src/mame/audio/s11c_bg.c
index b568a4f14f9..b340fb1783e 100644
--- a/src/mame/audio/s11c_bg.c
+++ b/src/mame/audio/s11c_bg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * s11c_bg.c - Williams System 11C background music (M68B09E + YM2151 + HC55516 + DAC)
  *
diff --git a/src/mame/audio/s11c_bg.h b/src/mame/audio/s11c_bg.h
index 97d69b03559..f0a1ced41d5 100644
--- a/src/mame/audio/s11c_bg.h
+++ b/src/mame/audio/s11c_bg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * s11c_bg.h - Williams System 11C background sound (M68B09E + YM2151 + HC55516 + DAC)
  *
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 3ad2c49e42e..b7e870a36d8 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   This file contains functions to emulate the sound hardware found on
diff --git a/src/mame/audio/segag80v.c b/src/mame/audio/segag80v.c
index 7a54bf72602..20815b9e45c 100644
--- a/src/mame/audio/segag80v.c
+++ b/src/mame/audio/segag80v.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Sega vector hardware
diff --git a/src/mame/audio/segam1audio.c b/src/mame/audio/segam1audio.c
index 2a993ee2dfe..64631b29d59 100644
--- a/src/mame/audio/segam1audio.c
+++ b/src/mame/audio/segam1audio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sega Model 1 sound board (68000 + 2x 315-5560 "MultiPCM")
diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h
index 1146324c62e..c32c4b6c1dd 100644
--- a/src/mame/audio/segam1audio.h
+++ b/src/mame/audio/segam1audio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __SEGAM1AUDIO_H__
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 968c4b4fc3d..b4d28cf510b 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Seibu Sound System v1.02, designed 1986 by Seibu Kaihatsu
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index a59c25a13c3..eb0660d7418 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Seibu Sound System v1.02, games using this include:
diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c
index e1bb850ef11..0083745ec68 100644
--- a/src/mame/audio/senjyo.c
+++ b/src/mame/audio/senjyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/senjyo.h"
 
diff --git a/src/mame/audio/skydiver.c b/src/mame/audio/skydiver.c
index a7d24349660..42ba9f1b846 100644
--- a/src/mame/audio/skydiver.c
+++ b/src/mame/audio/skydiver.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\skydiver.c
diff --git a/src/mame/audio/skyraid.c b/src/mame/audio/skyraid.c
index 2f2821d2e88..73832d39a28 100644
--- a/src/mame/audio/skyraid.c
+++ b/src/mame/audio/skyraid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * skyraid Sound System Analog emulation
  * Sept 2009, Derrick Renaud
diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c
index 89f305c2bcd..4bb2ac84faa 100644
--- a/src/mame/audio/snes_snd.c
+++ b/src/mame/audio/snes_snd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   snes_snd.c
diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h
index 54299d4ff38..bfd3e7410f8 100644
--- a/src/mame/audio/snes_snd.h
+++ b/src/mame/audio/snes_snd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * audio/snes_spc.h
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index c43e9aa4911..bf305a217c0 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* from Andrew Scott (ascott@utkux.utcc.utk.edu) */
 
 /*
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index f2bf09291f4..693a1d2fef7 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Space Firebird hardware
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index a6252d249a1..24cccfab698 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sigma Spiders hardware
diff --git a/src/mame/audio/sprint2.c b/src/mame/audio/sprint2.c
index fb031f21698..2fa39c05773 100644
--- a/src/mame/audio/sprint2.c
+++ b/src/mame/audio/sprint2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\sprint2.c
diff --git a/src/mame/audio/sprint4.c b/src/mame/audio/sprint4.c
index 756c752f3c2..45da34ff8c5 100644
--- a/src/mame/audio/sprint4.c
+++ b/src/mame/audio/sprint4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\sprint4.c
diff --git a/src/mame/audio/sprint4.h b/src/mame/audio/sprint4.h
index 4e3a862f28c..afc3b92ad71 100644
--- a/src/mame/audio/sprint4.h
+++ b/src/mame/audio/sprint4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sprint 4 + Ultra Tank Audio
diff --git a/src/mame/audio/sprint8.c b/src/mame/audio/sprint8.c
index 39b1b872697..0f09a65d2c1 100644
--- a/src/mame/audio/sprint8.c
+++ b/src/mame/audio/sprint8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * sprint8 Sound System Analog emulation
  * Sept 2009, Derrick Renaud
diff --git a/src/mame/audio/starshp1.c b/src/mame/audio/starshp1.c
index 7d55483f926..ad301d0b038 100644
--- a/src/mame/audio/starshp1.c
+++ b/src/mame/audio/starshp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  * starshp1 Sound System Analog emulation
  * Aug 2008, Derrick Renaud
diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c
index 2f8d6e4c22e..8b6e7d94d87 100644
--- a/src/mame/audio/starwars.c
+++ b/src/mame/audio/starwars.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Star Wars hardware
diff --git a/src/mame/audio/subs.c b/src/mame/audio/subs.c
index b4511bc6430..d8b9e3ecc16 100644
--- a/src/mame/audio/subs.c
+++ b/src/mame/audio/subs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\subs.c
diff --git a/src/mame/audio/suna8.c b/src/mame/audio/suna8.c
index 48d5ae67229..b138e4b7ef0 100644
--- a/src/mame/audio/suna8.c
+++ b/src/mame/audio/suna8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SunA 8 Bit Games samples
 
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index 1394966a4ed..9954ac0024f 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Toshiba T5182 die map, by Jonathan Gevaryahu AKA Lord Nightmare,
diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h
index 6def6027e7a..7bc817c1bc3 100644
--- a/src/mame/audio/t5182.h
+++ b/src/mame/audio/t5182.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/2151intf.h"
 #include "cpu/z80/z80.h"
 
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index efbd79aa5b0..162e2326a2f 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Ensoniq ES5505-based sound hardware
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index b52f77b6495..a5598e96f62 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Ensoniq ES5505-based sound hardware
diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c
index 1364a84509c..919448c4d59 100644
--- a/src/mame/audio/taito_zm.c
+++ b/src/mame/audio/taito_zm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Zoom ZSG-2 sound board
diff --git a/src/mame/audio/taito_zm.h b/src/mame/audio/taito_zm.h
index fcd3c1d667e..9b9106628e2 100644
--- a/src/mame/audio/taito_zm.h
+++ b/src/mame/audio/taito_zm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Zoom ZSG-2 sound board
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 2923f265b15..717cd1f75d6 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************
 
     Taito TC0140SYT
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index fbe35f795ba..7c1792f5110 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TAITOSND_H__
 #define __TAITOSND_H__
 
diff --git a/src/mame/audio/tank8.c b/src/mame/audio/tank8.c
index eb49a59f431..f79f6a8a89b 100644
--- a/src/mame/audio/tank8.c
+++ b/src/mame/audio/tank8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\tank8.c
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 4988000b5bc..536bb65b936 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Targ hardware
diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c
index 5cca16190dc..59762e442f7 100644
--- a/src/mame/audio/tiamc1.c
+++ b/src/mame/audio/tiamc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   TIA-MC1 sound hardware
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index b42dc256714..20c99405d7e 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     This code is used by the following module:
diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h
index 4df9334db49..6c82d9b606d 100644
--- a/src/mame/audio/timeplt.h
+++ b/src/mame/audio/timeplt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/flt_rc.h"
diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c
index ca801babaa6..026c3743b46 100644
--- a/src/mame/audio/trackfld.c
+++ b/src/mame/audio/trackfld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/sn76496.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/audio/trackfld.h b/src/mame/audio/trackfld.h
index 4593e2ad37b..370bb32caa8 100644
--- a/src/mame/audio/trackfld.h
+++ b/src/mame/audio/trackfld.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/vlm5030.h"
 #include "cpu/m6800/m6800.h"
 
diff --git a/src/mame/audio/triplhnt.c b/src/mame/audio/triplhnt.c
index 63c77b1dcd3..5f0c92dec23 100644
--- a/src/mame/audio/triplhnt.c
+++ b/src/mame/audio/triplhnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\triplhnt.c
diff --git a/src/mame/audio/turrett.c b/src/mame/audio/turrett.c
index a93b2f1df52..1ba684da6e5 100644
--- a/src/mame/audio/turrett.c
+++ b/src/mame/audio/turrett.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Turret Tower sound hardware
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index df2bfd5a061..94efa77d750 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatsumi TX-1/Buggy Boy sound hardware
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index 7c090357d9f..f3f5a3b7055 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     VIC Dual Game board
diff --git a/src/mame/audio/videopin.c b/src/mame/audio/videopin.c
index 0a19ee13107..27de66b5fcd 100644
--- a/src/mame/audio/videopin.c
+++ b/src/mame/audio/videopin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     audio\videopin.c
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index 1bf9d87f397..8f2130fb4a2 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /****************************************************************************
  *
  * warpwarp.c
diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h
index dcfd2726c0d..a87f4a3c48b 100644
--- a/src/mame/audio/warpwarp.h
+++ b/src/mame/audio/warpwarp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class geebee_sound_device : public device_t,
 									public device_sound_interface
 {
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 307134b212c..a5a4f6e3a1b 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Wiping sound driver (quick hack of the Namco sound driver)
diff --git a/src/mame/audio/wiping.h b/src/mame/audio/wiping.h
index 7be62108cd4..ca23a82ea01 100644
--- a/src/mame/audio/wiping.h
+++ b/src/mame/audio/wiping.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 8 voices max */
 #define MAX_VOICES 8
 
diff --git a/src/mame/audio/wow.c b/src/mame/audio/wow.c
index ad75d728e3d..35fa98cb025 100644
--- a/src/mame/audio/wow.c
+++ b/src/mame/audio/wow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
     WOW/Votrax SC-01 Emulator
diff --git a/src/mame/audio/wpcsnd.c b/src/mame/audio/wpcsnd.c
index a05afb14c01..badc5719b1f 100644
--- a/src/mame/audio/wpcsnd.c
+++ b/src/mame/audio/wpcsnd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wpcsnd.c - Williams WPC pinball sound
  *   M6809E + YM2151 + HC55516 + DAC
diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h
index 6b502b908da..732d74e3d12 100644
--- a/src/mame/audio/wpcsnd.h
+++ b/src/mame/audio/wpcsnd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wpcsnd.h - Williams WPC pinball sound
  *
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index d9e82877c45..8de9fc5f4f9 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Zaxxon hardware
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 6bdeac14f3a..480ed216b00 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 1942
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 119cdf1b7cc..0e5567db434 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     1943: The Battle of Midway
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index c7952fd91b4..4fa78b4f458 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 1945 K-3 driver
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 2f8995ed323..716999b50af 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pacman - 25th Anniversary Edition
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index a28e727bb90..ebd4b7bbdaf 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * 39in1.c - bootleg MAME-based "39-in-1" arcade PCB
diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c
index 7ab6dfe5504..a77d9b38ce8 100644
--- a/src/mame/drivers/3x3puzzl.c
+++ b/src/mame/drivers/3x3puzzl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 3x3 Puzzle
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 1cc9d4f0b3f..57ebc89ca7e 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Forty-Love (c) Taito 1984
diff --git a/src/mame/drivers/4enlinea.c b/src/mame/drivers/4enlinea.c
index 7090edd3f59..f74ad1e6269 100644
--- a/src/mame/drivers/4enlinea.c
+++ b/src/mame/drivers/4enlinea.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Cuatro en Linea.
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 58d0911683f..09e6a624cd2 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   IDSA 4 En Raya.
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index 00fe7dc63dd..6c6206c1c79 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     FOUR ROSES.
diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c
index dbf5dd4710e..c6234b7d559 100644
--- a/src/mame/drivers/5clown.c
+++ b/src/mame/drivers/5clown.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 41e4752b6f5..8336385a9fb 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 88 Games (c) 1988 Konami
diff --git a/src/mame/drivers/a1supply.c b/src/mame/drivers/a1supply.c
index 0954f2981ca..9b9a1843b5f 100644
--- a/src/mame/drivers/a1supply.c
+++ b/src/mame/drivers/a1supply.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  A-1 Supply discrete hardware games
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 6538cc4d284..e53f5c49933 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Ace by Allied Leisure
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index b259484c66f..059c3488eef 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ace Video Fruit Machine hardware
diff --git a/src/mame/drivers/aces1.c b/src/mame/drivers/aces1.c
index 7c4744ac428..026189ccb9c 100644
--- a/src/mame/drivers/aces1.c
+++ b/src/mame/drivers/aces1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Ace System 1 Hardware
  Fruit Machines
diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c
index 7d413dd8dfd..be002af3271 100644
--- a/src/mame/drivers/acesp.c
+++ b/src/mame/drivers/acesp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  sp.ACE system by ACE
  based roughly on the Mach2000 hardware used by Castle
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index f19e0330a9b..7128fc1e448 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Act Fancer (Japan)              FD (c) 1989 Data East Corporation
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 7ed941ecb33..a988db42519 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 ADP (Merkur?) games from '90 running on similar hardware.
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 77be1977be8..c5623b1b1ba 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Formation Z / Aeroboto
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 8c47fbb323a..e00b3aa619c 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Various Video System Co. games using the C7-01 GGA, VS8803, VS8904, VS8905
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index e5aa4c28840..957e8fedc54 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                                 Air Buster
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 86fdbe0c01a..f6d7b4038ea 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     "AJAX/Typhoon"  (Konami GX770)
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 6ba972d9c41..40a09f473a3 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hanaroku - Alba ZC HW */
 
 /*
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index c34ce631a80..29b7c453c54 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 'Aleck64' and similar boards */
 /* N64 based hardware */
 /*
@@ -195,7 +197,7 @@ private:
 };
 
 
-WRITE32_MEMBER(aleck64_state::aleck_dips_w )
+WRITE32_MEMBER(aleck64_state::aleck_dips_w)
 {
 	/*
 	    mtetrisc uses offset 0x1c and 0x03 a good bit in conjunction with reading INMJ.
@@ -215,44 +217,42 @@ WRITE32_MEMBER(aleck64_state::aleck_dips_w )
 	}
 }
 
-READ32_MEMBER(aleck64_state::aleck_dips_r )
+READ32_MEMBER(aleck64_state::aleck_dips_r)
 {
 	// srmvs uses 0x40, communications?
 
 	switch( offset )
 	{
-		case 0:
-			return (ioport("IN0")->read());   /* mtetrisc has regular inputs here */
-		case 1:
-			return (ioport("IN1")->read());
-		case 2:
+	case 0:
+		return (ioport("IN0")->read());   /* mtetrisc has regular inputs here */
+	case 1:
+		return (ioport("IN1")->read());
+	case 2:
 		{
-			UINT32 val = ioport("INMJ")->read();
+			UINT32 const val = ioport("INMJ")->read();
 
 			switch( m_dip_read_offset >> 8 & 0xff )
 			{
-				case 1:
-					return  val;
+			case 1:
+				return  val;
 
-				case 2:
-					return val << 8;
+			case 2:
+				return val << 8;
 
-				case 4:
-					return val << 16;
+			case 4:
+				return val << 16;
 
-				case 8:
-					return val >> 8;
+			case 8:
+				return val >> 8;
 
-				default:
-					logerror("Unexpected read from INMJ with no dip_read_offset set.\n");
-					return 0;
+			default:
+				logerror("Unexpected read from INMJ with no dip_read_offset set.\n");
+				return 0;
 			}
 		}
-		default:
-		{
-			logerror("Unknown aleck_dips_r(0x%08x, 0x%08x) @ 0x%08x PC=%08x\n", offset, 0xc0800000 + offset*4, mem_mask, space.device().safe_pc());
-			return 0;
-		}
+	default:
+		logerror("Unknown aleck_dips_r(0x%08x, 0x%08x) @ 0x%08x PC=%08x\n", offset, 0xc0800000 + offset*4, mem_mask, space.device().safe_pc());
+		return 0;
 	}
 }
 
@@ -505,6 +505,8 @@ static INPUT_PORTS_START( mtetrisc )
 	PORT_START("input")
 	PORT_BIT( 0xff, 0x00, IPT_SPECIAL )
 
+	PORT_START("INMJ")
+
 	PORT_START("IN0")
 	PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_START2 )
@@ -686,6 +688,8 @@ static INPUT_PORTS_START( twrshaft )
 	PORT_START("input")
 	PORT_BIT( 0xff, 0x00, IPT_SPECIAL ) // Disable standard N64 controls
 
+	PORT_START("INMJ")
+
 	PORT_START("IN0")
 	PORT_BIT(0xff7fffe0, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/aleisttl.c b/src/mame/drivers/aleisttl.c
index 61b01b61447..b7db84d75af 100644
--- a/src/mame/drivers/aleisttl.c
+++ b/src/mame/drivers/aleisttl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Allied Leisure discrete hardware games
diff --git a/src/mame/drivers/alien.c b/src/mame/drivers/alien.c
index 29fd48a8e2c..dcef79da022 100644
--- a/src/mame/drivers/alien.c
+++ b/src/mame/drivers/alien.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     Alien: The Arcade Medal Edition (c) 2005 Capcom
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 541107befd7..cea01671a95 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Aliens (c) 1990 Konami Co. Ltd
diff --git a/src/mame/drivers/alinvade.c b/src/mame/drivers/alinvade.c
index 7f7a987487c..72707ca4c14 100644
--- a/src/mame/drivers/alinvade.c
+++ b/src/mame/drivers/alinvade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  tiny bartop b&w Space Invaders type game with colour overlay
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d65198bbc68..6588b155af5 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SNK/Alpha 68000 based games:
diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c
index dfbb3c39a34..a12992c7796 100644
--- a/src/mame/drivers/alvg.c
+++ b/src/mame/drivers/alvg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/m6502/m65c02.h"
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index f6959e1faa4..5fdf729de10 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
   AMA-8000-1 / AMA-8000-2 Multi Game System.
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 3ac2b861ee5..93dccc64b83 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ambush Memory Map (preliminary)
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index c4a76ced02d..1140cf14162 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************************
 
 
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 3fd48383eb8..9c947b58e0a 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= American Speedway =-
diff --git a/src/mame/drivers/amusco.c b/src/mame/drivers/amusco.c
index 894480d2c8b..789d843881e 100644
--- a/src/mame/drivers/amusco.c
+++ b/src/mame/drivers/amusco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   AMERICAN MUSIC POKER V1.4
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index dd9ea07423b..0de9bbc362d 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Angel Kids / Space Position hardware driver
 
  driver by David Haywood
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index cfa7f100b0c..ce53c47fa46 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Appoooh memory map (preliminary)
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 30bc254dda5..8b7e2d2916d 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Aquarium (c)1996 Excellent Systems */
 
 /* the hardware is similar to gcpinbal.c, probably should merge it at some point */
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 0ddde8616db..d20d3d93963 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sun Electronics Arabian hardware
diff --git a/src/mame/drivers/arachnid.c b/src/mame/drivers/arachnid.c
index 06a78fe1e18..104567c0a7f 100644
--- a/src/mame/drivers/arachnid.c
+++ b/src/mame/drivers/arachnid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Arachnid - English Mark Darts
 
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index ff5961d653f..974ea2ca2a7 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Arcadia System - (c) 1988 Arcadia Systems
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 295b924d51d..5b9297a3103 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Argus (Early NMK driver 1986-1987)
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 80207b26d8a..4b38e2e5103 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Aristocrat MK5 / MKV hardware
diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c
index d893a9b91dd..784c2b59ea7 100644
--- a/src/mame/drivers/aristmk6.c
+++ b/src/mame/drivers/aristmk6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Aristocrat MK6 hardware
 
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 4c668b57101..6282cce579a 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Arkanoid driver
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index f5b9a304dc5..0e6d556f825 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
 Legion
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 34b67bdbf13..4df5c93427a 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Success Joe / Ashita no Joe [Wave]
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 30b0335d67a..af866493245 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Asterix
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index f6abe8e19f2..5873847a5f9 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Asteroids hardware
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 60f1528b176..77b0580698a 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Misc early Z80 games with simple color bitmap graphics
diff --git a/src/mame/drivers/astrafr.c b/src/mame/drivers/astrafr.c
index ea7d0b81999..253f8c96f58 100644
--- a/src/mame/drivers/astrafr.c
+++ b/src/mame/drivers/astrafr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Astra Fruit Machines
  -- Unknown 68340 based HW platform (seems related to pluto5.c?)
  -- dumps are of an unknown quality
diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c
index 3c02d436ebd..0c3993579fa 100644
--- a/src/mame/drivers/astrcorp.c
+++ b/src/mame/drivers/astrcorp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
                                             -= Astro Corp. CGA Hardware =-
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 3e4ffabfeff..f2c65ddaebb 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Bally Astrocade style games
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index ea7c9bd983e..fc4da22e01a 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Astro Fighter hardware
diff --git a/src/mame/drivers/astropc.c b/src/mame/drivers/astropc.c
index 22b673e2519..1aa9cb9c4ab 100644
--- a/src/mame/drivers/astropc.c
+++ b/src/mame/drivers/astropc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Astro Russian Fruit Machines
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index fa273b9e26d..16d2147eb98 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Asuka & Asuka  (+ Taito/Visco games on similar hardware)
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index fe6ca78c17e..58998e0d3fb 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Football hardware
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index a4b06b45a74..fb70d37335e 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari System IV hardware
diff --git a/src/mame/drivers/atarittl.c b/src/mame/drivers/atarittl.c
index ec2c3c6f790..2db9e2bf82b 100644
--- a/src/mame/drivers/atarittl.c
+++ b/src/mame/drivers/atarittl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Atari / Kee Games Driver - Discrete Games made in the 1970's
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index e7ce16b9ea0..7673c2af101 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Tetris hardware
diff --git a/src/mame/drivers/atlantis.c b/src/mame/drivers/atlantis.c
index c7b9c6c8e43..f6a8b458e4d 100644
--- a/src/mame/drivers/atlantis.c
+++ b/src/mame/drivers/atlantis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway "Atlantis" hardware
diff --git a/src/mame/drivers/atronic.c b/src/mame/drivers/atronic.c
index 20936031d81..181f2e8db72 100644
--- a/src/mame/drivers/atronic.c
+++ b/src/mame/drivers/atronic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Atronic Russian Video Fruit Machines */
 /*
  From 1999? (documentation is dated August 99)
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 1e0186db9a6..a787d11e912 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************
 Attack ufo / Ryoto Electric Co. 1980(?)
  driver  by Tomasz Slanina
diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c
index ab604e4419c..c5f88a9324d 100644
--- a/src/mame/drivers/atvtrack.c
+++ b/src/mame/drivers/atvtrack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   ATV Track
   (c)2002 Gaelco
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 3bd25fc6583..a0a62624f9f 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Avalanche hardware
diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c
index ad595f2aec8..5dae5ec131e 100644
--- a/src/mame/drivers/avt.c
+++ b/src/mame/drivers/avt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************
 
   AVT - ADVANCED VIDEO TECHNOLOGY
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 574170a8a0d..4e9e96ef903 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Centuri Aztarac hardware
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 637656d11d3..69e9b9522e6 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Data East Backfire!
 
     Backfire!
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 8afc75a859e..8da0080cd10 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Bagman memory map
diff --git a/src/mame/drivers/bailey.c b/src/mame/drivers/bailey.c
index 70831bc682c..06496b0622a 100644
--- a/src/mame/drivers/bailey.c
+++ b/src/mame/drivers/bailey.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Bailey International discrete hardware games
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index d8f39659d7d..bc1b2c704fb 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bank Panic / Combat Hawk hardware
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index ae56f5f62cd..ab863578029 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Baraduke    (c) 1985 Namco
diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c
index 6f4b2d2c429..2a1c3aba5cc 100644
--- a/src/mame/drivers/bartop52.c
+++ b/src/mame/drivers/bartop52.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Atari Bartop 5200 prototype system
 
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 15cde79dd8e..fe1ffa4631e 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Battle Lane Vol. 5
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index cd8baef3aa2..6ba83d6cd14 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Battle Rangers                  (c) 1988 Data East Corporation
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index 40fefef2018..a3d613038cc 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Omori Battle Cross
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 52140b94a47..44550f3ab46 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami Battlantis Hardware
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index c938e84df9f..bf25b0b196d 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Beast Busters           A9003   (c) 1989 SNK Corporation
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index e015621efaf..ceaf9f6f863 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tekunon Kougyou(Teknon Kogyo) Beam Invader hardware
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 4fcd0925c34..a98ef5128ce 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Beezer - (c) 1982 Tong Electronic
diff --git a/src/mame/drivers/belatra.c b/src/mame/drivers/belatra.c
index 77ab22b7721..32e8b12a5ae 100644
--- a/src/mame/drivers/belatra.c
+++ b/src/mame/drivers/belatra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Belatra Russian Fruit Machines (Video?) */
 
 /*
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index a9fe7218dbb..0d444786e8e 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Berzerk hardware
@@ -22,17 +24,14 @@ class berzerk_state : public driver_device
 public:
 	berzerk_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_videoram(*this, "videoram"),
-		m_colorram(*this, "colorram"),
 		m_maincpu(*this, "maincpu"),
 		m_s14001a(*this, "speech"),
 		m_ls181_10c(*this, "ls181_10c"),
 		m_ls181_12c(*this, "ls181_12c"),
 		m_custom(*this, "exidy"),
-		m_screen(*this, "screen") { }
-
-	required_shared_ptr<UINT8> m_videoram;
-	required_shared_ptr<UINT8> m_colorram;
+		m_screen(*this, "screen"),
+		m_videoram(*this, "videoram"),
+		m_colorram(*this, "colorram") { }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<s14001a_device> m_s14001a;
@@ -41,6 +40,9 @@ public:
 	required_device<exidy_sound_device> m_custom;
 	required_device<screen_device> m_screen;
 
+	required_shared_ptr<UINT8> m_videoram;
+	required_shared_ptr<UINT8> m_colorram;
+
 	UINT8 m_magicram_control;
 	UINT8 m_last_shift_data;
 	UINT8 m_intercept;
@@ -52,6 +54,7 @@ public:
 	int m_p1_direction;
 	int m_p2_counter_74ls161;
 	int m_p2_direction;
+
 	DECLARE_READ8_MEMBER(led_on_r);
 	DECLARE_WRITE8_MEMBER(led_on_w);
 	DECLARE_READ8_MEMBER(led_off_r);
@@ -64,16 +67,19 @@ public:
 	DECLARE_WRITE8_MEMBER(magicram_w);
 	DECLARE_WRITE8_MEMBER(magicram_control_w);
 	DECLARE_READ8_MEMBER(intercept_v256_r);
-	DECLARE_WRITE8_MEMBER(berzerk_audio_w);
-	DECLARE_READ8_MEMBER(berzerk_audio_r);
+	DECLARE_WRITE8_MEMBER(audio_w);
+	DECLARE_READ8_MEMBER(audio_r);
 	DECLARE_READ8_MEMBER(moonwarp_p1_r);
 	DECLARE_READ8_MEMBER(moonwarp_p2_r);
+
 	DECLARE_DRIVER_INIT(moonwarp);
 	virtual void machine_start();
 	virtual void machine_reset();
 	virtual void sound_reset();
 	virtual void video_start();
-	UINT32 screen_update_berzerk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
 	TIMER_CALLBACK_MEMBER(irq_callback);
 	TIMER_CALLBACK_MEMBER(nmi_callback);
 	void vpos_to_vsync_chain_counter(int vpos, UINT8 *counter, UINT8 *v256);
@@ -467,7 +473,7 @@ void berzerk_state::get_pens(rgb_t *pens)
 }
 
 
-UINT32 berzerk_state::screen_update_berzerk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+UINT32 berzerk_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	rgb_t pens[NUM_PENS];
 	offs_t offs;
@@ -514,7 +520,7 @@ UINT32 berzerk_state::screen_update_berzerk(screen_device &screen, bitmap_rgb32
  *
  *************************************/
 
-WRITE8_MEMBER(berzerk_state::berzerk_audio_w)
+WRITE8_MEMBER(berzerk_state::audio_w)
 {
 	int clock_divisor;
 
@@ -568,7 +574,7 @@ WRITE8_MEMBER(berzerk_state::berzerk_audio_w)
 }
 
 
-READ8_MEMBER(berzerk_state::berzerk_audio_r)
+READ8_MEMBER(berzerk_state::audio_r)
 {
 	switch (offset)
 	{
@@ -591,7 +597,7 @@ void berzerk_state::sound_reset()
 {
 	address_space &space = m_maincpu->space(AS_IO);
 	/* clears the flip-flop controlling the volume and freq on the speech chip */
-	berzerk_audio_w(space, 4, 0x40);
+	audio_w(space, 4, 0x40);
 }
 
 
@@ -633,7 +639,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( berzerk_io_map, AS_IO, 8, berzerk_state )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x3f) AM_NOP
-	AM_RANGE(0x40, 0x47) AM_READWRITE(berzerk_audio_r, berzerk_audio_w)
+	AM_RANGE(0x40, 0x47) AM_READWRITE(audio_r, audio_w)
 	AM_RANGE(0x48, 0x48) AM_READ_PORT("P1") AM_WRITENOP
 	AM_RANGE(0x49, 0x49) AM_READ_PORT("SYSTEM") AM_WRITENOP
 	AM_RANGE(0x4a, 0x4a) AM_READ_PORT("P2") AM_WRITENOP
@@ -1124,7 +1130,7 @@ static MACHINE_CONFIG_START( berzerk, berzerk_state )
 
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
-	MCFG_SCREEN_UPDATE_DRIVER(berzerk_state, screen_update_berzerk)
+	MCFG_SCREEN_UPDATE_DRIVER(berzerk_state, screen_update)
 
 	/* audio hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1319,6 +1325,11 @@ DRIVER_INIT_MEMBER(berzerk_state,moonwarp)
 	address_space &io = m_maincpu->space(AS_IO);
 	io.install_read_handler (0x48, 0x48, read8_delegate(FUNC(berzerk_state::moonwarp_p1_r), this));
 	io.install_read_handler (0x4a, 0x4a, read8_delegate(FUNC(berzerk_state::moonwarp_p2_r), this));
+	
+	save_item(NAME(m_p1_counter_74ls161));
+	save_item(NAME(m_p1_direction));
+	save_item(NAME(m_p2_counter_74ls161));
+	save_item(NAME(m_p2_direction));
 }
 
 /*************************************
@@ -1327,10 +1338,10 @@ DRIVER_INIT_MEMBER(berzerk_state,moonwarp)
  *
  *************************************/
 
-GAME( 1980, berzerk,  0,       berzerk, berzerk,  driver_device,        0, ROT0, "Stern Electronics", "Berzerk (set 1)", 0 )
-GAME( 1980, berzerk1, berzerk, berzerk, berzerk,  driver_device,        0, ROT0, "Stern Electronics", "Berzerk (set 2)", 0 )
-GAME( 1980, berzerkf, berzerk, berzerk, berzerkf, driver_device,        0, ROT0, "Stern Electronics", "Berzerk (French Speech)", 0 )
-GAME( 1980, berzerkg, berzerk, berzerk, berzerkg, driver_device,        0, ROT0, "Stern Electronics", "Berzerk (German Speech)", 0 )
-GAME( 1980, berzerks, berzerk, berzerk, berzerks, driver_device,        0, ROT0, "Stern Electronics (Sonic License)", "Berzerk (Spanish Speech)", 0 )
-GAME( 1981, frenzy,   0,       frenzy,  frenzy,   driver_device,        0, ROT0, "Stern Electronics", "Frenzy", 0 )
-GAME( 1981, moonwarp, 0,       frenzy,  moonwarp, berzerk_state, moonwarp, ROT0, "Stern Electronics", "Moon War (prototype on Frenzy hardware)", 0)
+GAME( 1980, berzerk,  0,       berzerk, berzerk,  driver_device,        0, ROT0, "Stern Electronics", "Berzerk (set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1980, berzerk1, berzerk, berzerk, berzerk,  driver_device,        0, ROT0, "Stern Electronics", "Berzerk (set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1980, berzerkf, berzerk, berzerk, berzerkf, driver_device,        0, ROT0, "Stern Electronics", "Berzerk (French Speech)", GAME_SUPPORTS_SAVE )
+GAME( 1980, berzerkg, berzerk, berzerk, berzerkg, driver_device,        0, ROT0, "Stern Electronics", "Berzerk (German Speech)", GAME_SUPPORTS_SAVE )
+GAME( 1980, berzerks, berzerk, berzerk, berzerks, driver_device,        0, ROT0, "Stern Electronics (Sonic License)", "Berzerk (Spanish Speech)", GAME_SUPPORTS_SAVE )
+GAME( 1981, frenzy,   0,       frenzy,  frenzy,   driver_device,        0, ROT0, "Stern Electronics", "Frenzy", GAME_SUPPORTS_SAVE )
+GAME( 1981, moonwarp, 0,       frenzy,  moonwarp, berzerk_state, moonwarp, ROT0, "Stern Electronics", "Moon War (prototype on Frenzy hardware)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index ef9cbb56427..b22e5652a73 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Bell-Fruit Cobra I/II and Viper Hardware
diff --git a/src/mame/drivers/bfm_ad5.c b/src/mame/drivers/bfm_ad5.c
index 7cc18981e3d..7f372c99622 100644
--- a/src/mame/drivers/bfm_ad5.c
+++ b/src/mame/drivers/bfm_ad5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Adder 5
diff --git a/src/mame/drivers/bfm_ad5sw.c b/src/mame/drivers/bfm_ad5sw.c
index 15ad15e3e49..d7802a0a84a 100644
--- a/src/mame/drivers/bfm_ad5sw.c
+++ b/src/mame/drivers/bfm_ad5sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Adder 5
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 4bc2edf238b..949a3750583 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************************
 
     Bellfruit scorpion1 driver, (under heavy construction !!!)
diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c
index 948467f9541..cfa0a9a5053 100644
--- a/src/mame/drivers/bfm_sc4.c
+++ b/src/mame/drivers/bfm_sc4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Scorpion 4 Hardware Platform (c)1996 Bell Fruit Manufacturing
diff --git a/src/mame/drivers/bfm_sc45_helper.c b/src/mame/drivers/bfm_sc45_helper.c
index ce7d40f7e9d..8eac6f93712 100644
--- a/src/mame/drivers/bfm_sc45_helper.c
+++ b/src/mame/drivers/bfm_sc45_helper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* helper functions for BFM SC4/5 set identification and layout file creation
  - these are not strictly required by the emulation
 
diff --git a/src/mame/drivers/bfm_sc45_helper.h b/src/mame/drivers/bfm_sc45_helper.h
index f6dbcb8cbae..753acc48a01 100644
--- a/src/mame/drivers/bfm_sc45_helper.h
+++ b/src/mame/drivers/bfm_sc45_helper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* */
 
 void bfm_sc45_layout_helper(running_machine &machine);
diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c
index cbe9ff1c810..7fc663e8be2 100644
--- a/src/mame/drivers/bfm_sc4h.c
+++ b/src/mame/drivers/bfm_sc4h.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Scorpion 4 Hardware Platform (c)1996 Bell Fruit Manufacturing
diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c
index 33d13fdf381..78fea240087 100644
--- a/src/mame/drivers/bfm_sc5.c
+++ b/src/mame/drivers/bfm_sc5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Scorpion 5
diff --git a/src/mame/drivers/bfm_sc5sw.c b/src/mame/drivers/bfm_sc5sw.c
index 010d8cbefa0..9788bb54b11 100644
--- a/src/mame/drivers/bfm_sc5sw.c
+++ b/src/mame/drivers/bfm_sc5sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Scorpion 5
diff --git a/src/mame/drivers/bfm_swp.c b/src/mame/drivers/bfm_swp.c
index 5b90f2ef4a9..d944f559668 100644
--- a/src/mame/drivers/bfm_swp.c
+++ b/src/mame/drivers/bfm_swp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Bellfruit SWP (Skill With Prizes) Video hardware
     aka Cobra 3
 
diff --git a/src/mame/drivers/bfmsys83.c b/src/mame/drivers/bfmsys83.c
index 594db2d1dd1..589d843f585 100644
--- a/src/mame/drivers/bfmsys83.c
+++ b/src/mame/drivers/bfmsys83.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* BFM System 83 */
 
 #include "emu.h"
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index c55597438ce..15a62b52abc 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bellfruit system85 driver, (under heavy construction !!!)
diff --git a/src/mame/drivers/bgt.c b/src/mame/drivers/bgt.c
index 4af9c2751ca..53ce5913285 100644
--- a/src/mame/drivers/bgt.c
+++ b/src/mame/drivers/bgt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* BGT Fruit Machines
   BGT (British Gaming Technology) were a small Spanish company
 
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index 426adf18b80..edcd15fce37 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   BIG 10
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 4e0d0ff1fa6..71852e94861 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Big Event Golf (c) Taito 1986
 
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 741b983f3a6..27b616b11be 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Jaleco's Big Striker (bootleg version)
 
  Driver by David Haywood
diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c
index 9d95d207bd2..428c67b352d 100644
--- a/src/mame/drivers/bingo.c
+++ b/src/mame/drivers/bingo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/s2650/s2650.h"
diff --git a/src/mame/drivers/bingoman.c b/src/mame/drivers/bingoman.c
index ba1916bf530..957af5c6275 100644
--- a/src/mame/drivers/bingoman.c
+++ b/src/mame/drivers/bingoman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Bingo Mania.
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index 09daf003a5e..100b4ee3688 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
   Bingo Roll / Bell Star
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index f27fb6fc548..dee9d5965ed 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************
 
     Bionic Commando
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 00e6d55705d..9089fe18181 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Bishi Bashi Champ Mini Game Senshuken (c) 1996 Konami
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index a297b407517..efa35e9a10a 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index 25010f90bdf..d8a4a5a71df 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Black Touch '96
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 389d4612966..85c3b1a8afd 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blades of Steel (GX797) (c) 1987 Konami
diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c
index f6b2380c9f6..83dd0477cdf 100644
--- a/src/mame/drivers/blitz.c
+++ b/src/mame/drivers/blitz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   MEGA DOUBLE POKER (BLITZ SYSTEM INC.)
diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c
index f06d0a4b547..9cad23843bf 100644
--- a/src/mame/drivers/blitz68k.c
+++ b/src/mame/drivers/blitz68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
 Blitter based gambling games
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index e10a34b37f6..3d133be1bb6 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Black Tiger
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index 07f8d4fd942..06ab0ef7830 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Blomby Car =-
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 9e92ad850d8..361a0624f05 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Blockade/Comotion/Blasto/Hustle Memory MAP
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index cf8c093cf80..3f1010a2354 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Block Hole (GX973) (c) 1989 Konami
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 77276937ce7..bb8aef36808 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Block Out
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index 3f1cfba4d1d..56f7b20990d 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
 Blood Bros, West Story & Sky Smasher
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 9d42f0eeb28..90b0597d055 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blue Print memory map (preliminary)
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index baaa6c20ce7..f23de86c41b 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 BMC Bowling (c) 1994.05 BMC, Ltd
 
diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c
index 04574000f0d..275e5718690 100644
--- a/src/mame/drivers/bmcpokr.c
+++ b/src/mame/drivers/bmcpokr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
 Dongfang Shenlong ("Eastern Dragon")
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index c6e341417da..0a8a940777b 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Vs. Janshi Brandnew Stars
 (c)1997 Jaleco
diff --git a/src/mame/drivers/bntyhunt.c b/src/mame/drivers/bntyhunt.c
index d8573e7166c..ff2835d6d51 100644
--- a/src/mame/drivers/bntyhunt.c
+++ b/src/mame/drivers/bntyhunt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Bounty Hunter
 
  PC hardware.. no dumps of the bios roms are currently available
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 000e719ca39..fc59d4c9ece 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bogey Manor               (c) 1985 Technos Japan
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index bfb0bb61545..14251cb0a20 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Bomb Jack
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index d01e6f31d26..0de8126a0d9 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Boogie Wings (aka The Great Ragtime Show)
     Data East, 1992
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index bd9dea8c939..f9fa6eb2c5b 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bottom of the Ninth (c) 1989 Konami
diff --git a/src/mame/drivers/bowltry.c b/src/mame/drivers/bowltry.c
index 33269117ffb..f574806cf7a 100644
--- a/src/mame/drivers/bowltry.c
+++ b/src/mame/drivers/bowltry.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
     Bowling Try
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 09518f12ec0..76cf2935265 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Boxer (prototype) driver
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 7c158cc79de..37f10f8c66a 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Break Thru Doc. Data East (1986)
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index b56625ca488..a2bbdc20583 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Basketball hardware
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 82a58f0bcfa..7039796ebe2 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Burger Time
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index e31bc6ef33e..33a04652a68 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tokio          (c) 1986 Taito
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index eb2dc97303b..50da288e62e 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Buggy Challenge - (c) 1984 Taito Corporation
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index 26ef634ade0..f7ea6a2a6fa 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Buster
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 9a7aa8d6ed5..ed9d3634faa 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Black Widow hardware
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index e7851df282b..167e030fe50 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 B-Wings  (c) 1984 Data East Corporation
@@ -8,7 +10,7 @@ revised by Alex W. Jackson
 
 Known issues:
 
-- The main program is responsible for sprite clipping but occational
+- The main program is responsible for sprite clipping but occasional
   glitches can be seen at the top and bottom screen edges. (post rotate)
 
 - B-Wings bosses sometimes flicker. (sync issue)
@@ -131,11 +133,11 @@ static ADDRESS_MAP_START( bwp1_map, AS_PROGRAM, 8, bwing_state )
 	AM_RANGE(0x1b00, 0x1b07) AM_READ(bwp1_io_r)
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("sharedram")
 	AM_RANGE(0x0800, 0x0fff) AM_RAM
-	AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(bwing_videoram_w) AM_SHARE("videoram")
+	AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
 	AM_RANGE(0x1400, 0x17ff) AM_RAM
 	AM_RANGE(0x1800, 0x19ff) AM_RAM AM_SHARE("spriteram")
-	AM_RANGE(0x1a00, 0x1aff) AM_RAM_WRITE(bwing_paletteram_w) AM_SHARE("paletteram")
-	AM_RANGE(0x1b00, 0x1b07) AM_RAM_WRITE(bwing_scrollreg_w)
+	AM_RANGE(0x1a00, 0x1aff) AM_RAM_WRITE(paletteram_w) AM_SHARE("paletteram")
+	AM_RANGE(0x1b00, 0x1b07) AM_RAM_WRITE(scrollreg_w)
 	AM_RANGE(0x1c00, 0x1c07) AM_RAM_WRITE(bwp1_ctrl_w)
 	AM_RANGE(0x2000, 0x3fff) AM_DEVICE("vrambank", address_map_bank_device, amap8)
 	AM_RANGE(0x4000, 0xffff) AM_ROM // "B-Wings US" writes to 9631-9632(debug?)
@@ -381,7 +383,7 @@ static MACHINE_CONFIG_START( bwing, bwing_state )
 	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))   // must be long enough for polling
 	MCFG_SCREEN_SIZE(32*8, 32*8)
 	MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
-	MCFG_SCREEN_UPDATE_DRIVER(bwing_state, screen_update_bwing)
+	MCFG_SCREEN_UPDATE_DRIVER(bwing_state, screen_update)
 	MCFG_SCREEN_PALETTE("palette")
 
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", bwing)
@@ -568,9 +570,9 @@ DRIVER_INIT_MEMBER(bwing_state,bwing)
 //****************************************************************************
 // Game Entries
 
-GAME( 1984, bwings,       0, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Japan new Ver.)", 0 )
-GAME( 1984, bwingso, bwings, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Japan old Ver.)", 0 )
-GAME( 1984, bwingsa, bwings, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Alt Ver.?)", 0 )
+GAME( 1984, bwings,       0, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Japan new Ver.)", GAME_SUPPORTS_SAVE )
+GAME( 1984, bwingso, bwings, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Japan old Ver.)", GAME_SUPPORTS_SAVE )
+GAME( 1984, bwingsa, bwings, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "B-Wings (Alt Ver.?)", GAME_SUPPORTS_SAVE )
 
-GAME( 1984, zaviga,       0, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "Zaviga", 0 )
-GAME( 1984, zavigaj, zaviga, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "Zaviga (Japan)", 0 )
+GAME( 1984, zaviga,       0, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "Zaviga", GAME_SUPPORTS_SAVE )
+GAME( 1984, zavigaj, zaviga, bwing, bwing, bwing_state, bwing, ROT90, "Data East Corporation", "Zaviga (Japan)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/by68701.c b/src/mame/drivers/by68701.c
index 17d886783c8..0024379ac61 100644
--- a/src/mame/drivers/by68701.c
+++ b/src/mame/drivers/by68701.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/m6800/m6800.h"
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index ee43a90f094..656760bb200 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Battlezone hardware
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index bc8b2ce317c..d971f1a56f1 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
 Cabal  (c)1998 Tad
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 31a0361980b..fef1a0eebd1 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Cabaret (AMT)
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 47205155203..c1ffb42249d 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     .----------------------------------------.
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index b4013900f48..fff0fedef6e 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Calorie-Kun
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 8a742c18801..eb60260a5d5 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Canyon Bomber hardware
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 196e48cb9a1..9054bdf4bca 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Coors Light Bowling/Bowl-O-Rama hardware
diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c
index 60dade3992c..70573cd2b1d 100644
--- a/src/mame/drivers/capcom.c
+++ b/src/mame/drivers/capcom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Capcom A0015405
 */
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 5f51b6eff64..639365590f5 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /************************************
  Card Line
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 178688762ec..0765cc54151 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Car Jamboree
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index a1c0756fea6..9858f75e815 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exidy Car Polo hardware
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 2c163970c11..ca3c1e9fa07 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 This is a simple 'Pairs' game called
diff --git a/src/mame/drivers/castle.c b/src/mame/drivers/castle.c
index 8d1a14dcde4..df6ed846b6f 100644
--- a/src/mame/drivers/castle.c
+++ b/src/mame/drivers/castle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Castle Mach2000 Hardware
 
   Mechanical Fruit Machines with DMD display
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 606c82bedf1..d56c3c436ae 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************************
 
 Royal Casino (c) 1984 Dyna
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 2e8c996f9d9..692f950c13a 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Cave Hardware =-
diff --git a/src/mame/drivers/cavepc.c b/src/mame/drivers/cavepc.c
index 01caa590556..dcb300390d7 100644
--- a/src/mame/drivers/cavepc.c
+++ b/src/mame/drivers/cavepc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     CAVE PC hardware
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index d4b758b908c..e3a43f7d637 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************
 
   Cherry Bonus 2001  (c)2000/2001 Dyna
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index cfc79c03112..8fc7debf4f6 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cannonball (prototype) driver
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index f9ed7179cb2..15c0a72c672 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Capcom Baseball
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index f2b461186e4..6b08d9c07e9 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Crude Buster (World version FX)       (c) 1990 Data East Corporation
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 79484cafba5..62f3b1fb201 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Crystal Castles hardware
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index b453f0db4cd..6c100bab942 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************************************************
 
 Cherry Chance (c) 1987 Taito Corporation?
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index a7a23ee0800..00789e494c0 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cinematronics Cosmic Chasm hardware
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 5908041465d..879dcceda57 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Crazy Climber memory map (preliminary)
diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c
index 44c7a6d53f7..33064bf939e 100644
--- a/src/mame/drivers/cdi.c
+++ b/src/mame/drivers/cdi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index ad4d93de403..f1a714e9f4d 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Centipede hardware
diff --git a/src/mame/drivers/cesclass.c b/src/mame/drivers/cesclass.c
index e9bba7d2fa2..72651d235e8 100644
--- a/src/mame/drivers/cesclass.c
+++ b/src/mame/drivers/cesclass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     CES Classic wall games
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 56afb0856ca..e4cc5bbc627 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Chack'n Pop driver by BUT
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index af1a9889339..45aa7e476ab 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Chameleon 24
 
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 342e9baeb50..d0f384bb179 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Talbot                     - (c) 1982 Alpha Denshi Co.
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 04f3d488774..6c0bb9a632d 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Championship Bowling
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 74ec03b0dd6..f77aba371dd 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 Chanbara
 Data East, 1985
diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c
index b3ae0f1460f..8db71fff415 100644
--- a/src/mame/drivers/chance32.c
+++ b/src/mame/drivers/chance32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 
   Chance 32
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 7aec5cc449e..28d0219ef88 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 Change Lanes
 (C) Taito 1983
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 1c3417ef319..436f17f4f11 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
     Universal Cheeky Mouse Driver
     (c)Lee Taylor May/June 1998, All rights reserved.
diff --git a/src/mame/drivers/chicago.c b/src/mame/drivers/chicago.c
index b46a06fa9dd..29c44e584c5 100644
--- a/src/mame/drivers/chicago.c
+++ b/src/mame/drivers/chicago.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Chicago Coin discrete hardware games
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 089edc972f5..a385f0b7be2 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Chihiro is an Xbox-based arcade system from SEGA.
 
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index d8868b233bb..b2977383765 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 China Gate.
 By Paul Hampson from First Principles
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index b9fe7c3d179..0e2143db2a0 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Ganbare Chinsan Ooshoubu
  driver by David Haywood
 
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 827542de9c0..601eee9aef8 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Chequered Flag / Checkered Flag (GX717) (c) Konami 1988
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index 8deade8415b..063f42fda1d 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************************
 
 Champion Super (c) 1999 <unknown>
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 0cdf76d4b36..cdcf363fe8e 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Exidy 'Universal' Game Board V1
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 1947afae120..891bb1c9072 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Circus Charlie   GX380 (c) 1984 Konami
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 66f4bcf4566..e1fc2ff0e5c 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Jaleco Driving Games =-
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 73156ba3d92..18f9b9bb91a 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 City Connection (c) 1985 Jaleco
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 1fe87ad90f0..a9272179221 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Allied Leisure Clay Shoot hardware
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 0c8d0fbcb0e..63d4ed1ca04 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cloak & Dagger hardware
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index 7d7e832a6c6..68481722db1 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cloud 9 (prototype) hardware
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 52bf77604b2..2f6724ea108 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Clash Road =-
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index b1d5da9af1d..5710e7a4871 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Edward Randy      (c) 1990 Data East Corporation (World version)
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index c4ce91c563c..2af13158e1f 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************
 
     Counter Steer                   (c) 1985 Data East Corporation
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index c512b9743f2..50aa0b93d47 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Konami Cobra System
 
     Driver by Ville Linde
diff --git a/src/mame/drivers/cocoloco.c b/src/mame/drivers/cocoloco.c
index fc0dd1b73e0..1dfe616d4ee 100644
--- a/src/mame/drivers/cocoloco.c
+++ b/src/mame/drivers/cocoloco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************
 
   Coco Loco
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 52e8037adb9..272fa8e449f 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*==================================================================================
 
   Coinmaster trivia and poker games.
diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c
index 214ddb97b98..cc9a21ade1b 100644
--- a/src/mame/drivers/coinmvga.c
+++ b/src/mame/drivers/coinmvga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   COINMASTER-GAMING - VGA BOARD
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 962097e3c11..8e0afb18276 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 "Combat School" (also known as "Boot Camp") - (Konami GX611)
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 93ccd1a3775..1b24426ed43 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Come On Baby
   (c) 2000 ExPotato Co. Ltd (Excellent Potato)
 
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index fe4dd0c63b5..b006eb4b385 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Commando memory map (preliminary)
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 23aa3d8bffa..88fc12c2377 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Contra/Gryzor (c) 1987 Konami
@@ -124,9 +126,9 @@ static INPUT_PORTS_START( contra )
 	PORT_DIPSETTING(    0x02, "3" )
 	PORT_DIPSETTING(    0x01, "5" )
 	PORT_DIPSETTING(    0x00, "7" )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3")    /* Not Used according to manual */
-	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Cocktail ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW2:3")
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5")
 	PORT_DIPSETTING(    0x18, "30000 70000" )
 	PORT_DIPSETTING(    0x10, "40000 80000" )
@@ -145,9 +147,9 @@ static INPUT_PORTS_START( contra )
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, "Upright Controls" ) PORT_DIPLOCATION("SW3:2")    /* Not Used according to manual */
-	PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Dual ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW3:2")
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" )
 	PORT_DIPNAME( 0x08, 0x08, "Sound" ) PORT_DIPLOCATION("SW3:4")
 	PORT_DIPSETTING(    0x00, DEF_STR( Mono ) )
@@ -156,6 +158,21 @@ INPUT_PORTS_END
 
 
 
+static INPUT_PORTS_START( gryzor )
+	PORT_INCLUDE( contra )
+
+	PORT_MODIFY("DSW2")
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3")    /* Not Used according to manual, used in gryzor sets */
+	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Cocktail ) )
+
+	PORT_MODIFY("DSW3")
+	PORT_DIPNAME( 0x02, 0x02, "Upright Controls" ) PORT_DIPLOCATION("SW3:2")    /* Not Used according to manual, used in gryzor sets */
+	PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Dual ) )
+INPUT_PORTS_END
+
+
 static const gfx_layout gfxlayout =
 {
 	8,8,
@@ -279,6 +296,46 @@ ROM_START( contra1 )
 	ROM_LOAD( "007766.20d.bin", 0x0000, 0x0001, NO_DUMP ) /* PAL16L8A-2CN */
 ROM_END
 
+ROM_START( contrae )
+	ROM_REGION( 0x30000, "maincpu", ROMREGION_ERASEFF ) /* 64k for code + 96k for banked ROMs */
+	ROM_LOAD( "633_e03.18a",   0x20000, 0x08000, CRC(7ebdb314) SHA1(b42c032cce7ae0c9b3eea6a41b7ffa5cb7fced5d) )
+	ROM_CONTINUE(              0x08000, 0x08000 )
+	ROM_LOAD( "633_e02.17a",   0x10000, 0x10000, CRC(9d5ebe66) SHA1(5218426e1494b4f6dec667f1ade7ada13aa04f2b) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )    /* 64k for SOUND code */
+	ROM_LOAD( "633e01.12a",   0x08000, 0x08000, CRC(d1549255) SHA1(d700c7de36746ba247e3a5d0410b7aa036aa4073) )
+
+	// this PCB used official Konami riser-boards in place of the mask roms
+	ROM_REGION( 0x80000, "gfx1", 0 )
+	ROM_LOAD16_BYTE( "633_e04_a.7d",    0x00000, 0x10000, CRC(e027f330) SHA1(e3480c0ed9f5ed5df829e66eb72e01ea39d5fca3) )
+	ROM_LOAD16_BYTE( "633_e04_b.7d",    0x20000, 0x10000, CRC(a71230f5) SHA1(c2c92b42a04adbb4c7ba3d4632b9a9db0555840e) )
+	ROM_LOAD16_BYTE( "633_e04_c.7d",    0x40000, 0x10000, CRC(0b103d01) SHA1(95e7feb7103d71b43ba921b7a376a2faf642621b) )
+	ROM_LOAD16_BYTE( "633_e04_d.7d",    0x60000, 0x10000, CRC(ab3faa60) SHA1(905c1eaa5fb46904058977582c9bb3132ba165f7) )
+	ROM_LOAD16_BYTE( "633_e05_a.7f",    0x00001, 0x10000, CRC(81a70a77) SHA1(c7493474af0144c05d3d98b2f77a3dae2d8d7ca5) )
+	ROM_LOAD16_BYTE( "633_e05_b.7f",    0x20001, 0x10000, CRC(55556f29) SHA1(ebd52abd4adb9c4302050579fa126fde49fb468d) )
+	ROM_LOAD16_BYTE( "633_e05_c.7f",    0x40001, 0x10000, CRC(acba86bf) SHA1(c248c837b1f8093bcaf465b0c75b67f1f67a3f61) )
+	ROM_LOAD16_BYTE( "633_e05_d.7f",    0x60001, 0x10000, CRC(59cf234d) SHA1(4a6bb30789e581c0600c55d8e8fba778e30ba299) )
+
+	ROM_REGION( 0x80000, "gfx2", 0 )
+	ROM_LOAD16_BYTE( "633_e06_a.16d",   0x00000, 0x10000, CRC(030079c5) SHA1(3f93e05e9df0a9dde570b771e04b719cf0ace967) )
+	ROM_LOAD16_BYTE( "633_e06_b.16d",   0x20000, 0x10000, CRC(e17d5807) SHA1(15ebbf62d026cc8ac75c9877304458cbc0c5d5e0) )
+	ROM_LOAD16_BYTE( "633_e06_c.16d",   0x40000, 0x10000, CRC(7d6a28cd) SHA1(9fbbe0460406bb8b3e2e572c4d5a2f8be4ba9c2e) )
+	ROM_LOAD16_BYTE( "633_e06_d.16d",   0x60000, 0x10000, CRC(83db378f) SHA1(b9a2235382836fe06868d3bbd45978653bf5c91d) )
+	ROM_LOAD16_BYTE( "633_e07_a.16f",   0x00001, 0x10000, CRC(8fcd40e5) SHA1(980273dc9108cc546b2146ec1e9db5dd440c4bd2) )
+	ROM_LOAD16_BYTE( "633_e07_b.16f",   0x20001, 0x10000, CRC(694e306e) SHA1(f077aefb2b1ed29b27ed02b094007fe6b50a06a1) )
+	ROM_LOAD16_BYTE( "633_e07_c.16f",   0x40001, 0x10000, CRC(fb33f3ff) SHA1(c6f6035a1478e8d2cdab01ddf2ec07a834b79593) )
+	ROM_LOAD16_BYTE( "633_e07_d.16f",   0x60001, 0x10000, CRC(cfab0988) SHA1(3961bcbc3093b787211ab2815914f90a89df78b1) )
+
+	ROM_REGION( 0x0500, "proms", 0 )
+	ROM_LOAD( "633e08.10g",   0x0000, 0x0100, CRC(9f0949fa) SHA1(7c8fefdcae4523d008a7d39062194c7a80aa3500) )    /* 007121 #0 sprite lookup table */
+	ROM_LOAD( "633e09.12g",   0x0100, 0x0100, CRC(14ca5e19) SHA1(eeee2f8b3d1e4acf47de1e74c4e507ff924591e7) )    /* 007121 #0 char lookup table */
+	ROM_LOAD( "633e10.18g",   0x0200, 0x0100, CRC(e782c494) SHA1(9459e721a4361fc4fbace3a017211f0199dee24d) )    /* 007121 #1 sprite lookup table */ // earlier rev
+	ROM_LOAD( "633e11.20g",   0x0300, 0x0100, CRC(14ca5e19) SHA1(eeee2f8b3d1e4acf47de1e74c4e507ff924591e7) )    /* 007121 #1 char lookup table */
+
+	ROM_REGION( 0x0001, "pals", 0 )
+	ROM_LOAD( "007766.20d.bin", 0x0000, 0x0001, NO_DUMP ) /* PAL16L8A-2CN */
+ROM_END
+
 ROM_START( contraj )
 	ROM_REGION( 0x30000, "maincpu", ROMREGION_ERASEFF ) /* 64k for code + 96k for banked ROMs */
 	ROM_LOAD( "633n03.18a",   0x20000, 0x08000, CRC(fedab568) SHA1(7fd4546335bdeef7f8326d4cbde7fa36d74e5cfc) )
@@ -506,13 +563,13 @@ ROM_START( contrabj1 )
 	ROM_LOAD( "633f11.20g",   0x0300, 0x0100, CRC(14ca5e19) SHA1(eeee2f8b3d1e4acf47de1e74c4e507ff924591e7) )    /* 007121 #1 char lookup table */
 ROM_END
 
-
-GAME( 1987, contra,    0,      contra, contra, driver_device, 0, ROT90, "Konami", "Contra (US, set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contra1,   contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (US, set 2)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contraj,   contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (Japan, set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contraj1,  contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (Japan, set 2)", GAME_SUPPORTS_SAVE )
-GAME( 1987, gryzor,    contra, contra, contra, driver_device, 0, ROT90, "Konami", "Gryzor (set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1987, gryzor1,   contra, contra, contra, driver_device, 0, ROT90, "Konami", "Gryzor (set 2)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contrab,   contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (bootleg)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contrabj,  contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1987, contrabj1, contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contra,    0,      contra, contra,  driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contra1,   contra, contra, contra,  driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contrae,   contra, contra, contra,  driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 3)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contraj,   contra, contra, contra,  driver_device, 0, ROT90, "Konami", "Contra (Japan, set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contraj1,  contra, contra, contra,  driver_device, 0, ROT90, "Konami", "Contra (Japan, set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1987, gryzor,    contra, contra, gryzor,  driver_device, 0, ROT90, "Konami", "Gryzor (set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1987, gryzor1,   contra, contra, gryzor,  driver_device, 0, ROT90, "Konami", "Gryzor (set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contrab,   contra, contra, contra,  driver_device, 0, ROT90, "bootleg", "Contra (bootleg)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contrabj,  contra, contra, contra,  driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1987, contrabj1, contra, contra, contra,  driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 2)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index c0191e2ce52..c324001c90b 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Cops 01      (c) 1985 Nichibutsu
diff --git a/src/mame/drivers/cops.c b/src/mame/drivers/cops.c
index 270cff634d3..fdcb10fc934 100644
--- a/src/mame/drivers/cops.c
+++ b/src/mame/drivers/cops.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Nova 'LaserMax'/Atari Games Cops
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 63b7c93c472..f8d05eb583d 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cops'n Robbers hardware
diff --git a/src/mame/drivers/corona.c b/src/mame/drivers/corona.c
index 5aa55fc88c4..dea5388effb 100644
--- a/src/mame/drivers/corona.c
+++ b/src/mame/drivers/corona.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
   Winners Circle.
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 27ae13bda33..ab594544831 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Universal board numbers (found on the schematics)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index f2936e708f0..3fb88f65aca 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Capcom System 1
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index db2af7c6cf5..80e9dd8d3c7 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Driver by Paul Leaman (paul@vortexcomputing.demon.co.uk)
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 9df931edfe4..1849eebf80d 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 CPS3 Driver (preliminary)
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index cc3348dfbac..49289805a99 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Crazy Balloon hardware
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index e37e69afe05..f295b35f473 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Crime Fighters (Konami GX821) (c) 1989 Konami
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 427a087aa40..638e3006b33 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
       F2 System
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 6f87b0d3a28..9536f561615 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Crash Race       (c) 1993 Video System Co.
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 525978ed7a8..ab3bd3c11f0 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     CRYSTAL SYSTEM by Brezzasoft (2001)
     using VRender0 System on a Chip
diff --git a/src/mame/drivers/cswat.c b/src/mame/drivers/cswat.c
index 1d2edd8fc39..b63561a1ea6 100644
--- a/src/mame/drivers/cswat.c
+++ b/src/mame/drivers/cswat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Namco Cosmoswat, a lightgun game that uses a projector and a bunch of
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index efa11c23ebf..3315525f810 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Simutrek Cube Quest
diff --git a/src/mame/drivers/cubo.c b/src/mame/drivers/cubo.c
index 5071a7e6f65..a966855d99a 100644
--- a/src/mame/drivers/cubo.c
+++ b/src/mame/drivers/cubo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
    Cubo CD32 (additional hardware and games by CD Express, Milan, Italy)
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 3f23fe5e24c..8973e7d36e4 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Jibun wo Migaku Culture School Mahjong Hen
     (c)1994 Face
diff --git a/src/mame/drivers/cupidon.c b/src/mame/drivers/cupidon.c
index 720b09305c3..298e2becaba 100644
--- a/src/mame/drivers/cupidon.c
+++ b/src/mame/drivers/cupidon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Cupidon - Russian Video Fruit Machines? */
 
 /*
diff --git a/src/mame/drivers/cv1k.c b/src/mame/drivers/cv1k.c
index 3d807e588d5..e015e2a1989 100644
--- a/src/mame/drivers/cv1k.c
+++ b/src/mame/drivers/cv1k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 U2 flash rom note
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index d7e3bc04272..e9598e1d42f 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Century CVS System
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index b7f17a46d98..a4a394f63ba 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Dacholer    (c) 1983 Nichibutsu
diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c
index b642736505a..de9761cf004 100644
--- a/src/mame/drivers/dai3wksi.c
+++ b/src/mame/drivers/dai3wksi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 -Galaxy Force
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index 358e5711048..9f62c50c640 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Dambusters
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 9f64d990c40..98e90ee9c08 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Darius    (c) Taito 1986
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 88220bb8625..5850cd425b9 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ***********************************************************************************
 Dark Mist (c)1986  Taito / Seibu
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 5667defa5bc..97a926b5dc8 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dark Seal (Rev 3)    (c) 1990 Data East Corporation (World version)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 61d66b8d640..0e2a902dae6 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Thunder Zone / Desert Assault (c) 1991 Data East Corporation
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index a651ab6f2d1..732b8f24c32 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Double Wings
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 0b7ac11a169..ac81d0ee8af 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Dragonball Z                  (c) 1993 Banpresto
   Dragonball Z 2 - Super Battle (c) 1994 Banpresto
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 8ec7fb8aa0a..e73358ceebd 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     D-Con                                   (c) 1992 Success
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 0dee7045dd0..92e59eda436 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 D-Day
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 5bba011e391..abbc1ac0e47 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     D-DAY   (c)Jaleco 1984
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 347bbb31dbe..023913147d9 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Some Dynax/Nakanihon games using the third version of their blitter
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 4a43c2b766d..85186f08113 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Double Dragon     (c) 1987 Technos Japan
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index cbbe893051a..cb0608de4c0 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
     Double Dragon 3                     Technos Japan Corp 1990
diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c
index 52c1355de09..407c8a1c4c1 100644
--- a/src/mame/drivers/ddribble.c
+++ b/src/mame/drivers/ddribble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Double Dribble (GX690) (c) Konami 1986
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index 53a03536901..f3081c2e466 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Dou Di Zhu (by IGS?)
 
diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c
index 98ba6d52292..d388332b77a 100644
--- a/src/mame/drivers/de_2.c
+++ b/src/mame/drivers/de_2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     DataEast/Sega Version 1 and 2
 
diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c
index b062271318c..1eb46caec69 100644
--- a/src/mame/drivers/de_3.c
+++ b/src/mame/drivers/de_3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     DataEast/Sega Version 3
 */
diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c
index b5539879dee..5dc9be6435a 100644
--- a/src/mame/drivers/de_3b.c
+++ b/src/mame/drivers/de_3b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     DataEast/Sega Version 3b
 */
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 8b2fb6edbd5..c9f9034b55c 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dead Angle                          (c) 1988 Seibu Kaihatsu
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 7c4b863e470..7cfa1af315f 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Data East 16 bit games - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 89abd6e489a..f66b9355835 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Various Data East 8 bit games:
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 6790bf98ae8..e25d68eae9f 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     (Some) Data East 32 bit 156 CPU ARM based games:
 
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index e1cbc84b339..fb786d18270 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Data East 32 bit ARM based games:
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 0e67d45d7f3..6811796270f 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Data East MLC Hardware:
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index d7c44e2c244..80052fdf4a0 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***********************************************************************
 
     DECO Cassette System driver
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 8a3b09d11e2..91c29f63627 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Deniam games
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 191e5704251..0ae8ec9d2a9 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Destroyer Driver
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index f3c96df0142..08a0c2af6ec 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
  dgPIX VRender0 hardware
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 3e8d714ec7c..2cc87b3b5f6 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Diet Go Go
 
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index e60bbe4fb10..608b4a6ecb4 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
        Disco Boy
 
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index cf83617fe3f..860843c9ee8 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Diver Boy
  (c)1992 Device Electronics
 
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index cc925f41a0f..25ec4978712 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 DJ Boy (c)1989 Kaneko
 
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 91816b8e6ef..19248484d93 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Beatmania DJ Main Board (GX753)
  *
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index d3d19d933dd..25c2184f4a6 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo Donkey Kong hardware
diff --git a/src/mame/drivers/dlair2.c b/src/mame/drivers/dlair2.c
index 23bdbbb480a..bd2b8a9ae21 100644
--- a/src/mame/drivers/dlair2.c
+++ b/src/mame/drivers/dlair2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Skeleton driver for Dragon's Lair II: Time Warp
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 68f036e475f..e1dea69a5b8 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mr. Do's Castle memory map (preliminary)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 06a778d64b0..0a91287fb41 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Acrobatic Dog-Fight / Batten O'hara no Sucha-Raka Kuuchuu Sen
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 6e936f7815e..be32fd85742 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
      Domino Block
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 9a0e99828c8..6f72fc5cde6 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Dooyong games
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index 00681a9a9dc..58bfbb70549 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Dorachan (Dora-Chan ?) (c) 1980 Craul Denshi
 Driver by Tomasz Slanina
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index 49ed44d8890..9b40ca5f818 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Dottori Kun (Head On's mini game)
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 69ec3788550..ba303d23bc7 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Drag Race Driver
diff --git a/src/mame/drivers/dreambal.c b/src/mame/drivers/dreambal.c
index 0dbb573189a..3f2dd133f48 100644
--- a/src/mame/drivers/dreambal.c
+++ b/src/mame/drivers/dreambal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Dream Ball
 
 PCB DE-0386-2
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index d74a38ed0ac..83dd21e54d8 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     SemiCom 68020 based hardware
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 7d885e2a883..b53c47cfb81 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Dragon Master (c)1994 Unico
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 8c494c516dd..9d909dd690e 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Dr. Micro (c) 1983 Sanritsu
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 0af63b5296c..6868aace82d 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Dr. Tomy    -   (c) 1993 Playmark
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index 66535ec71b8..63606a2ae1c 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
 
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 1f2452a0370..2315f629724 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************************************************
 
 Mahjong Dunhuang (C)1995 Spirit
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 67dbfef7602..15735017a57 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Dwarfs Den by Electro-Sport
   http://www.arcadeflyers.net/?page=flyerdb&subpage=thumbs&id=3993
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index f11f830a13b..0cd846deaa8 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Dynamic Dice (??)
 
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 6abb317316e..bbc30f9313e 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************************************************
 
 Some Dynax games using the second version of their blitter
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index f7e23e14eac..78fb82c2c86 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dynamite Duke                       (c) 1989 Seibu Kaihatsu/Fabtek
diff --git a/src/mame/drivers/ecoinf1.c b/src/mame/drivers/ecoinf1.c
index 28b0162ca1c..10d3f917e79 100644
--- a/src/mame/drivers/ecoinf1.c
+++ b/src/mame/drivers/ecoinf1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Electrocoin Older (original?) HW type
 
   this appears to be the earliest of the Electrocoin hardware
diff --git a/src/mame/drivers/ecoinf2.c b/src/mame/drivers/ecoinf2.c
index 7709eda95b0..735b2a1d7fe 100644
--- a/src/mame/drivers/ecoinf2.c
+++ b/src/mame/drivers/ecoinf2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Electrocoin 'OXO' hardware type (Phoenix?)
 
  at least some of these are multiple part cabs, with both top and bottom units all linked together
diff --git a/src/mame/drivers/ecoinf3.c b/src/mame/drivers/ecoinf3.c
index 556e8c528d2..13082451168 100644
--- a/src/mame/drivers/ecoinf3.c
+++ b/src/mame/drivers/ecoinf3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Electrocoin Pyramid HW type */
 
 // this seems to not like our Z180 timers much? (or wants a 10ms interrupt externally?)
diff --git a/src/mame/drivers/ecoinfr.c b/src/mame/drivers/ecoinfr.c
index 9eccedc9a6c..ed2aec706a6 100644
--- a/src/mame/drivers/ecoinfr.c
+++ b/src/mame/drivers/ecoinfr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Electrocoin Fruit Machines
 
  This seems to be the most common Electrocoin hardware type, used
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 9ff37887e32..a7d269b100b 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Egg Hunt
diff --git a/src/mame/drivers/electra.c b/src/mame/drivers/electra.c
index 690d1769a31..e72e3daf508 100644
--- a/src/mame/drivers/electra.c
+++ b/src/mame/drivers/electra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Electra discrete hardware games
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index 30d39b4dd6b..b4c7ac4a36d 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cinematronics Embargo driver
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index c64965c982b..9f4d74451ce 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Enigma 2 (c) Zilec Electronics
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 77fd106bc83..bb686dae49a 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
  Eolith 32 bits hardware: Gradation 2D system
 
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 8b5b676ea0f..de3a2c65e77 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
  Eolith 16 bits hardware
diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c
index b4653f5959d..217b6c9519d 100644
--- a/src/mame/drivers/eolithsp.c
+++ b/src/mame/drivers/eolithsp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Eolith Speedup Handling */
 
 /*
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index f3b133f6ef1..7b380a3378c 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Epos games
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 275484db355..6f173ecdfa9 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 Equites           (c) 1984 Alpha Denshi Co./Sega   8303
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 573142275a3..85b9ad8e40b 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= ESD 16 Bit Games =-
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 8ab03545a04..7075edd7354 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Funai / Gakken Esh's Aurunmilla laserdisc hardware
 Driver by Andrew Gardner with help from Daphne Source
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index c0c1313addb..d2d09db332b 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Espial hardware games
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index b7a22e712f4..a6e4a21ecdd 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Entertainment Sciences Real-Time Image Processor (RIP) hardware
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index bfdaee6a80f..56ca6f12909 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Enerdyne Technologies Inc. (El Cajon, CA 92020) hardware
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 96adad8fba3..d52ea48f33c 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exed Exes
diff --git a/src/mame/drivers/exidyttl.c b/src/mame/drivers/exidyttl.c
index cfa770c1220..3ae5c1b0044 100644
--- a/src/mame/drivers/exidyttl.c
+++ b/src/mame/drivers/exidyttl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Exidy discrete hardware games
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index f56c061bf2f..604e9dad1fe 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
    Kaneko EXPRO-02 board
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index cf596f2a4d8..fc4035cde2f 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Express Raider - (c) 1986 Data East Corporation / Data East USA
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index bf67ecc069a..e5f963eb350 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Gottlieb Exterminator hardware
diff --git a/src/mame/drivers/extrema.c b/src/mame/drivers/extrema.c
index 417c16033fe..b2eb8f04091 100644
--- a/src/mame/drivers/extrema.c
+++ b/src/mame/drivers/extrema.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Extrema Russian Video Fruit Machines */
 /*
   Appear to be Z80 based, some rom scramble?
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index aadc8c0a47f..7f93b9f8d50 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Exzisus
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index e6814e8954a..b36fa23ef2b 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
  F-E1-32 driver
@@ -6,11 +8,25 @@
  Supported Games      PCB-ID
  ----------------------------------
  Mosaic               F-E1-32-009
+ Royal Poker 2        F-E1-32N-COM9e
 
  driver by Pierpaolo Prazzoli
 
 *********************************************************************/
 
+/*
+royalpk2 : to get 'secret. OK.'
+
+0002D92C: MOV L18, L29
+0002D92E: CMPI L18, $1
+0002D930: BNE $2d94c
+
+go 2d92c
+do l29 = 1
+f5
+
+*/
+
 #include "emu.h"
 #include "cpu/e132xs/e132xs.h"
 #include "machine/eepromser.h"
@@ -26,7 +42,7 @@ public:
 		m_videoram(*this, "videoram"){ }
 
 	/* devices */
-	required_device<e132xn_device>  m_maincpu;
+	required_device<hyperstone_device>  m_maincpu;
 
 	/* memory pointers */
 	required_shared_ptr<UINT32> m_videoram;
@@ -134,6 +150,9 @@ static INPUT_PORTS_START( mosaicf2 )
 	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write)
 INPUT_PORTS_END
 
+
+
+
 static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
 
 	/* basic machine hardware */
@@ -143,6 +162,8 @@ static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
 	MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state,  irq0_line_hold)
 
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
+	MCFG_EEPROM_ERASE_TIME(attotime::from_usec(1))
+	MCFG_EEPROM_WRITE_TIME(attotime::from_usec(1))
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@@ -167,6 +188,85 @@ static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
 MACHINE_CONFIG_END
 
+
+
+static INPUT_PORTS_START( royalpk2 )
+	PORT_START("P1")
+
+	PORT_START("SYSTEM_P2")
+	PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen")
+	PORT_BIT( 0xff7fffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START( "EEPROMIN" )
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read)
+
+	PORT_START( "EEPROMOUT" )
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, di_write)
+
+	PORT_START( "EEPROMCLK" )
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, clk_write)
+
+	PORT_START( "EEPROMCS" )
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write)
+INPUT_PORTS_END
+
+
+
+static ADDRESS_MAP_START( royalpk2_map, AS_PROGRAM, 32, mosaicf2_state )
+	AM_RANGE(0x00000000, 0x003fffff) AM_RAM
+	AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_SHARE("videoram")
+	AM_RANGE(0x80000000, 0x807fffff) AM_ROM AM_REGION("user2",0)
+	AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( royalpk2_io, AS_IO, 32, mosaicf2_state )
+	AM_RANGE(0x4900, 0x4903) AM_READ_PORT("SYSTEM_P2")
+
+	AM_RANGE(0x4a00, 0x4a03) AM_READ_PORT("EEPROMIN")
+
+	AM_RANGE(0x6800, 0x6803) AM_WRITE_PORT("EEPROMCLK")
+	AM_RANGE(0x6900, 0x6903) AM_WRITE_PORT("EEPROMCS")
+	AM_RANGE(0x6a00, 0x6a03) AM_WRITE_PORT("EEPROMOUT")
+ADDRESS_MAP_END
+
+static MACHINE_CONFIG_START( royalpk2, mosaicf2_state )
+
+	/* basic machine hardware */
+	MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_50MHz)
+	MCFG_CPU_PROGRAM_MAP(royalpk2_map)
+	MCFG_CPU_IO_MAP(royalpk2_io)
+	MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state,  irq1_line_hold)
+
+	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
+	MCFG_EEPROM_ERASE_TIME(attotime::from_usec(1))
+	MCFG_EEPROM_WRITE_TIME(attotime::from_usec(1))
+
+	/* video hardware */
+	MCFG_SCREEN_ADD("screen", RASTER)
+	MCFG_SCREEN_REFRESH_RATE(60)
+	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+	MCFG_SCREEN_SIZE(512, 512)
+	MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 223)
+	MCFG_SCREEN_UPDATE_DRIVER(mosaicf2_state, screen_update_mosaicf2)
+	MCFG_SCREEN_PALETTE("palette")
+
+	MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette")
+
+	/* sound hardware */
+	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+//	MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */
+//	MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+//	MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+	MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, OKIM6295_PIN7_HIGH) /* 1.7897725 MHz */
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+	// there is a 16c550 for communication
+MACHINE_CONFIG_END
+
+
 /*
 
 Mosaic (c) 1999 F2 System
@@ -221,6 +321,9 @@ DRAML & DRAMU are GM71C18163CJ6
 
 ROM1 & SND are stardard 27C040 and/or 27C020 eproms
 L00-L03 & U00-U03 are 29F1610ML Flash roms
+
+
+todo: royalpk2 layout (it's very different)
 */
 
 ROM_START( mosaicf2 )
@@ -242,4 +345,21 @@ ROM_START( mosaicf2 )
 	ROM_LOAD( "snd.bin",             0x000000, 0x040000, CRC(4584589c) SHA1(5f9824724f840767c3dc1dc04b203ddf3d78b84c) )
 ROM_END
 
+ROM_START( royalpk2 )
+	ROM_REGION32_BE( 0x100000, "user1", ROMREGION_ERASE00 ) /* Hyperstone CPU Code */
+	/* 0 - 0x80000 empty */
+	ROM_LOAD( "prog1",            0x80000, 0x080000, CRC(e1546304) SHA1(b628b347ba7fbbae948e98e72aa5ea190c5d0f2b) )
+
+	ROM_REGION32_BE( 0x800000, "user2", 0 )  /* gfx data */
+	ROM_LOAD32_WORD_SWAP( "1.u00", 0x000000, 0x200000, CRC(b397a805) SHA1(3fafa8533c793f41d0567b76667d3f3478eb9c1d) )
+	ROM_LOAD32_WORD_SWAP( "2.l00", 0x000002, 0x200000, CRC(83a67d20) SHA1(9bf4c3da0cd1aab2488f260f694493d8ee25883e) )
+	ROM_LOAD32_WORD_SWAP( "3.u01", 0x400000, 0x200000, CRC(f7b9d508) SHA1(5d98687c6cf158df8134d88d3726778d3762b411) )
+	ROM_LOAD32_WORD_SWAP( "4.l01", 0x400002, 0x200000, CRC(dcff4960) SHA1(f742c7a3b62262c4b0210db9df03f51b3f600bf2) )
+
+	ROM_REGION( 0x80000, "oki", 0 ) /* Oki Samples */
+	ROM_LOAD( "snd2",             0x000000, 0x080000, CRC(f25e3315) SHA1(ce5350ecba6769b17bb01d82b55f26ded4d51773) )
+ROM_END
+
+
 GAME( 1999, mosaicf2, 0, mosaicf2, mosaicf2, driver_device, 0,        ROT0, "F2 System", "Mosaic (F2 System)", GAME_SUPPORTS_SAVE )
+GAME( 1999, royalpk2, 0, royalpk2, royalpk2, driver_device, 0,        ROT0, "F2 System", "Royal Poker 2 (Network version 3.12)", GAME_NOT_WORKING )
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 278ca0602d9..bda2961a0ec 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     F-1 Grand Prix       (c) 1991 Video System Co.
diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c
index 727b54a7f4c..512dae55220 100644
--- a/src/mame/drivers/famibox.c
+++ b/src/mame/drivers/famibox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo FamicomBox
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 406f74c6abc..68bdcb7c94f 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************
 
                       -= Electronic Devices / International Games =-
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index f42185acea5..6150a1e1afb 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Fast Freddie/Jump Coaster hardware
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 85b002382bc..1a353daaeb9 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fast Lane (GX752) (c) 1987 Konami
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 616da0691ed..e4471acdbbf 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Field Combat (c)1985 Jaleco
 
     TS 2004.10.22. analog[at]op.pl
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index baf11ea6a11..75908d7b33f 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Final Crash & other CPS1 bootlegs */
 
 /*
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 804a3228031..cdeae34d78f 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Field Goal driver
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 00e1cccaccc..cd25bf8f542 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Finalizer (GX523) (c) 1985 Konami
diff --git a/src/mame/drivers/fireball.c b/src/mame/drivers/fireball.c
index f30a2404fa6..9c4c7135b7e 100644
--- a/src/mame/drivers/fireball.c
+++ b/src/mame/drivers/fireball.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:ANY
 /***********************************************************************************
 
     fireball.c
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 6cbc0d785a9..6d109ce685f 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Konami FireBeat
 
     Driver by Ville Linde
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index 0880a380334..389752aa85c 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Fire Fox hardware
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 009cd4677ae..f5296c3c3d1 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Fire Trap memory map
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 6b0c67883dd..66943308872 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Fire Truck + Super Bug + Monte Carlo driver
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 6caa4dc30f2..eafbf01277a 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Fit of Fighting / The History of Martial Arts / 'BB' */
 
 /* NIX or Novatecnia (both spanish) may have produced these
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 77050aaf3b1..ac01de7f3b0 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Flak Attack / MX5000 (Konami GX669)
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index b32b0c77176..45c4c5e2abe 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Flower (c)1986 Komax (USA license)
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index ea264722867..6857112a260 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     The FairyLand Story
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index d60b1dcdbc2..92b5378f211 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Flyball Driver
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 26fd033c52e..0f2944ae667 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Free Kick  - (c) 1987 Sega / Nihon System (made by Nihon, licensed to Sega)
diff --git a/src/mame/drivers/fresh.c b/src/mame/drivers/fresh.c
index 2f169c052a9..e99a340d403 100644
--- a/src/mame/drivers/fresh.c
+++ b/src/mame/drivers/fresh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
 
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 49cda837386..66a792d8958 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Video System Mahjong series.
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index 5a6ed36500a..47ed878d65a 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Video System Mahjong series.
diff --git a/src/mame/drivers/fruitpc.c b/src/mame/drivers/fruitpc.c
index 82fabb5f5ac..5b79247d238 100644
--- a/src/mame/drivers/fruitpc.c
+++ b/src/mame/drivers/fruitpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************
 
   "Fruit Land" (c) ????
diff --git a/src/mame/drivers/fungames.c b/src/mame/drivers/fungames.c
index c49c9e0fcb4..71db6236c3c 100644
--- a/src/mame/drivers/fungames.c
+++ b/src/mame/drivers/fungames.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Fun Games discrete hardware games
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 9b19f67873e..32882290944 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Funky Bee/Sky Lancer memory map (preliminary)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 845337af97e..9ee07da7421 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Funky Jet                               (c) 1992 Data East / Mitchell Corporation
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 71aef33b480..aa3c665fc9e 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
   Fun World / TAB / Impera
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 1173d628dbb..71fbbc9e20d 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Funny Bubble ...
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index f680191ba08..04224c9100b 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Fuuki 16 Bit Games =-
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 60fc54758f3..c39c4cf434a 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Fuuki 32 Bit Games (FG-3) =-
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 3d1b0ce0cd5..9717fffc464 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gaelco game hardware from 1991-1996
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index 761e50e68ce..74438a2b3fc 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gaelco CG-1V/GAE1 based games
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index ffd18e4b22c..3a70f0efed0 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ninja Gaiden memory map (preliminary)
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index e808434ce9a..3a0989404d6 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Galaxian 3
 
   -- bootable driver --
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 8a01db75614..33c05557f63 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Bosconian  (c) 1981 Namco
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index 89dd0d0fba4..d01823ac871 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Galactic Storm
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index cccce066a9c..1ba6a4abb77 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Galaxi (C)2000 B.R.L.
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index 317f2fe5392..9ddb0e1805d 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Galaxia
 
 Galaxia by Zaccaria (1979)
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 6f58a9f0582..bea017f7756 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Galaxian/Moon Cresta hardware
diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c
index 663e85606cc..a5c3c751274 100644
--- a/src/mame/drivers/galgame.c
+++ b/src/mame/drivers/galgame.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Galaxy Game
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 8c0150ac1a5..be4b57814a4 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 TODO:
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 022b9b866f7..658aec4a182 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/***************************************************************************
 
 	                        -= Gals Panic II =-
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 6a6f215a955..099aee7dab0 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Gals Panic 3
     (c) Kaneko 1995
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 590618aa5d1..e0c2b835892 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Gals Panic       1990 Kaneko
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 27790a1cc46..c6ccf35e11a 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Hot Pinball
diff --git a/src/mame/drivers/gambl186.c b/src/mame/drivers/gambl186.c
index 31befac7a27..0881f4aae95 100644
--- a/src/mame/drivers/gambl186.c
+++ b/src/mame/drivers/gambl186.c
@@ -1,6 +1,11 @@
-/* Unknown Gambling game with 186 CPU */
+// license:???
+// copyright-holders:???
+/***********************************************************************************
 
-/*
+  Multi Game - EGD
+  Poker - Roulette - Black Jack - Bingo
+
+************************************************************************************
 
 80186xl20   Xtal 40Mhz
 At89c52 (not dumped) with external 32K ram?? Xtal 11.xxx18Mhz
@@ -31,10 +36,11 @@ In order to get the game to run, follow these steps:
 - reset machine (press 'F3')
 
 TODO:
-- inputs needs overhaul, namely fix coins and games enable (right now only Bingo 10 is enabled);
 - watchdog (service mode claims that there's one at the end of the aforementioned procedure);
+- fix the poker game (casino 10). seems lack of watchdog.
 - sound;
-*/
+
+***********************************************************************************/
 
 
 
@@ -253,9 +259,9 @@ static ADDRESS_MAP_START( gambl186_io, AS_IO, 16, gambl186_state )
 	AM_RANGE(0x0504, 0x0505) AM_READ_PORT("IN2")
 
 	//AM_RANGE(0x0500, 0x050f) AM_READ(unk_r)
-	AM_RANGE(0x0580, 0x0581) AM_READ_PORT("DSW0")
-	AM_RANGE(0x0582, 0x0583) AM_READ_PORT("DSW1")
-	AM_RANGE(0x0584, 0x0585) AM_READ_PORT("DSW2") AM_WRITENOP // ???
+	AM_RANGE(0x0580, 0x0581) AM_READ_PORT("DSW1")
+	AM_RANGE(0x0582, 0x0583) AM_READ_PORT("JOY")
+	AM_RANGE(0x0584, 0x0585) AM_READ_PORT("DSW0") AM_WRITENOP // Watchdog: bit 8
 	AM_RANGE(0x0600, 0x0603) AM_WRITENOP // lamps
 	AM_RANGE(0x0680, 0x0683) AM_READWRITE(comms_r, comms_w)
 	AM_RANGE(0x0700, 0x0701) AM_WRITE(data_bank_w)
@@ -265,274 +271,78 @@ ADDRESS_MAP_END
 
 static INPUT_PORTS_START( gambl186 )
 	PORT_START("IN0")
-	PORT_DIPNAME( 0x01, 0x01, "0-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )
 	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )
 	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )
 	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_START1 )
-	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("-") // Unknown meaning
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER )  PORT_NAME("-")  PORT_CODE(KEYCODE_2)  // Unknown meaning
 
 	PORT_START("IN1")
-	PORT_DIPNAME( 0x01, 0x01, "1-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0100, 0x0100, "1-2" )
-	PORT_DIPSETTING(    0x0100, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0200, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0400, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0800, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x1000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x2000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x8000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN5 )  PORT_CODE(KEYCODE_9)
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN3 )
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN6 )  PORT_CODE(KEYCODE_0)
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_COIN4 )
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Key")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
 	PORT_START("IN2")
-	PORT_DIPNAME( 0x01, 0x01, "2-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	/* TODO: order isn't honored */
-	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN3 )
-	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN4 )
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_COIN5 )
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_COIN6 )
-	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN )
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER )  PORT_NAME("- Aux")  PORT_CODE(KEYCODE_3)  // Unknown meaning
+	PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("JOY")
+	PORT_BIT( 0x01ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_4WAY
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_4WAY
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_4WAY
+	PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW0")
-	PORT_DIPNAME( 0x01, 0x01, "0-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0100, 0x0100, "0-2" )
-	PORT_DIPSETTING(    0x0100, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0200, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0400, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0800, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x1000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
+	PORT_BIT( 0x0fff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_SERVICE(0x1000, IP_ACTIVE_LOW )               PORT_DIPLOCATION("SW1:4")
+	PORT_DIPNAME( 0x2000, 0x0000, "Casino 10 Game" )   PORT_DIPLOCATION("SW1:3")
 	PORT_DIPSETTING(    0x2000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x4000, 0x4000, "Bookkeeping" )      PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x8000, 0x8000, "SW1-1" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x8000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
 
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x01, 0x01, "1-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0100, 0x0100, "1-2" )
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_DIPNAME( 0x0100, 0x0100, "SW2-4" )            PORT_DIPLOCATION("SW2:4")
 	PORT_DIPSETTING(    0x0100, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x0200, 0x0200, "SW2-3" )            PORT_DIPLOCATION("SW2:3")
 	PORT_DIPSETTING(    0x0200, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x0400, 0x0400, "SW2-2" )            PORT_DIPLOCATION("SW2:2")
 	PORT_DIPSETTING(    0x0400, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0800, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x0800, 0x0800, "VGA Mode" )         PORT_DIPLOCATION("SW2:1")
+	PORT_DIPSETTING(    0x0800, "640x480" )
+	PORT_DIPSETTING(    0x0000, "640x240" )
+	PORT_DIPNAME( 0x1000, 0x0000, "Roulette Game" )    PORT_DIPLOCATION("SW2:5")
 	PORT_DIPSETTING(    0x1000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x2000, 0x2000, "SW2-6" )            PORT_DIPLOCATION("SW2:6")
 	PORT_DIPSETTING(    0x2000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x4000, 0x0000, "Black Jack Game" )  PORT_DIPLOCATION("SW2:7")
 	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x8000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-
-	PORT_START("DSW2")
-	PORT_DIPNAME( 0x01, 0x01, "2-1" )
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0100, 0x0100, "2-2" )
-	PORT_DIPSETTING(    0x0100, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0200, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0400, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x0800, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_SERVICE(0x1000, IP_ACTIVE_LOW )
-
-	PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x2000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x4000, 0x4000, "Bookkeeping" )
-	PORT_DIPSETTING(    0x4000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x8000, 0x8000, "SW2-8" )            PORT_DIPLOCATION("SW2:8")
 	PORT_DIPSETTING(    0x8000, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
 
@@ -541,7 +351,7 @@ INPUT_PORTS_END
 
 
 static MACHINE_CONFIG_START( gambl186, gambl186_state )
-	MCFG_CPU_ADD("maincpu", I80186, XTAL_40MHz/2)
+	MCFG_CPU_ADD("maincpu", I80186, XTAL_40MHz)
 	MCFG_CPU_PROGRAM_MAP(gambl186_map)
 	MCFG_CPU_IO_MAP(gambl186_io)
 
@@ -552,7 +362,6 @@ MACHINE_CONFIG_END
 
 
 
-
 ROM_START( gambl186 )
 	ROM_REGION( 0x100000, "data", 0 )
 	ROM_LOAD16_BYTE( "ie398.u11", 0x00000, 0x80000, CRC(86ad7cab) SHA1(b701c3701db630d218a9b1700f216f795a1b1272) )
@@ -580,6 +389,5 @@ ROM_START( gambl186a )
 ROM_END
 
 
-/* TODO: proper title, at least sub-label all games inside it. */
-GAME( 1997, gambl186,  0,        gambl186,   gambl186, driver_device,   0,       ROT0,  "EGD", "Multi Game - Bingo 10 (V398)",         GAME_NOT_WORKING | GAME_NO_SOUND )
-GAME( 199?, gambl186a, gambl186, gambl186,   gambl186, driver_device,   0,       ROT0,  "EGD", "Multi Game - Bingo 10 (V399)",         GAME_NOT_WORKING | GAME_NO_SOUND )
+GAME( 1997, gambl186,  0,        gambl186,   gambl186, driver_device,   0,   ROT0,  "EGD", "Multi Game (V398)",  GAME_NOT_WORKING | GAME_NO_SOUND )
+GAME( 199?, gambl186a, gambl186, gambl186,   gambl186, driver_device,   0,   ROT0,  "EGD", "Multi Game (V399)",  GAME_NOT_WORKING | GAME_NO_SOUND )
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 06408abc5a0..d743b6d66d2 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Cristaltec "Game Cristal" (MAME bootleg)
 
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 7758dcfb924..8f95a842ad6 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 GAME PLAN driver
diff --git a/src/mame/drivers/gammagic.c b/src/mame/drivers/gammagic.c
index d9a320d5926..63b061a01cb 100644
--- a/src/mame/drivers/gammagic.c
+++ b/src/mame/drivers/gammagic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************
 
 Game Magic (c) 1997 Bally Gaming Co.
diff --git a/src/mame/drivers/gamtor.c b/src/mame/drivers/gamtor.c
index 67dc46c0a1f..2f5338b8f6b 100644
--- a/src/mame/drivers/gamtor.c
+++ b/src/mame/drivers/gamtor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Novomatic CoolFire I */
 /* Austrian gaming system - used late 2002 - early 2008? */
 
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index f36c313ac49..e9624191393 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Galaga 3 / Gaplus (c) 1984 Namco
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 69f7a57cfce..7821445f515 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
     GAME-A-TRON gambling hardware
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index af4a104987c..21862fff6d9 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Green Beret
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index 4c4c7f05096..dea8a95e55d 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Grand Cross Pinball
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 42abfaf9c24..73c68e8ddad 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Greyhound Electronics Inc. hardware
diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c
index 089f4a94e55..8382a38b4e7 100644
--- a/src/mame/drivers/ggconnie.c
+++ b/src/mame/drivers/ggconnie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Go! Go! Connie chan Jaka Jaka Janken
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 442f22ff9be..37ce354bf73 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
 Eolith Ghost Hardware driver
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 96aae29fdb0..4522c31aeeb 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     G.I. Joe  (c) 1992 Konami
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 524594bb12a..6977459dd7a 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             Ginga NinkyouDen
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 8f8fb0c37da..5170c1a38c9 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ping Pong King  (c) Taito 1985
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 3e78bfe110b..50224940072 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Glass (c) 1993 Gaelco (Developed by OMK. Produced by Gaelco)
diff --git a/src/mame/drivers/globalfr.c b/src/mame/drivers/globalfr.c
index 007aa1e6063..f4b03907bfa 100644
--- a/src/mame/drivers/globalfr.c
+++ b/src/mame/drivers/globalfr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
   Global Games 'Stealth' Hardware
diff --git a/src/mame/drivers/globalvr.c b/src/mame/drivers/globalvr.c
index b807a97e6a2..a5052c251a8 100644
--- a/src/mame/drivers/globalvr.c
+++ b/src/mame/drivers/globalvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Global VR - PC-Based Hardware
 
 Skeleton only at this time holding info regarding Install Disks
diff --git a/src/mame/drivers/gluck2.c b/src/mame/drivers/gluck2.c
index 06b0ee36794..67011f5a0ab 100644
--- a/src/mame/drivers/gluck2.c
+++ b/src/mame/drivers/gluck2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Good Luck II
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 8aabeb776c8..39dbdccc562 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ghosts'n Goblins
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 2fdc83e0ce9..5f928d9df02 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Go 2000 - Korean Card game
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index d29089d12c3..09fd8f68558 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Goal! '92
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 367c2d4be58..905e0ff85dc 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   GOINDOL
 
diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c
index 7e2a6a9d317..31a111738a4 100644
--- a/src/mame/drivers/goldngam.c
+++ b/src/mame/drivers/goldngam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   GOLDEN GAMES / C+M TECHNICS AG
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 568e68e1385..a94faf66eda 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************
 
   GOLDEN POKER DOUBLE UP (BONANZA ENTERPRISES, LTD)
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index cf6c19225cd..4b2fc4eb55e 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Golden Star
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 509bf707e22..9cbbed6426f 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Gomoku Narabe Renju
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index c20c84e2b03..c4276f09cad 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   'Good' Driver by David Haywood
   todo: finish inputs etc.
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index c3b531b229b..c09c2e56057 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************
 
 Seibu Mahjong games (distributed by Tecmo)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index c34f870ee23..206ad8fd286 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Gotcha  (c) 1997 Dongsung
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index ab1f8a5711d..b79b243c868 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gottlieb hardware
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 570f04dfaa3..e43d98c5e8a 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Gotya / The Hand driver by Zsolt Vasvari
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 6f837de39a7..19bca306c2e 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Sega GP World hardware
 Driver by Andrew Gardner with help from Daphne Source.
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 9de09363f20..ef9884e6d09 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gradius 3 (GX945) (c) 1989 Konami
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index cbe64dfa653..7ed7fbac1c7 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Grand Champion
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index ba0abaf8ad6..d7e8f923f16 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ground Effects / Super Ground FX                    (c) 1993 Taito
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index a0899f0ec8c..39e0aaf4df8 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
     G-Stream (c)2002 Oriental Soft Japan
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 3e6b2f52291..58a75990dfa 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** DRIVER INFO **************************************************************
 
 Grand Striker, V Goal Soccer, World Cup '94
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index bcc33c10310..d08054a4b76 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Great Swordsman (Taito) 1984
     Joshi Volleyball (Taito) 1983
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 7cb9b3c6ff9..5b585f315b9 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Konami GTI Club System
 
     Driver by Ville Linde
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 767a013007b..0ea1c4b13ce 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     JPM Give us a Break hardware
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 686335c8341..5dcbdcb6ab8 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Gumbo (c)1994 Min Corp (Main Corp written on PCB)
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 745fe2dd9dc..b32bfd9c044 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Gunbuster (c) 1992 Taito
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index 3ed2ba7e597..b59ecb7f686 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Gun Dealer memory map
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 46359c95f4f..9897e673166 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gun.Smoke
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 8dd48f0f2d1..25f10ded9e4 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Gyruss memory map (preliminary)
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 2296988e3a7..631976c8a67 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Halley's Comet, 1986 Taito
 
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 82e62665b39..38224c0175c 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Hana Awase driver by Zsolt Vasvari
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 596a4930ea8..3f0dd16556c 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -347,14 +347,13 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
 			m_gsp(*this, "gsp"),
 			m_msp(*this, "msp"),
 			m_adsp(*this, "adsp"),
-			m_soundcpu(*this, "soundcpu"),
-			m_sounddsp(*this, "sounddsp"),
 			m_jsacpu(*this, "jsacpu"),
 			m_dsp32(*this, "dsp32"),
 			m_ds3sdsp(*this, "ds3sdsp"),
 			m_ds3xdsp(*this, "ds3xdsp"),
 			m_ds3dac1(*this, "ds3dac1"),
 			m_ds3dac2(*this, "ds3dac2"),
+			m_harddriv_sound(*this, "harddriv_sound"),
 			m_jsa(*this, "jsa"),
 			m_hd34010_host_access(0),
 			m_dsk_pio_access(0),
@@ -379,7 +378,6 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
 			m_ds3_speedup_addr(0),
 			m_ds3_speedup_pc(0),
 			m_ds3_transfer_pc(0),
-			m_sounddsp_ram(*this, "sounddsp_ram"),
 			m_gsp_multisync(0),
 			m_gsp_vram(*this, "gsp_vram", 16),
 			m_gsp_control_lo(*this, "gsp_control_lo"),
@@ -445,23 +443,11 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
 			m_st68k_sloop_bank(0),
 			m_st68k_last_alt_sloop_offset(0),
 			m_next_msp_sync(0),
-			m_soundflag(0),
-			m_mainflag(0),
-			m_sounddata(0),
-			m_maindata(0),
-			m_dacmute(0),
-			m_cramen(0),
-			m_irq68k(0),
-			m_sound_rom_offs(0),
-			m_rombase(0),
-			m_romsize(0),
-			m_last_bio_cycles(0),
 			m_vram_mask(0),
 			m_shiftreg_enable(0),
 			m_gsp_shiftreg_source(0),
 			m_gfx_finescroll(0),
 			m_gfx_palettebank(0),
-			m_dac(*this, "dac"),
 			m_duart(*this, "duartn68681"),
 			m_asic65(*this, "asic65"),
 			m_sound_int_state(0),
@@ -501,11 +487,6 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
 		m_dataval[i] = 0;
 	}
 
-	for (i = 0; i < 0x400 / 2; i++)
-	{
-		m_comram[i] = 0;
-	}
-
 	for (i = 0; i < 65536 * 4; i++)
 	{
 		m_mask_table[i] = 0;
@@ -745,50 +726,6 @@ static ADDRESS_MAP_START( dsk2_dsp32_map, AS_PROGRAM, 32, harddriv_state )
 ADDRESS_MAP_END
 
 
-
-/*************************************
- *
- *  Driver sound board memory maps
- *
- *************************************/
-
-static ADDRESS_MAP_START( driversnd_68k_map, AS_PROGRAM, 16, harddriv_state )
-	ADDRESS_MAP_UNMAP_HIGH
-	AM_RANGE(0x000000, 0x01ffff) AM_ROM
-	AM_RANGE(0xff0000, 0xff0fff) AM_READWRITE(hdsnd68k_data_r, hdsnd68k_data_w)
-	AM_RANGE(0xff1000, 0xff1fff) AM_READWRITE(hdsnd68k_switches_r, hdsnd68k_latches_w)
-	AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(hdsnd68k_320port_r, hdsnd68k_speech_w)
-	AM_RANGE(0xff3000, 0xff3fff) AM_READWRITE(hdsnd68k_status_r, hdsnd68k_irqclr_w)
-	AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(hdsnd68k_320ram_r, hdsnd68k_320ram_w)
-	AM_RANGE(0xff6000, 0xff7fff) AM_READWRITE(hdsnd68k_320ports_r, hdsnd68k_320ports_w)
-	AM_RANGE(0xff8000, 0xffbfff) AM_READWRITE(hdsnd68k_320com_r, hdsnd68k_320com_w)
-	AM_RANGE(0xffc000, 0xffffff) AM_RAM
-ADDRESS_MAP_END
-
-
-static ADDRESS_MAP_START( driversnd_dsp_program_map, AS_PROGRAM, 16, harddriv_state )
-	ADDRESS_MAP_UNMAP_HIGH
-	AM_RANGE(0x000, 0xfff) AM_RAM AM_SHARE("sounddsp_ram")
-ADDRESS_MAP_END
-
-
-/* $000 - 08F  TMS32010 Internal Data RAM in Data Address Space */
-
-static ADDRESS_MAP_START( driversnd_dsp_io_map, AS_IO, 16, harddriv_state )
-	AM_RANGE(0, 0) AM_READWRITE(hdsnddsp_rom_r, hdsnddsp_dac_w)
-	AM_RANGE(1, 1) AM_READ(hdsnddsp_comram_r)
-	AM_RANGE(2, 2) AM_READ(hdsnddsp_compare_r)
-	AM_RANGE(1, 2) AM_WRITENOP
-	AM_RANGE(3, 3) AM_WRITE(hdsnddsp_comport_w)
-	AM_RANGE(4, 4) AM_WRITE(hdsnddsp_mute_w)
-	AM_RANGE(5, 5) AM_WRITE(hdsnddsp_gen68kirq_w)
-	AM_RANGE(6, 7) AM_WRITE(hdsnddsp_soundaddr_w)
-	AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(hdsnddsp_get_bio)
-ADDRESS_MAP_END
-
-
-
-
 /*************************************
  *
  *  Port definitions
@@ -1663,32 +1600,6 @@ MACHINE_CONFIG_END
 
 
 
-/*************************************
- *
- *  Sound board pieces
- *
- *************************************/
-
-static MACHINE_CONFIG_FRAGMENT( driversnd )
-
-	/* basic machine hardware */
-	MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2)
-	MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
-
-	MCFG_CPU_ADD("sounddsp", TMS32010, XTAL_20MHz)
-	MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
-	/* Data Map is internal to the CPU */
-	MCFG_CPU_IO_MAP(driversnd_dsp_io_map)
-
-	/* sound hardware */
-	MCFG_SPEAKER_STANDARD_MONO("mono")
-
-	MCFG_DAC_ADD("dac")
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-MACHINE_CONFIG_END
-
-
-
 /*************************************
  *
  *  Machine drivers
@@ -1699,7 +1610,7 @@ static MACHINE_CONFIG_FRAGMENT( harddriv )
 	MCFG_FRAGMENT_ADD( driver_msp )
 	/* basic machine hardware */        /* original driver board with MSP */
 	MCFG_FRAGMENT_ADD( adsp )           /* ADSP board */
-	MCFG_FRAGMENT_ADD( driversnd )      /* driver sound board */
+	MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0)      /* driver sound board */
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_FRAGMENT( harddrivc )
@@ -1707,7 +1618,7 @@ static MACHINE_CONFIG_FRAGMENT( harddrivc )
 
 	/* basic machine hardware */        /* multisync board with MSP */
 	MCFG_FRAGMENT_ADD( adsp )           /* ADSP board */
-	MCFG_FRAGMENT_ADD( driversnd )      /* driver sound board */
+	MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0)      /* driver sound board */
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_FRAGMENT( racedriv )
@@ -1716,7 +1627,7 @@ static MACHINE_CONFIG_FRAGMENT( racedriv )
 	/* basic machine hardware */        /* original driver board without MSP */
 	MCFG_FRAGMENT_ADD( adsp )           /* ADSP board */
 	MCFG_FRAGMENT_ADD( dsk )            /* DSK board */
-	MCFG_FRAGMENT_ADD( driversnd )      /* driver sound board */
+	MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0)      /* driver sound board */
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_FRAGMENT( racedrivc )
@@ -1726,7 +1637,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc )
 	/* basic machine hardware */        /* multisync board without MSP */
 	MCFG_FRAGMENT_ADD( adsp )           /* ADSP board */
 	MCFG_FRAGMENT_ADD( dsk )            /* DSK board */
-	MCFG_FRAGMENT_ADD( driversnd )      /* driver sound board */
+	MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0)      /* driver sound board */
 MACHINE_CONFIG_END
 
 
@@ -1737,7 +1648,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc_panorama_side )
 	/* basic machine hardware */        /* multisync board without MSP */
 	MCFG_FRAGMENT_ADD( adsp )           /* ADSP board */
 //  MCFG_FRAGMENT_ADD( dsk )            /* DSK board */
-//  MCFG_FRAGMENT_ADD( driversnd )      /* driver sound board */
+//  MCFG_DEVICE_ADD("sound_board", HARDDRIV_SOUND_BOARD_DEVICE, 0)      /* driver sound board */
 MACHINE_CONFIG_END
 
 WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line)
@@ -2134,7 +2045,7 @@ ROM_START( harddriv )
 	ROM_LOAD16_BYTE( "136052-1111.200x", 0x0c0000, 0x010000, CRC(e1f455a3) SHA1(68462a33bbfcc526d8f27ec082e55937a26ead8b) )
 	ROM_LOAD16_BYTE( "136052-1119.210x", 0x0c0001, 0x010000, CRC(a7fc3aaa) SHA1(ce8d4a8f83e25008cafa2a2242ed26b90b8517da) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2144,7 +2055,7 @@ ROM_START( harddriv )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2170,7 +2081,7 @@ ROM_START( harddrivg )
 	ROM_LOAD16_BYTE( "136052-4211.200x", 0x0c0000, 0x010000, CRC(20d1b3d5) SHA1(b7c4a2cf6ba729530c24980704989b3a3efb343b) )
 	ROM_LOAD16_BYTE( "136052-4219.210x", 0x0c0001, 0x010000, CRC(105e7052) SHA1(a8d13c35418e58410cfd74c243b74963f1553068) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2180,7 +2091,7 @@ ROM_START( harddrivg )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2207,7 +2118,7 @@ ROM_START( harddrivj )
 	ROM_LOAD16_BYTE( "136052-6811.200x", 0x0c0000, 0x010000, CRC(7bc5c8da) SHA1(ac228d6391bc9ac4238f953f9ad6eb93b3ff9958) )
 	ROM_LOAD16_BYTE( "136052-6819.210x", 0x0c0001, 0x010000, CRC(368b7e17) SHA1(e8742edec6961173df4450073a427cf3b9f3ff57) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2217,7 +2128,7 @@ ROM_START( harddrivj )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2242,7 +2153,7 @@ ROM_START( harddrivb )
 	ROM_LOAD16_BYTE( "136052-5911.200x", 0x0c0000, 0x010000, CRC(564ac427) SHA1(f71d5a8d06681fc96e753e7cd18e16b32ba6907f) )
 	ROM_LOAD16_BYTE( "136052-5919.210x", 0x0c0001, 0x010000, CRC(752d9a6d) SHA1(28edb54c7217f5ccdcb2b5614d4e8c2290d96b2a) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2252,7 +2163,7 @@ ROM_START( harddrivb )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2277,7 +2188,7 @@ ROM_START( harddrivb6 )
 	ROM_LOAD16_BYTE( "136052-5911.200x", 0x0c0000, 0x010000, CRC(564ac427) SHA1(f71d5a8d06681fc96e753e7cd18e16b32ba6907f) )
 	ROM_LOAD16_BYTE( "136052-5919.210x", 0x0c0001, 0x010000, CRC(752d9a6d) SHA1(28edb54c7217f5ccdcb2b5614d4e8c2290d96b2a) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2287,7 +2198,7 @@ ROM_START( harddrivb6 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2314,7 +2225,7 @@ ROM_START( harddrivj6 )
 	ROM_LOAD16_BYTE( "136052-6811.200x", 0x0c0000, 0x010000, CRC(7bc5c8da) SHA1(ac228d6391bc9ac4238f953f9ad6eb93b3ff9958) )
 	ROM_LOAD16_BYTE( "136052-6819.210x", 0x0c0001, 0x010000, CRC(368b7e17) SHA1(e8742edec6961173df4450073a427cf3b9f3ff57) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2324,7 +2235,7 @@ ROM_START( harddrivj6 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2349,7 +2260,7 @@ ROM_START( harddrivb5 )
 	ROM_LOAD16_BYTE( "136052-5911.200x", 0x0c0000, 0x010000, CRC(564ac427) SHA1(f71d5a8d06681fc96e753e7cd18e16b32ba6907f) )
 	ROM_LOAD16_BYTE( "136052-5919.210x", 0x0c0001, 0x010000, CRC(752d9a6d) SHA1(28edb54c7217f5ccdcb2b5614d4e8c2290d96b2a) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2359,7 +2270,7 @@ ROM_START( harddrivb5 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2384,7 +2295,7 @@ ROM_START( harddrivg4 )
 	ROM_LOAD16_BYTE( "136052-4211.200x", 0x0c0000, 0x010000, CRC(20d1b3d5) SHA1(b7c4a2cf6ba729530c24980704989b3a3efb343b) )
 	ROM_LOAD16_BYTE( "136052-4219.210x", 0x0c0001, 0x010000, CRC(105e7052) SHA1(a8d13c35418e58410cfd74c243b74963f1553068) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2394,7 +2305,7 @@ ROM_START( harddrivg4 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2419,7 +2330,7 @@ ROM_START( harddriv3 )
 	ROM_LOAD16_BYTE( "136052-1111.200x", 0x0c0000, 0x010000, CRC(e1f455a3) SHA1(68462a33bbfcc526d8f27ec082e55937a26ead8b) )
 	ROM_LOAD16_BYTE( "136052-1119.210x", 0x0c0001, 0x010000, CRC(a7fc3aaa) SHA1(ce8d4a8f83e25008cafa2a2242ed26b90b8517da) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2429,7 +2340,7 @@ ROM_START( harddriv3 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2454,7 +2365,7 @@ ROM_START( harddriv2 )
 	ROM_LOAD16_BYTE( "136052-1111.200x", 0x0c0000, 0x010000, CRC(e1f455a3) SHA1(68462a33bbfcc526d8f27ec082e55937a26ead8b) )
 	ROM_LOAD16_BYTE( "136052-1119.210x", 0x0c0001, 0x010000, CRC(a7fc3aaa) SHA1(ce8d4a8f83e25008cafa2a2242ed26b90b8517da) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2464,7 +2375,7 @@ ROM_START( harddriv2 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2489,7 +2400,7 @@ ROM_START( harddriv1 )
 	ROM_LOAD16_BYTE( "136052-1111.200x", 0x0c0000, 0x010000, CRC(e1f455a3) SHA1(68462a33bbfcc526d8f27ec082e55937a26ead8b) )
 	ROM_LOAD16_BYTE( "136052-1119.210x", 0x0c0001, 0x010000, CRC(a7fc3aaa) SHA1(ce8d4a8f83e25008cafa2a2242ed26b90b8517da) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-1121.45n", 0x000001, 0x008000, CRC(04316e6f) SHA1(9836b8d16cebd6013834432c9e5a5aca0050c889) )
 	ROM_LOAD16_BYTE( "136052-1122.70n", 0x000000, 0x008000, CRC(0c446eec) SHA1(53576c2800484d098cf250ab9a865314167c9d96) )
 
@@ -2499,7 +2410,7 @@ ROM_START( harddriv1 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-1125.45a", 0x020000, 0x010000, CRC(ebf391af) SHA1(3c4097db8d625b994b39d46fe652585a74378ca0) )
@@ -2524,7 +2435,7 @@ ROM_START( harddrivc )
 	ROM_LOAD16_BYTE( "136068-1114.200x", 0x0c0000, 0x010000, CRC(293c153b) SHA1(6300a50766b19ad203b5c7da28d51bf22054b39e) )
 	ROM_LOAD16_BYTE( "136068-1113.210x", 0x0c0001, 0x010000, CRC(5630390d) SHA1(cd1932cee70cddd1fb2110d1aeebb573a13f1339) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-3122.70n", 0x000000, 0x008000, CRC(3f20a396) SHA1(f34819796087c543083f6baac6c778e0cdb7340a) )
 	ROM_LOAD16_BYTE( "136052-3121.45n", 0x000001, 0x008000, CRC(6346bca3) SHA1(707dc86305142722a4757ba431cf6c7e9cf116b3) )
 
@@ -2534,7 +2445,7 @@ ROM_START( harddrivc )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -2559,7 +2470,7 @@ ROM_START( harddrivcg )
 	ROM_LOAD16_BYTE( "136068-1114.200x", 0x0c0000, 0x010000, CRC(293c153b) SHA1(6300a50766b19ad203b5c7da28d51bf22054b39e) )
 	ROM_LOAD16_BYTE( "136068-1113.210x", 0x0c0001, 0x010000, CRC(5630390d) SHA1(cd1932cee70cddd1fb2110d1aeebb573a13f1339) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-3122.70n", 0x000000, 0x008000, CRC(3f20a396) SHA1(f34819796087c543083f6baac6c778e0cdb7340a) )
 	ROM_LOAD16_BYTE( "136052-3121.45n", 0x000001, 0x008000, CRC(6346bca3) SHA1(707dc86305142722a4757ba431cf6c7e9cf116b3) )
 
@@ -2569,7 +2480,7 @@ ROM_START( harddrivcg )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -2594,7 +2505,7 @@ ROM_START( harddrivcb )
 	ROM_LOAD16_BYTE( "136068-2914.200x", 0x0c0000, 0x010000, CRC(dd2998a5) SHA1(36c71549d114309b9072ced83ed149cad1d23646) )
 	ROM_LOAD16_BYTE( "136068-2913.210x", 0x0c0001, 0x010000, CRC(a211754d) SHA1(b93d4867f664caa76f2170ef0934194de29a5516) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-3122.70n", 0x000000, 0x008000, CRC(3f20a396) SHA1(f34819796087c543083f6baac6c778e0cdb7340a) )
 	ROM_LOAD16_BYTE( "136052-3121.45n", 0x000001, 0x008000, CRC(6346bca3) SHA1(707dc86305142722a4757ba431cf6c7e9cf116b3) )
 
@@ -2604,7 +2515,7 @@ ROM_START( harddrivcb )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -2629,7 +2540,7 @@ ROM_START( harddrivc1 )
 	ROM_LOAD16_BYTE( "136068-1114.200x", 0x0c0000, 0x010000, CRC(293c153b) SHA1(6300a50766b19ad203b5c7da28d51bf22054b39e) )
 	ROM_LOAD16_BYTE( "136068-1113.210x", 0x0c0001, 0x010000, CRC(5630390d) SHA1(cd1932cee70cddd1fb2110d1aeebb573a13f1339) )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136052-3122.70n", 0x000000, 0x008000, CRC(3f20a396) SHA1(f34819796087c543083f6baac6c778e0cdb7340a) )
 	ROM_LOAD16_BYTE( "136052-3121.45n", 0x000001, 0x008000, CRC(6346bca3) SHA1(707dc86305142722a4757ba431cf6c7e9cf116b3) )
 
@@ -2639,7 +2550,7 @@ ROM_START( harddrivc1 )
 	ROM_LOAD16_BYTE( "136052-1102.10j", 0x020000, 0x010000, CRC(998d3da2) SHA1(6ed560c2132e33858c91b1f4ab0247399665b5fd) )
 	ROM_LOAD16_BYTE( "136052-1104.10l", 0x020001, 0x010000, CRC(bc59a2b7) SHA1(7dfde5bbaa0cf349b1ef5d6b076baded7330376a) )
 
-	ROM_REGION( 0x40000, "mainpcb:serialroms", 0 )      /* 4*128k for audio serial ROMs */
+	ROM_REGION( 0x40000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 4*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3126,7 +3037,7 @@ ROM_START( racedriv )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3140,7 +3051,7 @@ ROM_START( racedriv )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3177,7 +3088,7 @@ ROM_START( racedrivb )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3191,7 +3102,7 @@ ROM_START( racedrivb )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3228,7 +3139,7 @@ ROM_START( racedrivg )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3242,7 +3153,7 @@ ROM_START( racedrivg )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3279,7 +3190,7 @@ ROM_START( racedriv4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3293,7 +3204,7 @@ ROM_START( racedriv4 )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3330,7 +3241,7 @@ ROM_START( racedrivb4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3344,7 +3255,7 @@ ROM_START( racedrivb4 )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3381,7 +3292,7 @@ ROM_START( racedrivg4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3395,7 +3306,7 @@ ROM_START( racedrivg4 )
 	ROM_LOAD16_BYTE( "136077-4030.30e", 0x000000, 0x010000, CRC(4207c784) SHA1(5ec410bd75c281ac57d9856d08ce65431f3af994) )
 	ROM_LOAD16_BYTE( "136077-4031.10e", 0x000001, 0x010000, CRC(796486b3) SHA1(937e27c012c5fb457bee1b43fc8e075b3e9405b4) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3432,7 +3343,7 @@ ROM_START( racedriv3 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3446,7 +3357,7 @@ ROM_START( racedriv3 )
 	ROM_LOAD16_BYTE( "136077-1030.30e", 0x000000, 0x010000, CRC(ff575b3d) SHA1(7f2202db7ec9dac06499c9535b4852defb192eb3) )
 	ROM_LOAD16_BYTE( "136077-1031.10e", 0x000001, 0x010000, CRC(2ae2ac35) SHA1(e2a050a6e24dc6fef86b3556b69b2c3e2993febc) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3483,7 +3394,7 @@ ROM_START( racedriv2 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3497,7 +3408,7 @@ ROM_START( racedriv2 )
 	ROM_LOAD16_BYTE( "136077-1030.30e", 0x000000, 0x010000, CRC(ff575b3d) SHA1(7f2202db7ec9dac06499c9535b4852defb192eb3) )
 	ROM_LOAD16_BYTE( "136077-1031.10e", 0x000001, 0x010000, CRC(2ae2ac35) SHA1(e2a050a6e24dc6fef86b3556b69b2c3e2993febc) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3534,7 +3445,7 @@ ROM_START( racedriv1 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3548,7 +3459,7 @@ ROM_START( racedriv1 )
 	ROM_LOAD16_BYTE( "136077-1030.30e", 0x000000, 0x010000, CRC(ff575b3d) SHA1(7f2202db7ec9dac06499c9535b4852defb192eb3) )
 	ROM_LOAD16_BYTE( "136077-1031.10e", 0x000001, 0x010000, CRC(2ae2ac35) SHA1(e2a050a6e24dc6fef86b3556b69b2c3e2993febc) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3585,7 +3496,7 @@ ROM_START( racedrivg1 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3599,7 +3510,7 @@ ROM_START( racedrivg1 )
 	ROM_LOAD16_BYTE( "136077-1030.30e", 0x000000, 0x010000, CRC(ff575b3d) SHA1(7f2202db7ec9dac06499c9535b4852defb192eb3) )
 	ROM_LOAD16_BYTE( "136077-1031.10e", 0x000001, 0x010000, CRC(2ae2ac35) SHA1(e2a050a6e24dc6fef86b3556b69b2c3e2993febc) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3636,7 +3547,7 @@ ROM_START( racedrivb1 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3650,7 +3561,7 @@ ROM_START( racedrivb1 )
 	ROM_LOAD16_BYTE( "136077-1030.30e", 0x000000, 0x010000, CRC(ff575b3d) SHA1(7f2202db7ec9dac06499c9535b4852defb192eb3) )
 	ROM_LOAD16_BYTE( "136077-1031.10e", 0x000001, 0x010000, CRC(2ae2ac35) SHA1(e2a050a6e24dc6fef86b3556b69b2c3e2993febc) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3687,7 +3598,7 @@ ROM_START( racedrivc )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3701,7 +3612,7 @@ ROM_START( racedrivc )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3738,7 +3649,7 @@ ROM_START( racedrivcb )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3752,7 +3663,7 @@ ROM_START( racedrivcb )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3789,7 +3700,7 @@ ROM_START( racedrivcg )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3803,7 +3714,7 @@ ROM_START( racedrivcg )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3840,7 +3751,7 @@ ROM_START( racedrivc4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3854,7 +3765,7 @@ ROM_START( racedrivc4 )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3891,7 +3802,7 @@ ROM_START( racedrivcb4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3905,7 +3816,7 @@ ROM_START( racedrivcb4 )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3942,7 +3853,7 @@ ROM_START( racedrivcg4 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -3956,7 +3867,7 @@ ROM_START( racedrivcg4 )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -3993,7 +3904,7 @@ ROM_START( racedrivc2 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -4007,7 +3918,7 @@ ROM_START( racedrivc2 )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -4044,7 +3955,7 @@ ROM_START( racedrivc1 )
 	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   /* ASIC65 TMS32015 code */
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
 	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
 
@@ -4058,7 +3969,7 @@ ROM_START( racedrivc1 )
 	ROM_LOAD16_BYTE( "136078-1030.30e", 0x000000, 0x010000, CRC(d355a1c2) SHA1(6b0fb52dbecbe574959739f49c3c0fccdd5cebdb) )
 	ROM_LOAD16_BYTE( "136078-1031.10e", 0x000001, 0x010000, CRC(18fd5f44) SHA1(1c3bd780b72cfa61bcbd82683da18b4ee8d03a6d) )
 
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 10*128k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 10*128k for audio serial ROMs */
 	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -4181,7 +4092,7 @@ ROM_START( racedrivpan )
 	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
 
 	/* ADSP board */
-	ROM_REGION( 0x20000, "mainpcb:soundcpu", 0 )        /* 2*64k for audio 68000 code */
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        /* 2*64k for audio 68000 code */
 	ROM_LOAD16_BYTE( "rdps1032.bin", 0x000000, 0x010000, CRC(33005f2a) SHA1(e4037a76f122b271a9675d9187ab847a11738640) )
 	ROM_LOAD16_BYTE( "rdps1033.bin", 0x000001, 0x010000, CRC(4fc800ac) SHA1(dd8cfdb727d6a65274f4f871a589a36796ae1e57) )
 
@@ -4191,7 +4102,7 @@ ROM_START( racedrivpan )
 	ROM_LOAD16_BYTE( "rdpd1025.bin", 0x000001, 0x020000, CRC(57b8a266) SHA1(257246d42841aa30220caeb91945e29978ee8fc0) )
 
 	/* Audio ROMs - show up as bad in self-test but so do racedriv's */
-	ROM_REGION( 0x50000, "mainpcb:serialroms", 0 )      /* 5*64k for audio serial ROMs */
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      /* 5*64k for audio serial ROMs */
 	ROM_LOAD( "rdps1123.bin", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
 	ROM_LOAD( "rdps1124.bin", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
 	ROM_LOAD( "rdps3125.bin", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
@@ -4930,12 +4841,10 @@ void harddriv_state::init_dspcom()
 /* COMMON INIT: initialize the original "driver" sound board */
 void harddriv_state::init_driver_sound()
 {
-	hdsnd_init();
-
 	/* install sound handlers */
-	m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_state::hd68k_snd_data_r), this), write16_delegate(FUNC(harddriv_state::hd68k_snd_data_w), this));
-	m_maincpu->space(AS_PROGRAM).install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_state::hd68k_snd_status_r), this));
-	m_maincpu->space(AS_PROGRAM).install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_state::hd68k_snd_reset_w), this));
+	m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_sound_board_device::hd68k_snd_data_r), (harddriv_sound_board_device*)m_harddriv_sound), write16_delegate(FUNC(harddriv_sound_board_device::hd68k_snd_data_w), (harddriv_sound_board_device*)m_harddriv_sound));
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_sound_board_device::hd68k_snd_status_r), (harddriv_sound_board_device*)m_harddriv_sound));
+	m_maincpu->space(AS_PROGRAM).install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_sound_board_device::hd68k_snd_reset_w), (harddriv_sound_board_device*)m_harddriv_sound));
 }
 
 
@@ -5289,7 +5198,7 @@ GAME( 1990, racedrivcg4, racedriv, racedrivc_machine, racedrivc, driver_device,
 GAME( 1990, racedrivc2,  racedriv, racedrivc1_machine, racedrivc, driver_device, 0,ROT0, "Atari Games", "Race Drivin' (compact, rev 2)", 0 )
 GAME( 1990, racedrivc1,  racedriv, racedrivc1_machine, racedrivc, driver_device, 0,ROT0, "Atari Games", "Race Drivin' (compact, rev 1)", 0 )
 
-GAMEL( 1990, racedrivpan, racedriv, racedriv_panorama_machine, racedriv_pan, driver_device, 0, ROT0, "Atari Games", "Race Drivin' Panorama (prototype, rev 2.1)", GAME_NOT_WORKING, layout_racedrivpan ) // picking roadster crashes the side monitors?
+GAMEL( 1990, racedrivpan, racedriv, racedriv_panorama_machine, racedriv_pan, driver_device, 0, ROT0, "Atari Games", "Race Drivin' Panorama (prototype, rev 2.1)", 0, layout_racedrivpan )
 
 GAME( 1991, steeltal,  0,        steeltal_machine, steeltal, driver_device, 0, ROT0, "Atari Games", "Steel Talons (rev 2)", 0 )
 GAME( 1991, steeltalg, steeltal, steeltal_machine, steeltal, driver_device, 0, ROT0, "Atari Games", "Steel Talons (German, rev 2)", 0 )
diff --git a/src/mame/drivers/hazelgr.c b/src/mame/drivers/hazelgr.c
index fd8788b8f7f..0a366408752 100644
--- a/src/mame/drivers/hazelgr.c
+++ b/src/mame/drivers/hazelgr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hazel Grove Fruit Machine HW
  unknown platform! z80 based..
 
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 257193cd7c4..fc2e207ea62 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Haunted Castle
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index fd72a9ac3ad..1df9664d227 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Hexion (GX122) (c) 1992 Konami
diff --git a/src/mame/drivers/hideseek.c b/src/mame/drivers/hideseek.c
index ff601637879..d870044eeab 100644
--- a/src/mame/drivers/hideseek.c
+++ b/src/mame/drivers/hideseek.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hide & Seek
 
 the AG-2 AX51201 should be the follow-up to the AG-1 AX51101 in gunpey.c
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index 73533053aa1..560d3a7862a 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Higemaru
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index 415b849e8af..55fa23032da 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega Hikaru / 'Samurai' */
 
 /*
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 32d6afb57ff..0bcbba03589 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Himeshikibu (C) 1989 Hi-Soft
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 79acbe54582..b7e55321501 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hit Me driver by the EMUL8, led by Dan Boris */
 
 /*
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index e2c36d57973..f00fdd5ea93 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Some Dynax games using the first version of their blitter
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index e82a1cb3f3d..a8e6c275e1a 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hole Land
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 4b5e05e425b..9ba6af852ba 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Homedata Games
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 18eccf5d69d..93c776cb985 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Moero!! Pro Yakyuu Homerun Kyousou - (c) 1988 Jaleco
  Dynamic Shoot Kyousou - (c) 1988 Jaleco
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 103a099d3e8..36e47751907 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Konami Hornet System
     Driver by Ville Linde
 
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 9759df963e2..e6ee4c18a02 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hot Blocks */
 /*
 driver by David Haywood
diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c
index cec4fd0591f..ed9e37502a1 100644
--- a/src/mame/drivers/hotstuff.c
+++ b/src/mame/drivers/hotstuff.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* TAS 5 REEL system? by Olympic Video Gaming */
 
 #include "emu.h"
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 6f1df43c960..4b872bd732f 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   High Seas Havoc
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index 2b8842c35b6..70234b653e5 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************
 
 Heavy Unit
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index b54794548b2..1b34f9748a1 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Nichibutsu Mahjong series.
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 4dca646c5f0..20ec5dfafe5 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz)
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 559e23165e2..b76689b7259 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Hyper Duel
diff --git a/src/mame/drivers/ichiban.c b/src/mame/drivers/ichiban.c
index b4ac2a072ac..a40de833356 100644
--- a/src/mame/drivers/ichiban.c
+++ b/src/mame/drivers/ichiban.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ichi Ban Jyan
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 78f107977aa..fa7bc6556e3 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= IGS009 Based Games =-
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index b658c727382..e7d903c69ae 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                       -= IGS011 (Blitter) Based Hardware =-
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 47b39ec78f7..dbfda1f8753 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
                                         -= IGS017 / IGS031 Based Hardware =-
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index 75649925892..7dbc68fe790 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS ARM7 (IGS027A) based Mahjong / Gambling platform(s)
  Driver by Xing Xing
 
diff --git a/src/mame/drivers/igs_m036.c b/src/mame/drivers/igs_m036.c
index 29af63597e1..c0afd0247d6 100644
--- a/src/mame/drivers/igs_m036.c
+++ b/src/mame/drivers/igs_m036.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS Gambling games using IGS036 CPU
    pgm2.c also uses this CPU
 
diff --git a/src/mame/drivers/igspc.c b/src/mame/drivers/igspc.c
index 4756665594e..ef340403ae7 100644
--- a/src/mame/drivers/igspc.c
+++ b/src/mame/drivers/igspc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  IGS PC based hardware
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index 85b1e1df752..65fb302a581 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Champion Poker by IGS   (documented by Mirko Buffoni)
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index eec997db616..5fbd0397b3f 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Ikki (c) 1985 Sun Electronics
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 9e7f6703bb7..ba45cd928fd 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   IMOLA GP by RB Bologna (Alberici?)
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index 4f2220c434c..31a5bb3decb 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Intersecti
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index e9f7c4ff33e..f0b94186430 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Video System Games.
diff --git a/src/mame/drivers/invqix.c b/src/mame/drivers/invqix.c
index 17fa3cfefa4..3802edfd802 100644
--- a/src/mame/drivers/invqix.c
+++ b/src/mame/drivers/invqix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     invqix.c
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 7b7250b086a..d3db5591fe2 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 IQ Block   (c) 1992 IGS
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 66cc058132d..a8830ea43b6 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari I, Robot hardware
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 4297db35bdd..c2b76420b05 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IronHorse
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 43738e648ea..dae1ec0021c 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Funai / Gakken Interstellar Laser Fantasy laserdisc hardware
 Driver by Andrew Gardner with help from Daphne Source
diff --git a/src/mame/drivers/iteagle.c b/src/mame/drivers/iteagle.c
index 714bf0d0c8c..183a0d218c0 100644
--- a/src/mame/drivers/iteagle.c
+++ b/src/mame/drivers/iteagle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Incredible Technologies "Eagle" hardware
@@ -148,7 +150,6 @@ static MACHINE_CONFIG_START( gtfore, iteagle_state )
 	MCFG_ITEAGLE_EEPROM_ADD(          ":pci:0a.0")
 
 	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
 	MCFG_SCREEN_REFRESH_RATE(59)
 	MCFG_SCREEN_SIZE(512, 384)
 	MCFG_SCREEN_UPDATE_DEVICE(":pci:09.0", voodoo_pci_device, screen_update)
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index b4e8798562a..935e99c9345 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
 
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 0e2d0cd3728..c5f5278197e 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
   Italian Gambling games based on Mitsubishi (Renesas) M16C MCU family.
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index d1825b4b391..7294faf9163 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
   Nazionale Elettronica + others (mostly Italian) Gambling games
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 5a9cd99acd5..05ce0c1d72f 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Jack the Giant Killer memory map (preliminary)
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 86a540648ba..ce2688aba28 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   jackal.c
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 65f06fb3b2b..d1c332c4d2a 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Happy Jackie (c) 1993 IGS.
 Video Slot machine game for amusement only.
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 3b3fddac155..28d0213707c 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Jailbreak - (c) 1986 Konami
diff --git a/src/mame/drivers/jankenmn.c b/src/mame/drivers/jankenmn.c
index fe874996a79..2df0207a55e 100644
--- a/src/mame/drivers/jankenmn.c
+++ b/src/mame/drivers/jankenmn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   JANKENMAN UNIT
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 14be78b6dbb..a87e7456c67 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Jackie Chan The Kung-Fu Master
     Jackie Chan in Fists of Fire
diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c
index acd9a37614f..1fcb855f7f0 100644
--- a/src/mame/drivers/jclub2.c
+++ b/src/mame/drivers/jclub2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************************************************************
 
 
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index d011ab3ce65..85a84002768 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Return of the Jedi hardware
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index 3bd3bdda21a..ab258a9edee 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     JOKER'S WILD - SIGMA
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 7394f9de14b..f0485b030fe 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Jolly Jogger
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 395ce0a6128..5f2fc339a8a 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************
 
     Jongkyo
diff --git a/src/mame/drivers/jp.c b/src/mame/drivers/jp.c
index 1b34b9f5ab8..67bb1f40993 100644
--- a/src/mame/drivers/jp.c
+++ b/src/mame/drivers/jp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************************
 
   PINBALL
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 9f37edf4f82..82d41a0531d 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     JPM IMPACT (aka System 6)
diff --git a/src/mame/drivers/jpmimpctsw.c b/src/mame/drivers/jpmimpctsw.c
index 911a97070e9..354f8dae8ef 100644
--- a/src/mame/drivers/jpmimpctsw.c
+++ b/src/mame/drivers/jpmimpctsw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************************
   JPM Impact non-video software
 **************************************************************************************************/
diff --git a/src/mame/drivers/jpmmps.c b/src/mame/drivers/jpmmps.c
index c997c162dd0..9c865045a4a 100644
--- a/src/mame/drivers/jpmmps.c
+++ b/src/mame/drivers/jpmmps.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* JPM MPS1/2 Hardware
 
   TMS9995 CPU
diff --git a/src/mame/drivers/jpms80.c b/src/mame/drivers/jpms80.c
index 53de77d180f..3399bffbbbc 100644
--- a/src/mame/drivers/jpms80.c
+++ b/src/mame/drivers/jpms80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* JPM System 80 Hardware
 
   TMS9995 CPU
diff --git a/src/mame/drivers/jpmsru.c b/src/mame/drivers/jpmsru.c
index 94236504d58..0128f29bee2 100644
--- a/src/mame/drivers/jpmsru.c
+++ b/src/mame/drivers/jpmsru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     JPM S.R.U Hardware
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index bd335216230..2e40ab36ebe 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     JPM System 5
diff --git a/src/mame/drivers/jpmsys5sw.c b/src/mame/drivers/jpmsys5sw.c
index 98fe9cd1d80..c6912eb38ce 100644
--- a/src/mame/drivers/jpmsys5sw.c
+++ b/src/mame/drivers/jpmsys5sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /**************************************************************************************************
   JPM System 5 non-video software
diff --git a/src/mame/drivers/jpmsys7.c b/src/mame/drivers/jpmsys7.c
index c140ea9fd4b..90618f79e67 100644
--- a/src/mame/drivers/jpmsys7.c
+++ b/src/mame/drivers/jpmsys7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Unkonwn JPM Platform */
 /* only Ker - Chinq has sound roms, they seem to map in cpu space, sound roms are probably missing from the rest? */
 
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 2483997d57e..57dc8b52d9e 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bally/Midway Jr. Pac-Man
diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c
index b965e223060..4a4c3f2e6f9 100644
--- a/src/mame/drivers/jubilee.c
+++ b/src/mame/drivers/jubilee.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
   Jubilee Double-Up Poker
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 36f18235a0b..cfd7bd50f4b 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Juno First :  memory map same as tutankham with some address changes
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index e178405f8a0..f6eecbadf28 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Kaneko 16 Bit Games =-
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 19799084574..509fded7f20 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sun Electronics hardware:
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 6666d06eb5e..1244c647c1a 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Karnov (USA version)                   (c) 1987 Data East USA
diff --git a/src/mame/drivers/kas89.c b/src/mame/drivers/kas89.c
index 4a03d908eec..6dad5ee1fe7 100644
--- a/src/mame/drivers/kas89.c
+++ b/src/mame/drivers/kas89.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
   /\/\<< Kasino '89 >>/\/\
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index f48b7cefe03..4f377d28793 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Karate Champ - (c) 1984 Data East
diff --git a/src/mame/drivers/kenseim.c b/src/mame/drivers/kenseim.c
index 62ce8696981..493c093c502 100644
--- a/src/mame/drivers/kenseim.c
+++ b/src/mame/drivers/kenseim.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Ken Sei Mogura: Street Fighter II
   aka Street Fighter II Whack-a-mole game */
 
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 0c36714fd72..d806f4b26ce 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Driver Info
 
 
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 2b7d4603831..9e9b7f235de 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 King of Boxer - (c) 1985 Wood Place Inc.
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index b2b21ad499e..f881756d800 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ACL Manufacturing 1983 hardware (a division of American Communication Laboratories)
 Driver by Andrew Gardner
diff --git a/src/mame/drivers/kissproto.c b/src/mame/drivers/kissproto.c
index 7d4193c39c2..72646af1b78 100644
--- a/src/mame/drivers/kissproto.c
+++ b/src/mame/drivers/kissproto.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************************
 
     Pinball
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index b1a4b98782b..6af2e89aee4 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Knuckle Joe - (c) 1985 Seibu Kaihatsu ( Taito License )
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index 85f3a263da3..fed92bd7e04 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 King Of Football (c)1995 BMC
 
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index e514b334d3e..a9d761ab6dc 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Koi Koi Part 2
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 5b9cf34b757..c7376a3df7d 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Konami GQ System - Arcade PSX Hardware
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index c9189a1a7b7..e8f9865bbd9 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Konami GV System (aka "Baby Phoenix") - Arcade PSX Hardware
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 01903dae7eb..99dbf0cf1f9 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * konamigx.c - Konami System GX
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index e504830b675..e6be818c001 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami M2 Hardware
 Preliminary driver by Ville Linde
diff --git a/src/mame/drivers/konendev.c b/src/mame/drivers/konendev.c
index 1674a2f3914..872c6e872d0 100644
--- a/src/mame/drivers/konendev.c
+++ b/src/mame/drivers/konendev.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Konami Endeavour hardware (gambling games)
 
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 829ad4428ed..8f9d495d6ce 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************
 
   KO Punch (c) 1981 Sega
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 9ed7b750ae0..4a017e8e11f 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Kusayakyuu (Sandlot Baseball)
 (c)1985 Taito
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index faf12ce6dc6..82bd1937928 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Konami System 573
diff --git a/src/mame/drivers/kurukuru.c b/src/mame/drivers/kurukuru.c
index 9ed799a789e..13e077b009c 100644
--- a/src/mame/drivers/kurukuru.c
+++ b/src/mame/drivers/kurukuru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   KURU KURU PYON PYON
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 5e8725876c9..13eafd3311b 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kyugo hardware games
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 72ae74e0abe..cee3757f15d 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Labyrinth Runner (GX771) (c) 1987 Konami
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index b01bacbe04e..0b0857e1b2b 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Universal 8106-A2 + 8106-B PCB set
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index b9035bc6003..0e05979097d 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Lady Frog (c) 1990 Mondial Games
 (there's  "(c) Alfa Tecnology" in the ROM)
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index d69c9cdd491..f335ef239ed 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************
  Laser Base / Future Flash driver
 
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 4fa1fdbbc4d..619d0970910 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Laser Battle / Lazarian (c) 1981 Zaccaria
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 81f79b3b014..61ae6e63193 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Lasso and similar hardware
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index a8be5729635..778e222d698 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
   Last Duel                       - Capcom, 1988
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index 0e024321f5c..82c2b42d53e 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************************************************
 
 Last Fighting  (C)2000 Subsino
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 1039bdb75e7..726011c6a51 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
   Lazer Command memory map (preliminary)
 
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 12423a7af82..a4c5dfe479b 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Lemmings                (c) 1991 Data East USA (DE-0357)
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index e96cd8f8dcf..300ff430cd2 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Lethal Enforcers
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 192e8deed15..2855a4f1001 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito Laser Grand Prix laserdisc hardware
 Driver by Andrew Gardner with help from Daphne Source
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 62f83dd8c38..afd0e16685d 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Pro Soccer                      (c) 1983 Data East Corporation
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index e106e8637c0..8bb0cf1f6b0 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Liberator hardware
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index aafb43123ba..eaf6978c2fa 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Limenko Power System 2
diff --git a/src/mame/drivers/lindbergh.c b/src/mame/drivers/lindbergh.c
index 89488a64b2c..63bd7dc3c47 100644
--- a/src/mame/drivers/lindbergh.c
+++ b/src/mame/drivers/lindbergh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Lindbergh skeleton driver
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index d9b849f65f5..239d6444614 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Little Robin */
 
 /* driver by
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 65b71fc8b16..a0a6a1894d1 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Legend of Kage
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 28f4b365b0c..2576ecb3758 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatsumi Lock-On hardware
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 19c29ae11eb..3893ea7ea45 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 To Do:
 - redump COP420 internal ROM
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index efddf3ea444..17aa81e9c20 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
                                                 -= IGS Lord Of Gun =-
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 16073a9995d..1bf8bbc89c8 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Land Sea Air Squad / Storming Party  (c) 1986 Taito
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index 12b12b10775..a817c3c9cee 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Little Casino
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 857f04f75b4..9f4fb7d0fcb 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Lucky Girl (newer 1991 version on different hardware?)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 6724c938f82..bf4c03d50eb 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************************
 
     LUCKY 74 - WING CO.,LTD.
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index cd6939802b3..b1ee411b590 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Lovely Cards/Poker/Pontoon driver, updated by El Condor from work by Uki and
 Zsolt Vasvari respectively.
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 139c01448fa..980737e77b5 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Legendary Wings
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index fab05c611cb..19565c8dd28 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M10/M11/M15 hardware
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index b4d3cf0a7c1..847fbd0f1b1 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Irem M107 games:
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 973da14c77b..c524009846c 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M52 hardware
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 6caca206002..1242ee8f463 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Irem M57 hardware
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index c6708512702..84f9dcf5ad9 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Irem M58 hardware
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index d01636eb4f7..07f3bb8d206 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Irem "M62" system
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index a03f892872d..4192b22bba5 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M63 hardware
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 01ac188a542..6e0e92fd93a 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 IREM M72 board
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index c0f8fc91078..e9d67dfcca0 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*          Ramtek M79 Ambush
 
 
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 846017f4ad0..3a1a0e25e39 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Irem M90/M97 system games:
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index cfbc620efe3..d98f661a182 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Irem M92 system games:
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index c3e0cb3dbe2..b3b1f079cca 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** DRIVER INFO **************************************************************
 
 Macross Plus                        (c)1996 Banpresto
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index b3016dc174a..c0c7bf551df 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 macs.c - Multi Amenity Cassette System
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 27134b2843b..3fd96e2f235 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mad Alien (c) 1980 Data East Corporation
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index fcdf1f6b628..30325fb0b10 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Mad Motor                             (c) 1989 Mitchell Corporation
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 171d04e7627..1511668a459 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     MAGIC'S 10
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 25d23638338..ff804ed6484 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     MAGIC FLY
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index 4742e8ac4ae..70445b5df09 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Magic the Gathering: Armageddon
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 194f46adb64..930e6381941 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 MAGMAX
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index bde7ecf37d7..981dd118508 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Magical Touch by Micro MFG
 
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index b39ded23958..cd2ae752df3 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   The Main Event, (c) 1988 Konami
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 68297d6b886..bf6cc839fc5 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Main Event - SNK 1984
 Canvas Croquis - SNK 1985
diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c
index 9b3f427abef..185267d2a6e 100644
--- a/src/mame/drivers/majorpkr.c
+++ b/src/mame/drivers/majorpkr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
   Major Poker / Major Joker
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 818229bd540..f90281d904c 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Malzak
diff --git a/src/mame/drivers/manohman.c b/src/mame/drivers/manohman.c
index c4804d68e52..24f24caf497 100644
--- a/src/mame/drivers/manohman.c
+++ b/src/mame/drivers/manohman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   MANN, OH-MANN
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 8440da0b48a..51473240d29 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Several Namco games from 1982-1985
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 8d7af3d01de..2bb374516f4 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Marine Boy hardware memory map (preliminary)
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 2fbe03f14fe..47f7cee766d 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ---------------------------
 Marine Date by TAITO (1981)
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 0f95834e384..7832f3001a7 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 TODO:
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index f6cf1fcdb07..5c2c582d37a 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Markham (c) 1983 Sun Electronics
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 2406291075c..6845d23dce1 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Master Boy - Gaelco (c)1991
 
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 36cca045f86..c98faa3b449 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mat Mania
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 82f7fcd7939..ad36ae3be4b 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     Exidy Max-A-Flex driver
 
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index e0cba21ee27..4c20696a2cc 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************************
 
     Maygay M1 A/B driver, (under heavy construction !!!)
diff --git a/src/mame/drivers/maygay1bsw.c b/src/mame/drivers/maygay1bsw.c
index da511007768..22ec8c8cbc3 100644
--- a/src/mame/drivers/maygay1bsw.c
+++ b/src/mame/drivers/maygay1bsw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MayGay M1A/B Software */
 
 /*
diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c
index 8229181191d..74371a100b1 100644
--- a/src/mame/drivers/maygayep.c
+++ b/src/mame/drivers/maygayep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
     Maygay EPOCH hardware
diff --git a/src/mame/drivers/maygaysw.c b/src/mame/drivers/maygaysw.c
index 428b87eabd3..ef413f30084 100644
--- a/src/mame/drivers/maygaysw.c
+++ b/src/mame/drivers/maygaysw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MayGay M2 hardware
   SWP (Skill With Prizes) Video based games */
 
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index a4af1c8fb38..f0e2e4744ec 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     MAYGAY MV1 hardware
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index f93b10a6a79..a7374c07b06 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Kikiippatsu Mayumi-chan (c) 1988 Victory L.L.C.
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index d668ad00cc5..736203d149e 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Mazer Blazer by Stern Electronics (c) 1983
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index ee9ab9db7db..6457357fde6 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   'Face' LINDA board
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index c10e8a14c49..a097a14f384 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Meadows S2650 driver
diff --git a/src/mame/drivers/meadwttl.c b/src/mame/drivers/meadwttl.c
index 3e26d980349..8a5d19a87e2 100644
--- a/src/mame/drivers/meadwttl.c
+++ b/src/mame/drivers/meadwttl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Meadows Discrete Game List
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index c900f16dc0a..58e11bd206b 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Atari MediaGX
 
     Driver by Ville Linde
diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c
index d79fd542687..2011a2b1dd1 100644
--- a/src/mame/drivers/megadrvb.c
+++ b/src/mame/drivers/megadrvb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Mega Drive/Genesis-based bootlegs
diff --git a/src/mame/drivers/megaphx.c b/src/mame/drivers/megaphx.c
index e83940bf838..8070442cecc 100644
--- a/src/mame/drivers/megaphx.c
+++ b/src/mame/drivers/megaphx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Dinamic / Inder arcade hardware
 
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index cd4b74fc988..f06f7ff77c8 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega MegaPlay
 
   changelog:
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 7de200b7b7b..8bc6a0271dd 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Jaleco Mega System 1 =-
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 31e85c78f19..13d7aadf891 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega MegaTech
 
 About MegaTech:
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index b92acdb4490..aa76185b688 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
 Based on drivers from Juno First emulator by Chris Hardy (chris@junofirst.freeserve.co.uk)
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 0aeaaf24e38..e2df16bddcb 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Meijinsen (snk/alpha)
  ---------------------
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 344d0b9454d..209475fc67a 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Merit trivia games
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index e995c96f755..6eeacea1533 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Merit CRT-250 and CRT-260 hardware
 
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 65441c5f3c5..61e4210acf4 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mermaid
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index 19327c9fc2c..6cd01077fbd 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Metal Maniax
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 3896d7a0a71..1e58b020537 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Metal Clash =-
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index bdb284c7df2..d98fdabf4dd 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Metro Games =-
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 9aa70347760..c4cf89c6225 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Kick & Run - (c) 1987 Taito
diff --git a/src/mame/drivers/meyc8080.c b/src/mame/drivers/meyc8080.c
index 58e6c829de9..5c7774582d8 100644
--- a/src/mame/drivers/meyc8080.c
+++ b/src/mame/drivers/meyc8080.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************
 
   MEYCO 8080 BASED GAMBLING HARDWARE
diff --git a/src/mame/drivers/mgavegas.c b/src/mame/drivers/mgavegas.c
index e9b86d5f2bc..39f7415f85c 100644
--- a/src/mame/drivers/mgavegas.c
+++ b/src/mame/drivers/mgavegas.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:ANY
 /***********************************************************************************
 
     mgavegas.c
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index b8e72700fd2..d3ac0ff4035 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Mini Golf (prototype) driver
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index b8361b55c0a..c660824a152 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Major Havoc hardware
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 136ddb526a8..b1663b55514 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microprose Games 3D hardware
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 9a972e15a9b..ea8174ce537 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
                                         -= Andamiro's Midas hardware =-
diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c
index 7aa1e1dadb5..1c8ec43199b 100644
--- a/src/mame/drivers/midqslvr.c
+++ b/src/mame/drivers/midqslvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway Quicksilver skeleton driver
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index f89cc72cb06..85c4b2a2b5e 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Midway T-unit system
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index caccb5ecfd0..506788d6e6e 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Williams/Midway Y/Z-unit system
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 695634689a1..95cf540a9a6 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mikie memory map (preliminary)
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 3747eb62193..00cf03f2359 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   MINI BOY 7
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index 2906768be07..7223f785922 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mini Vaders (Space Invaders's mini game)
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index fcb1182b750..cf58a67114f 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Mirage Youjuu Mahjongden
 
 TODO:
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 3c2d7cb0d12..a53b9427a3b 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Miss Bubble 2 / Bubble Pong Pong
 
 A rather odd bootleg of Bubble Bobble with level select, redesigned levels,
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index a644b367dff..d24fbe397b7 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
     "Mitchell hardware". Actually used mostly by Capcom.
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index d7a535b3892..fbc83441388 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mahjong Kyou Jidai     (c)1986 Sanritsu
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index b50e29e7478..73ddb8568f3 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Mahjong Sisters (c) 1986 Toa Plan
diff --git a/src/mame/drivers/mmm.c b/src/mame/drivers/mmm.c
index 528d6735120..a966dbd7445 100644
--- a/src/mame/drivers/mmm.c
+++ b/src/mame/drivers/mmm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Early Maygay HW
  I believe this is 'Triple M' or 'MMM' hardware
 
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index abcc11a42f5..54bed151064 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Sega Model 1 Hardware Overview
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 2c7d3a5af34..8c08afccb9a 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Sega Model 2: i960KB + (5x TGP) or (2x SHARC) or (2x TGPx4)
     System 24 tilemaps
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 20ad82bba03..7a4050ee604 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Sega Model 3
     PowerPC 603e + tilemaps + Real3D 1000 + 68000 + 2x SCSP
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 8b0f198479e..bd75924147f 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Mogura Desse */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 859dd802fd5..ca445a2f8d9 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
    MOLE ATTACK by Yachiyo Electronics Co.,LTD. 1982
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 1bd6507ccdc..9fd9d311d88 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Momoko 120% (c) 1986 Jaleco
diff --git a/src/mame/drivers/monacogp.c b/src/mame/drivers/monacogp.c
index 0525a86646a..2b15eaa4b12 100644
--- a/src/mame/drivers/monacogp.c
+++ b/src/mame/drivers/monacogp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Sega Monaco GP
diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c
index 4ab7cee4d78..3a87d34a466 100644
--- a/src/mame/drivers/monzagp.c
+++ b/src/mame/drivers/monzagp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Monza GP - Olympia
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 54b09b0a793..d1994fae53e 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Wild West C.O.W.boys of Moo Mesa
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 814c8d43471..0efa147cc40 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mosaic (c) 1990 Space
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 947d7cd3262..9be8dec608f 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
      Mouser
diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c
index 4236d71cc12..25ab9be3f75 100644
--- a/src/mame/drivers/mpu12wbk.c
+++ b/src/mame/drivers/mpu12wbk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
   WEBAK MPU-12 PLATFORM
diff --git a/src/mame/drivers/mpu2.c b/src/mame/drivers/mpu2.c
index e3c5629ed4e..52ce2d0cfd9 100644
--- a/src/mame/drivers/mpu2.c
+++ b/src/mame/drivers/mpu2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* There were also MPU0 and MPU1 units
 
  Information from 'MAGIK'
diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c
index 14900ac36c7..3bebc1362db 100644
--- a/src/mame/drivers/mpu3.c
+++ b/src/mame/drivers/mpu3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Notes 17/07/11 DH
  added most other MPU3 sets
 
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index dd0d31abe43..6a8a3a6733b 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* these are the MPU4 set listings / set specific code, for hardware emulation see mpu4hw.c */
 
 /* todo: driver inits (basic hw reel, protection configs etc.) should probably be moved here
diff --git a/src/mame/drivers/mpu4avan.c b/src/mame/drivers/mpu4avan.c
index 22d21f60a2b..4355978e514 100644
--- a/src/mame/drivers/mpu4avan.c
+++ b/src/mame/drivers/mpu4avan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 'Avantine' games
   These seem to be 3rd party games for various regions
 
diff --git a/src/mame/drivers/mpu4bwb.c b/src/mame/drivers/mpu4bwb.c
index a9895c33caa..22e7b140082 100644
--- a/src/mame/drivers/mpu4bwb.c
+++ b/src/mame/drivers/mpu4bwb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 BwB games
  - these are Bwb originals, not rebuilds..
    typically they have large 0x3f fills in rom..
diff --git a/src/mame/drivers/mpu4concept.c b/src/mame/drivers/mpu4concept.c
index f5e7ccd769c..21a266a8580 100644
--- a/src/mame/drivers/mpu4concept.c
+++ b/src/mame/drivers/mpu4concept.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 games by 'Concept' */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mpu4crystal.c b/src/mame/drivers/mpu4crystal.c
index 67658515a7a..0de1cb13d7b 100644
--- a/src/mame/drivers/mpu4crystal.c
+++ b/src/mame/drivers/mpu4crystal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 games by Crystal */
 
 /* Crystal games tend to have scrambled ROM + a different sound chip */
diff --git a/src/mame/drivers/mpu4dealem.c b/src/mame/drivers/mpu4dealem.c
index 10aecd257ce..3beaa3852b0 100644
--- a/src/mame/drivers/mpu4dealem.c
+++ b/src/mame/drivers/mpu4dealem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Deal 'Em */
 /* Deal 'Em was designed as an enhanced gamecard, to fit into various existing MPU4 cabinets
diff --git a/src/mame/drivers/mpu4empire.c b/src/mame/drivers/mpu4empire.c
index 5bd53d7cf3a..f06072156bd 100644
--- a/src/mame/drivers/mpu4empire.c
+++ b/src/mame/drivers/mpu4empire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 games by 'Empire' */
 
 
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index 5ae5fce240c..590c2682af5 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 hardware emulation
   for sets see mpu4.c
 */
diff --git a/src/mame/drivers/mpu4mdm.c b/src/mame/drivers/mpu4mdm.c
index 9b2a27a16c9..a2cea078cc7 100644
--- a/src/mame/drivers/mpu4mdm.c
+++ b/src/mame/drivers/mpu4mdm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 games by MDM */
 
 
diff --git a/src/mame/drivers/mpu4misc.c b/src/mame/drivers/mpu4misc.c
index e3b60efb369..3fd870f8ef3 100644
--- a/src/mame/drivers/mpu4misc.c
+++ b/src/mame/drivers/mpu4misc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 sets from various other manufactuers which appear to be based off unique code / behaviors (no barcrest headers etc.) */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mpu4mod2sw.c b/src/mame/drivers/mpu4mod2sw.c
index eb2fb738051..325fdbfe98e 100644
--- a/src/mame/drivers/mpu4mod2sw.c
+++ b/src/mame/drivers/mpu4mod2sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 'Mod2' Sets
 
  This is the original MPU4 board, with AY8913 chip
diff --git a/src/mame/drivers/mpu4mod4yam.c b/src/mame/drivers/mpu4mod4yam.c
index e370161a678..516ac89b6b9 100644
--- a/src/mame/drivers/mpu4mod4yam.c
+++ b/src/mame/drivers/mpu4mod4yam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* This is MPU4 MOD4 with a Y2413 instead of an OKI */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mpu4plasma.c b/src/mame/drivers/mpu4plasma.c
index ae2f9d7f18a..b5cfe6a2904 100644
--- a/src/mame/drivers/mpu4plasma.c
+++ b/src/mame/drivers/mpu4plasma.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 'Plasma' addition */
 
 /* the Plasma was an oversized DMD, but was rarely used, Big Chief might be the only game with it, at least it's the only dump we have? */
diff --git a/src/mame/drivers/mpu4sw.c b/src/mame/drivers/mpu4sw.c
index e8a86467b25..08471ced8f5 100644
--- a/src/mame/drivers/mpu4sw.c
+++ b/src/mame/drivers/mpu4sw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* mpu4 sets which have been split, and appear to do something useful
 
   I'm trying to keep this file to official Barcrest / BwB rebuilds on mod4 hw
diff --git a/src/mame/drivers/mpu4union.c b/src/mame/drivers/mpu4union.c
index 1c27269817c..fae76e2199d 100644
--- a/src/mame/drivers/mpu4union.c
+++ b/src/mame/drivers/mpu4union.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU4 games by 'Union' */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index b127424ac24..146a95beccc 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************************
 Barcrest MPU4 Extension driver by J.Wallace, Phil Bennett and Anonymous.
 
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index 83082a55b49..e233614bc77 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* for MPU5 hardware emulation see mpu5hw.c, this just contains the set listing and per machine configs */
 
 #include "emu.h"
diff --git a/src/mame/drivers/mpu5hw.c b/src/mame/drivers/mpu5hw.c
index cadb7988b6b..82e149bdfca 100644
--- a/src/mame/drivers/mpu5hw.c
+++ b/src/mame/drivers/mpu5hw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MPU5 hardware emulation */
 
 /* This file contains the hardware emulation, the mpu5.c contains the set listings */
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index d54b1973632..cd55d0d5e44 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************
 
     Sente Super System
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 47c8b810b64..d8725a1f887 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Mr Do!
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 5ca2badfb6a..65d70363dd9 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
 Mr F Lea
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index f63e7ad33fd..b138c584d92 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mr. Jong
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index f83f552eb2f..a09fa4d4561 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Jaleco MegaSystem 32 (Preliminary Driver)
 
  - hardware tests are needed to establish how the mixing really works (and interrupt source etc.)
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 13a801a2b1a..b573ee67eed 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Metal Soldier Isaac II  (c) Taito 1985
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 0a7f88aa056..03932116de7 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Mug Smashers (c)199? Electronic Devices (Italy) / 3D Games (England)
     driver by David Haywood - Dip Switches and Inputs by stephh
 
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 0161743c926..16642151d2a 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  todo: bank handlers etc. should be installed on a per-game basis
        to make it clearer why all the sets with hacked bank
diff --git a/src/mame/drivers/multfish_boot.c b/src/mame/drivers/multfish_boot.c
index c592dc14c80..4241f7834b5 100644
--- a/src/mame/drivers/multfish_boot.c
+++ b/src/mame/drivers/multfish_boot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/multfish.h"
 
diff --git a/src/mame/drivers/multfish_ref.c b/src/mame/drivers/multfish_ref.c
index 93f00e6878d..10d3d8ef749 100644
--- a/src/mame/drivers/multfish_ref.c
+++ b/src/mame/drivers/multfish_ref.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* The following sets are known to exist based on official documentation, but have not been dumped. */
 /* no other official sets are known to exist apart from these and the ones in multfish.c */
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 4389a0d3e7f..cb0f3fcafb4 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Multi Game
 
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 19f79ec48be..b1d1e080d4b 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Munch Mobile
   (C) 1983 SNK
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 44c0fde91a1..5aeeed8e8da 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 note:
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index d05861653c3..91a5c7204cc 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mustache Boy
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 94aa0d3d0d5..e0194448324 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 0bbeb279f2f..7639f0f0e1b 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Mighty Warrior
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index fe00b8712f9..50f022de807 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Technos Mysterious Stones hardware
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 7140abbbc47..c2237de44bc 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  * Mystic Warrior (c) 1993 Konami
  * Metamorphic Force (c) 1993 Konami
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index 2e5eac6ea51..75db397f1f1 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo 8080 hardware
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 9c023d3c5e2..c2b9498ef57 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Namco System FL
     Driver by R. Belmont and ElSemi
diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c
index a8ee76dd045..de10398e49b 100644
--- a/src/mame/drivers/namcoic.c
+++ b/src/mame/drivers/namcoic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/namcos2.h" /* for game-specific hacks */
 #include "includes/namcoic.h"
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 4eaf942df19..40ee5b0c46c 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Namco NA-1 / NA-2 System
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 44dcac461e7..e2c251a7cfd 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Namco System NB-1
 
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index ec6aba08fc0..c512aac6206 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************
 
     Namco ND-1 Driver - Mark McDougall
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index 09a76e62403..655ba7409b5 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     namcops2.c
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index b0377e4a7a9..486ada3c7d3 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
 Namco System 1
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index 8ca27cf500f..7f17d9e2095 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Namco System 10 - Arcade PSX Hardware
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index f1413c555f4..6e0799f3550 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Namco System 11 - Arcade PSX Hardware
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 37f72f6724b..38750991677 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Namco System 12 - Arcade Playstation-based Hardware
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 41f771dd8e5..79cdd14fb68 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Namco System II driver by K.Wilkins  (Jun1998, Oct1999)
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index bfcb95d7010..81009c199b0 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**
 2008/06/11, by Naibo(translated to English by Mameplus team):
 Driver's Eyes works,
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index db8de51597d..32c301b096a 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**
  * This driver describes Namco's System22 and Super System 22 hardware.
  *
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index e5ca12a9adf..235b2c40006 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Namco System 22.5 and (Super) System 23 (Evolution 2)
     Extremely preliminary driver by R. Belmont, thanks to Phil Stroffolino & Olivier Galibert
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 5e327f459b8..0edd5828eb2 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 Namco System 86
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 951f375411f..8c71c5c3ac6 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Naughty Boy driver by Sal and John Bugliarisi.
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 3c8b8094700..fe6e4219430 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj8688 - Nichibutsu Mahjong games for years 1986-1988
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 1dd197f7c61..4bdf688c634 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj8891 - Nichibutsu Mahjong games for years 1988-1991
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index d59f28cbeb2..6e8fda35cf4 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj8900 - Nichibutsu Mahjong games for years 1989
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index ae7982fb79a..1f461c5c908 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj8991 - Nichibutsu Mahjong games for years 1989-1991
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 5d479b70920..f9cccf5dc11 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj9195 - Nichibutsu Mahjong games for years 1991-1995
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index a01bc9c6779..06484859b72 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Nemesis (Hacked?)       GX400
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 9357761b511..9a60a2f7ecf 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Neo-Geo hardware
diff --git a/src/mame/drivers/neogeo_noslot.c b/src/mame/drivers/neogeo_noslot.c
index 9c839f06fd8..72e31d1d52a 100644
--- a/src/mame/drivers/neogeo_noslot.c
+++ b/src/mame/drivers/neogeo_noslot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 // MAME NeoGeo code for single fixed slot 'shortname' configs
 // none of this is required by MESS or the slot-based implementation
diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c
index 7b5f987590b..38960db2350 100644
--- a/src/mame/drivers/neptunp2.c
+++ b/src/mame/drivers/neptunp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Neptune's Pearls (c) Unidesa?
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 4ba98cd877f..155bb20a66e 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 News
diff --git a/src/mame/drivers/nexus3d.c b/src/mame/drivers/nexus3d.c
index 314dd094857..80f45997fb9 100644
--- a/src/mame/drivers/nexus3d.c
+++ b/src/mame/drivers/nexus3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
     NEXUS 3D Version 1.0 Board from Interpark
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 828cbd8a7be..60b82815916 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 UPL "sprite framebuffer" hardware
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 4c2e27cc0da..75e5659eeea 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Triple Screen Games
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 57001671331..48c6fb7832d 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Night Driver hardware
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index d65063a1623..e8076867b45 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Nichibutsu Mahjong series.
diff --git a/src/mame/drivers/nl_breakout.c b/src/mame/drivers/nl_breakout.c
index 9768084d84c..582841c5853 100644
--- a/src/mame/drivers/nl_breakout.c
+++ b/src/mame/drivers/nl_breakout.c
@@ -106,11 +106,13 @@ CIRCUIT_LAYOUT( breakout )
 #if (SLOW_BUT_ACCURATE)
     SOLVER(Solver, 48000)
     PARAM(Solver.ACCURACY, 1e-8) // less accuracy and diode will not work
+    PARAM(Solver.GS_THRESHOLD, 6)
 #else
     SOLVER(Solver, 48000)
     PARAM(Solver.ACCURACY, 1e-6)
-    PARAM(Solver.GS_THRESHOLD, 2)
-    //PARAM(Solver.SOR_FACTOR, 1)
+    PARAM(Solver.GS_THRESHOLD, 6)
+    // FIXME: PARALLEL Doesn't work in breakout!
+    PARAM(Solver.PARALLEL, 0)
 #endif
 
 	// DIPSWITCH - Free game
@@ -140,7 +142,7 @@ CIRCUIT_LAYOUT( breakout )
 	//----------------------------------------------------------------
 	// Clock circuit
 	//----------------------------------------------------------------
-#if 1  || (SLOW_BUT_ACCURATE)
+#if 0  || (SLOW_BUT_ACCURATE)
     MAINCLOCK(Y1, 14318000.0)
 	CHIP("F1", 9316)
 	NET_C(Y1.Q, F1.2)
@@ -160,12 +162,20 @@ CIRCUIT_LAYOUT( breakout )
 #define CKBH    "F1", 13
 #define DICECLOCK   "H1", 11
 #else
-	/* This works with bugs. The DICECLOCK (Y2) duty cycles are out of sync.
-	 * Speed gain is from 50% to 60% and not what would have been expected.
+	/*
+	 * 	9316	2	3	4	5	6	7	8	9	10	11	12	13	14	15	2	3	4	5	6
+	 *  A		0	1	0	1	0	1	0	1	0	1	0	1	0	1
+	 *  B		1	1	0	0	1	1	0	0	1	1	0	0	1	1
+	 * CKBH		1	1	0	0	1	1	0	0	1	1	0	0	1	1	1	1
+	 *                  ^--- Pattern Start
+	 * CLOCK	1	0	1	1	1	0	1	1	1	0	1	1	1	0	1	0	1	1	1
+	 *                              ^--- Pattern Start
+	 *                  <--------> 3 Clocks Offset
 	 */
-    MAINCLOCK(Y1, 14318000.0 / 2.0)
+    EXTCLOCK(Y1, 14318000.0, "4,4,4,4,4,8")
+    EXTCLOCK(Y2, 14318000.0, "2,6,2,6,2,2,2,6")
+    PARAM(Y2.OFFSET, 3.0 / 14318000.0 + 20.0e-9	)
 #define CKBH    "Y1", Q
-    CLOCK(Y2, 14318000.0 / 3.5)
 #define DICECLOCK   "Y2", Q
 
     NET_C(ttlhigh, H1.13)
diff --git a/src/mame/drivers/nl_pong.c b/src/mame/drivers/nl_pong.c
index ca8bd6ab740..47bc72ea524 100644
--- a/src/mame/drivers/nl_pong.c
+++ b/src/mame/drivers/nl_pong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /***************************************************************************
 
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 14f513d6995..0ac72193abe 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Title                          Copyright            PCB - ID
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 8e7acaf6787..7fb38faa899 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 UPL "orthogonal palette" hardware
diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c
index c6f7a28a082..9c2d7525e4d 100644
--- a/src/mame/drivers/nsmpoker.c
+++ b/src/mame/drivers/nsmpoker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   NSM TMS9995 BASED HARDWARE
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index d3946c3c3a3..20d2d330439 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/*  Konami NWK-TR System
 
 	Driver by Ville Linde
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index a90af31d6c6..44f8b15a4f9 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     N.Y. Captor - Taito '85
 
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 2a78f61bc38..97249bf165c 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     New York! New York! hardware
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 832fc4fb897..39cf9a3a6db 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Oh My God!       (c) 1993 Atlus
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index ca15ea912d0..45bbfad1a33 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Video System Mahjong series.
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index f2f598f5541..c08a078144d 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Oli-Boo-Chu
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 75a2dd82450..d479b08840e 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway Omega Race hardware
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index dd38a203f97..c0c997977ab 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* One Shot One Kill & Maddonna
    Driver by David Haywood and Paul Priest
    Dip Switches and Inputs by stephh
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 5fbf6ebb667..d4bd209fe96 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  One + Two
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 4db6ab0d309..7b6c3ef0f70 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Operation Wolf  (c) Taito 1987
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 029d10d7b85..c1b36f8bf4c 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Orbit Driver
diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c
index 30367eb2b6b..1f3b64dcbb5 100644
--- a/src/mame/drivers/othello.c
+++ b/src/mame/drivers/othello.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Othello (version 3.0) - Success 1984
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index ea27c4c11cf..8bc4d8dba53 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Operation Thunderbolt  (Taito)
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 457438e2b8b..308897c6317 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Over Drive (GX789) (c) 1990 Konami
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index b6a10a1a97c..cf948a74fdb 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************************
 
 PACHI FEVER / (c) 1983 SANKI DENSHI KOGYO
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 625a41b0505..153e5059924 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Pac-Land  (c) 1984 Namco
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 66fb72143f4..1c1a750c43b 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Namco PuckMan
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 27fe69bf05b..298ad6eac2b 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Pandora's Palace(GX328) (c) 1984 Konami/Interlogic
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index 753a4e33b07..d98e011bd09 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* It's a standard 486 PC motherboard, gfx card etc. with expansion ROM board
 
  probably impossible to emulate right now due to the bad / missing (blank when read) rom
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 0942416f5ac..75d5866f84e 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Panic Road
 ----------
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index bdb91cb46a0..bcb77c34757 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                  -= Paradise / Target Ball / Torus =-
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 1732adaa7be..fb8b73fd221 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Paranoia
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 985798ddc8f..bc1ccebd682 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Parodius (Konami GX955) (c) 1990 Konami
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 97a5e12fa50..29b7e4d5d80 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Pasha Pasha 2
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index ece49dd4974..974f6b972db 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Pass (c)1992, Oksan
 
  Driver by David Haywood
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index a3bd7cf1f16..eab111c2bc6 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Game Driver for Nichibutsu Mahjong series.
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 0c709da71e5..b97034286fc 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Pinball Action memory map (preliminary)
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 8d9444f72bb..6a2d2a95b3c 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pocket Gal                      (c) 1987 Data East Corporation
diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c
index 00e66b8e7a0..5e2c6f19042 100644
--- a/src/mame/drivers/pengadvb.c
+++ b/src/mame/drivers/pengadvb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Penguin Adventure bootleg (tagged 'Screen', 1988)
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 7754326c425..63ed0c4517c 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Pengo
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index fa327b65a21..39c1870d8ef 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
 
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 15b5af8e4a2..60da4931ec1 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* PGM System (c)1997 IGS
 
diff --git a/src/mame/drivers/pgm2.c b/src/mame/drivers/pgm2.c
index b23c2075f84..442bbd116ce 100644
--- a/src/mame/drivers/pgm2.c
+++ b/src/mame/drivers/pgm2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* PGM 2 hardware.
 
     Motherboard is bare bones stuff, and does not contain any ROMs.
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 6aa06688855..271d67fa53a 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Phoenix hardware games
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index e1f9446de71..1838cfdeede 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Photon System
 
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index 1ff7cc17af7..5278ae1ac5f 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Photon IK2 system
 
diff --git a/src/mame/drivers/pinball2k.c b/src/mame/drivers/pinball2k.c
index e523a0fa44f..59c84ff0085 100644
--- a/src/mame/drivers/pinball2k.c
+++ b/src/mame/drivers/pinball2k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Pinball 2000
 
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index ead609cd099..6962610c80f 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ping Pong (c) 1985 Konami
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index d1472a513d5..5c721604b54 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Janshi / Pinkiri 8 / Ron Jan
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 3ac0cf00653..d3eabc65ba4 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pipe Dream
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index daeb32050e8..d3c7f123bcc 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 PCB Layout
 ----------
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index dcd1b83ebe3..85bfea0f542 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*---
 
 Pirates      (c)1994 NIX  (DEC 14 1994 17:32:29) displayed in cabinet test mode
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index b782cc2497e..8ba65fcb311 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************
    Pit&Run - Taito 1984
 
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 6b05a667340..56c68ac612e 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 PCB# -   ANIMAL-01  Cosmo Electronics Corporation
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 41c1c279cab..5f6810b9599 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Pocket Gal Deluxe
diff --git a/src/mame/drivers/play_1.c b/src/mame/drivers/play_1.c
index ffdf692906d..b3b262a0129 100644
--- a/src/mame/drivers/play_1.c
+++ b/src/mame/drivers/play_1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************
 
     Pinball
diff --git a/src/mame/drivers/play_2.c b/src/mame/drivers/play_2.c
index 5733bd40ea1..27714dbb80d 100644
--- a/src/mame/drivers/play_2.c
+++ b/src/mame/drivers/play_2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Playmatic MPU 2
 */
diff --git a/src/mame/drivers/play_3.c b/src/mame/drivers/play_3.c
index 41df189b9fb..70756c90876 100644
--- a/src/mame/drivers/play_3.c
+++ b/src/mame/drivers/play_3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     Pinball
diff --git a/src/mame/drivers/play_5.c b/src/mame/drivers/play_5.c
index 9713ade13c1..e5ae9f843f6 100644
--- a/src/mame/drivers/play_5.c
+++ b/src/mame/drivers/play_5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Playmatic MPU 5
 */
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index aa7f51dd2db..9488d6f8d38 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Playchoice 10 - (c) 1986 Nintendo of America
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 731bf0bc6d8..48f19e68059 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Big Twin
diff --git a/src/mame/drivers/pluto5.c b/src/mame/drivers/pluto5.c
index 9299384bfe4..dfd96046034 100644
--- a/src/mame/drivers/pluto5.c
+++ b/src/mame/drivers/pluto5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Pluto 5
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index cd71d359083..9bdb798f3b1 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Polygonet Commanders (Konami, 1993)
     Poly-Net Warriors (Konami, 1993)
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index d3e07e86b49..f882f99c9c6 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* paint & puzzle */
 /* video is standard VGA */
 /*
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index ffac9ec998c..3a1cffa2e08 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Poke Champ */
 
 /* This is a Korean hack of Data East's Pocket Gal
diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c
index 1f8df5c34fc..512e7273336 100644
--- a/src/mame/drivers/poker72.c
+++ b/src/mame/drivers/poker72.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Unknown game, dump was marked 'slot 72 - poker'
 
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 0da8e0c9a42..fb120c7b013 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Pole Position    (c) 1982 Namco
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 3e26e35b9ef..ad18016776f 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
       Poly-Play
diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c
index 854c5d135c1..33300ff80b8 100644
--- a/src/mame/drivers/pong.c
+++ b/src/mame/drivers/pong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Pong (c) 1972 Atari
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 7f5df38c801..d97f406e232 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Poolshark Driver
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 652d5155267..6ef785d9830 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pooyan
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 62014c4b811..0ac9f42c86f 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Popeye  (c) 1982 Nintendo
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 9c4840ba336..523ff7a4828 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Popper
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 19b7840d8a9..602042a5115 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  Portraits
  (c) 1983 Olympia
diff --git a/src/mame/drivers/potgoldu.c b/src/mame/drivers/potgoldu.c
index dddbd26057e..da9a1439429 100644
--- a/src/mame/drivers/potgoldu.c
+++ b/src/mame/drivers/potgoldu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Pot of Gold (c)200? U. S. Games
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index beed7f53ac6..99179c1f58e 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Power Balls  (c) 1994 Playmark
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 24875b035d0..f1beca6436b 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Power Instinct =-
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 4e133ce2079..f64f45837f9 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Ping Pong Masters '93
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 2704e0eee29..80ce3667111 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Prehistoric Isle in 1930 (World)        (c) 1989 SNK
diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c
index fd64974d2da..5d355ac77a1 100644
--- a/src/mame/drivers/proconn.c
+++ b/src/mame/drivers/proconn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Project PROCONN (and PC92/PC98) Fruit Machine hardware
   skeleton driver!
diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c
index b1fe08d82be..cd96d03d104 100644
--- a/src/mame/drivers/psattack.c
+++ b/src/mame/drivers/psattack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     P's Attack
     using VRender0 System on a Chip
diff --git a/src/mame/drivers/pse.c b/src/mame/drivers/pse.c
index c886dbdeb08..ce870bb32de 100644
--- a/src/mame/drivers/pse.c
+++ b/src/mame/drivers/pse.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Project Support Engineering Games
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index a53c7788fdf..058aff778d0 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Psikyo Games =-
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index b28f936a05b..b0e349aa46f 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*----------------------------------------------------------------
    Psikyo PS4 SH-2 Based Systems
    driver by David Haywood (+ Paul Priest)
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 865ed3bda5e..5e9ca474d22 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*----------------------------------------------------------------
    Psikyo PS3/PS5/PS5v2 SH-2 Based Systems
    driver by David Haywood (+ Paul Priest)
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index b7da83ebe5c..0e9c04bfacc 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************
  *** PSYCHIC 5 hardware ***     (by Roberto Ventura)
  **************************
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 894102ea23c..89738df84b7 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Parallel Turn
 (c) Jaleco, 1984
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 04286b0bee2..8df063e0caf 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Puckman Pockimon
   -- original driver by Luca Elia
 
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 83503a6efb0..7c0b697e1b3 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Punch Out / Super Punch Out / Arm Wrestling
diff --git a/src/mame/drivers/pyson.c b/src/mame/drivers/pyson.c
index 6150b8539fa..f3dffc8d4f5 100644
--- a/src/mame/drivers/pyson.c
+++ b/src/mame/drivers/pyson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Konami Pyson Hardware Overview
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index f00857f070c..2bec28e3c38 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Quiz Do Re Mi Fa Grand Prix (Japan)     (GQ460) (c)1994 Konami
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 78d6d0953c1..f98a55aab10 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Qix hardware
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index a6c9f028cdf..19a0e86b8a3 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Quake Arcade Tournament
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 4b7dddfe25b..1152f28f524 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Quantum hardware
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 044612f8587..30edc4e2b8b 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
   Zaccaria S2650 '80s games
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index 2c723affe8d..2e9af155e2f 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Queen */
 
 /*
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 63b50645a19..2c95a627d0c 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Quiz DNA no Hanran (c) 1992 Face
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index eb0a1153b9f..5fc89250b14 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************
  Quiz Olympic (c)1985 Seoul Coin Corp.
 
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 5b3a87a91c7..864bc7b5851 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
     Quiz Panicuru Fantasy
     (c) 1993 NMK
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index b0903255b31..c998c7f6e8b 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Quiz Punch 2 (C)1989 Space Computer
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index aebd8b349b5..94e1eb1d650 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 R2D Tank (c) 1980 Sigma Ent. Inc.
 
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index a4514535c2c..e7d0264019d 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Raiden 2 / DX V33 Version
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 08cef5c0e0b..27b31a73e4c 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                      -= 68020 + Imagetek I5000 Games =-
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 7802aed44de..72722eacab4 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Seibu Raiden hardware
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 03e014a2ce3..f19f59373cb 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Rainbow Islands  (c) Taito 1987   + Jumping
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index d8c4fe9ed9f..cc4bd0503a2 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Rally X      (c) 1980 Namco
diff --git a/src/mame/drivers/ramtek.c b/src/mame/drivers/ramtek.c
index db56a739839..760c06ca14e 100644
--- a/src/mame/drivers/ramtek.c
+++ b/src/mame/drivers/ramtek.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************
 
  Ramtek Discrete Games List
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 1b431ebc9ba..c8ed01aa849 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Rastan
diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c
index 5186b0cafaa..bef57baca23 100644
--- a/src/mame/drivers/rastersp.c
+++ b/src/mame/drivers/rastersp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bell-Fruit/ATD RasterSpeed hardware
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 770623e49f7..b5339fd344a 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Real Battle Mahjong King by 'Game Men System Co. Ltd.'
 
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index 5c90001cde3..d34b9ae413d 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Red Corsair */
 
 /* skeleton driver */
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 7d335f9c0fb..84925ef46ef 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************
 
     re900.c
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 3b8a0eb77f0..fc277997195 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                       -= Billiard Academy Real Break =-
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 6eff5ad8d8d..688e6cebf02 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     redalert.c, Irem M27 hardware
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 934dea06ee6..533547ea704 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Zero Hour / Red Clash
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 7323599ed76..b429b27474b 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Renegade
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 293790f6f6d..ceeb0667fa6 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Return of the Invaders
diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c
index ea01d7c335f..797fee84dc5 100644
--- a/src/mame/drivers/rgum.c
+++ b/src/mame/drivers/rgum.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Royal Gum
diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c
index 4523bd4c6dc..0fd23d54464 100644
--- a/src/mame/drivers/rltennis.c
+++ b/src/mame/drivers/rltennis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 Reality Tennis - (c) 1993 TCH
 
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 8773dc1f606..65b91d189d3 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Real Mahjong Haihai                (c)1985 Alba
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index ae9af041943..bd7500cc707 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Rock'n Rage (GX620) (c) 1986 Konami
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 257ffd6e7d7..4012df6ecea 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Roc'n Rope (c) 1983 Konami
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index a94156d2c18..4e4037e6403 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Data East 'Rohga' era hardware:
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 0324a633aa0..45fe32ffdc4 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Rollergames (GX999) (c) 1991 Konami
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index e2601bd5a56..b8a310076ab 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Fighting Roller (c) 1983 Kaneko
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index 5976f98804d..a6563594c76 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Rotary Fighter, 01/1979, Kasco (Kansai Seiki Seisakusho Co.)
  board KIV-101 CPU: xtal(??mhz), i8085A, 40 pin IC(i8255?), 6*ROM, 1*RAM, DIP(8 switches), ..
  board KIV-101 CRT: 2*RAM, lots of 74xx TTL
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 5137479466e..458663cc3bd 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Route 16/Stratovox memory map (preliminary)
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index e0591ad8357..ef2e7ef3a6d 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Royal Mahjong (c) 1981 Nichibutsu
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 419577f7a47..c7ec9f13fe3 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Runaway hardware
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 93e2351fda9..37878319511 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
    Run and Gun / Slam Dunk
diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c
index d3a51caff50..0c581cdc596 100644
--- a/src/mame/drivers/s11.c
+++ b/src/mame/drivers/s11.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
     Pinball
diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c
index a711486568b..2929db689c5 100644
--- a/src/mame/drivers/s11a.c
+++ b/src/mame/drivers/s11a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
     Pinball
diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c
index a48a4f5e39c..b1297c75481 100644
--- a/src/mame/drivers/s11b.c
+++ b/src/mame/drivers/s11b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Williams System 11b
 
diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c
index a2f33b18411..cc2822a4521 100644
--- a/src/mame/drivers/s11c.c
+++ b/src/mame/drivers/s11c.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Williams System 11c
 */
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index e55ccb67f47..88f301eb0e7 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Safari Rally hardware
diff --git a/src/mame/drivers/sam.c b/src/mame/drivers/sam.c
index f283049a6ca..7232a8d0998 100644
--- a/src/mame/drivers/sam.c
+++ b/src/mame/drivers/sam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index baf5c66adbf..91a04e213ce 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Sand Scorpion    (C) 1992 FACE
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 54b1c017573..fa21fdede85 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Sang Ho Soft 'Puzzle Star' PCB
diff --git a/src/mame/drivers/sanremo.c b/src/mame/drivers/sanremo.c
index 24636cbef3a..b25918c2da4 100644
--- a/src/mame/drivers/sanremo.c
+++ b/src/mame/drivers/sanremo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Number One.
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index a3c0a2135fb..9602159e865 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Sauro
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index c622728014d..a28d6c97a44 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     savquest.c
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 3f3d8646d02..452dbfecf29 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Super Basketball memory map (preliminary)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index c6580c24b11..70a64025f76 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************
 Strike Bowling  (c)1982 Taito
 
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 683228fbc13..33aa5b5dbb5 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Super Breakout hardware
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 80b7d7684e0..68b9c71154c 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Space Bugger
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index ead37d0d5f1..a6147a25e3d 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Super Cobra hardware
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index e688e7636ff..7b6952bc39b 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  GX545 Scooter Shooter - (c) 1985 Konami
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 2cc703f1b17..19fe8ee7255 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Scramble hardware
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index c2bbecc8b24..cee4eb50c4f 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Eggs & Dommy
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 1df7076db1d..f2c85d6e6f0 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************************
 
   Playmark 'Super Derby' Hardware
diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c
index e64fc23bddf..04f259a1250 100644
--- a/src/mame/drivers/seabattl.c
+++ b/src/mame/drivers/seabattl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Sea Battle by Zaccaria
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index bae7910d1d9..32f80e651d1 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************
 
     Sega System C (System 14)/C2 Driver
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 75888312ac6..ff3b4413335 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega System E */
 
 /*
diff --git a/src/mame/drivers/segajw.c b/src/mame/drivers/segajw.c
index a382ea585ca..2d772071283 100644
--- a/src/mame/drivers/segajw.c
+++ b/src/mame/drivers/segajw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 ============================================================================
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 259a19e836b..59625718d33 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Sega LaserDisc Hardware
 Driver by Andrew Gardner from schematics with help from Daphne Source
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 6cb01c3f6d0..81ea376f1bb 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Sega System 24
  *
diff --git a/src/mame/drivers/segasp.c b/src/mame/drivers/segasp.c
index c0252cc882b..2d38aea78b9 100644
--- a/src/mame/drivers/segasp.c
+++ b/src/mame/drivers/segasp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Sega System SP (Spider)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 04e9a0158ff..5af5aa3ed2e 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
       Seibu SPI Hardware
       Seibu SYS386I
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index d6e5ac58e21..f9503eecb6d 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Seicross memory map (preliminary)
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 15bbb9074d5..9346c8c2ee7 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Senjyo / Star Force / Baluba-louk
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index a7476405ea6..6d287bfe3cc 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Seta Hardware =-
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 9341a7c9392..8a7381385a2 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Newer Seta Hardware =-
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 85ac3eb5d79..aec7817f46a 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Street Fighter
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 5ce09859b1c..5d5f559e15e 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 "CGA" Amcoe HW (c) 1999-2004 Amcoe
 
diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c
index ce11e4e4519..bd158fe8223 100644
--- a/src/mame/drivers/sfcbox.c
+++ b/src/mame/drivers/sfcbox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   sfcbox.c
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 08fbb430105..9d91af05d3b 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Super Free Kick / Spinkick by HEC (Haesung Enterprise Co.)
 
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 871100d39ea..ad9cdece6e3 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************
 Sega hardware based on their SG-1000 console
 Driver by Tomasz Slanina  analog [at] op.pl
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 45d05f883a2..900d622615a 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
  Shadow Force (c)1993 Technos
  Preliminary Driver by David Haywood
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 3dd81edd456..929f2b84e46 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Shanghai 3           (c)1993 Sunsoft     (68000     AY8910 OKI6295)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index c31c61607b4..812bcbd1758 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Shanghai
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 6b106733c0e..6db5547bf68 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Dynamic Ski
 (c)1984 Taiyo
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index a7386605038..e94058a70c8 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Shaolin's Road
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index a55e2debf62..734d42755c3 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Shisen
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index d0e9ca901d0..435179d6cae 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Shoot Out (USA)             (c) 1985 Data East USA      DE-0219
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index f438caacd98..c8057538c71 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Driver by Jarek Burczynski, started by Tomasz Slanina  dox@space.pl
diff --git a/src/mame/drivers/shtzone.c b/src/mame/drivers/shtzone.c
index 538af9b6ef4..b0793e603fe 100644
--- a/src/mame/drivers/shtzone.c
+++ b/src/mame/drivers/shtzone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 "Sega Shooting Zone" aka "Sega Sharp Shooter"
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 9b80a8d4d14..d390b7ee829 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sidearms
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index cc319f8f8e2..1b766e37935 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Side Pocket - (c) 1986 Data East
diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c
index 0b4d664496e..e16f5ea1e0d 100644
--- a/src/mame/drivers/sigmab52.c
+++ b/src/mame/drivers/sigmab52.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   SIGMA B52 SYSTEM.
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index e6468423f32..b614668c704 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
                                      -= Sigma B-98 Hardware / Sammy Medal Games =-
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 24bb219ef3b..9fe0be3f5dc 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* The Legend of Silk Road - Unico 1999 */
 
 /* Preliminary Driver by David Haywood */
diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c
index 76abb67fd40..d3c2549a295 100644
--- a/src/mame/drivers/silvmil.c
+++ b/src/mame/drivers/silvmil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Silver Millennium
 
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 40df17f2293..5f98337f005 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   "Simple" 156 based Data East Hardware
diff --git a/src/mame/drivers/simple_st0016.c b/src/mame/drivers/simple_st0016.c
index ebf65b0b8ab..04051da43c4 100644
--- a/src/mame/drivers/simple_st0016.c
+++ b/src/mame/drivers/simple_st0016.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************
 
   Seta custom ST-0016 chip based games.
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 9dcd200aab4..8d3a1364348 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The Simpsons (c) 1991 Konami Co. Ltd
diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c
index 6f0238db83c..3a5a04dd3af 100644
--- a/src/mame/drivers/skeetsht.c
+++ b/src/mame/drivers/skeetsht.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Dynamo Skeet Shot
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index e28ef09b8ce..28d7096d385 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************************************
 
     Skimaxx
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 548ee3d095c..241e673f6a5 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  2010.04.05. stephh
 
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index daecc753651..a28db8952d2 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Sky Diver hardware
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 44f5103cafa..bdb2f1b4f18 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                         -= Sky Fox / Exerizer =-
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 054d47ad3f4..8d7a95706ea 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Dragon Buster (c) 1984 Namco
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index 564ec1de408..dff9e45acdf 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************************
 
   Sky Lancer / Butterfly / Mad Zoo / Super Star 97
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index 39e5a9fb9c8..b581b354f8f 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sky Raider driver
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index a6891b816eb..cd19c8b2f68 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index c61a5b56ec5..9d95ca49a42 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Slapshot (c) Taito 1994
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 4a7b0ed890f..720322a5226 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Sliver - Hollow Corp.1996
 driver by Tomasz Slanina
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index 854a5baaa91..a03710e7112 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Slot Carnival, (1985, Wing Co,Ltd)
diff --git a/src/mame/drivers/smsmcorp.c b/src/mame/drivers/smsmcorp.c
index bddab266c36..e1f32d32f15 100644
--- a/src/mame/drivers/smsmcorp.c
+++ b/src/mame/drivers/smsmcorp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SMS Manufacturing Corp hardware
 
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 9f1865d4928..2e87087b421 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Arcade games (hacks of console games) running on SNES harware.
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 876bbefd276..c4f34b8abc2 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 snk.c
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index ee19ce4657a..161c262fa72 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sasuke vs. Commander
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 2e96e03c0e8..724d89d0c6e 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     POW - Prisoners Of War (US version 1)    A7008   SNK 1988
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 3b14cd79d4a..dae19674e95 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
 
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index bd2a13f63ac..a9c52dc6a08 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Snow Brothers (Toaplan) / SemiCom Hardware
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index bb65d814714..c409b1f608a 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Solomon's Key
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 9e341d5f0eb..30b5b69d527 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Son Son memory map (preliminary)
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index f8b3b8a4d70..9ac1c7db58c 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Super Othello (c)1986 Fujiwara/Success
 
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index bfd8f44b142..bb48945320d 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Space Firebird hardware
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 29b05fc5edd..47fdf01c51a 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************
 
 Space Guerrilla PCB Layout
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index ed1632e500f..463392f4171 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
  Super Pinball Action (c) 1991 Tecmo
 ********************************************************************************
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 56a31a80e42..038b5964f26 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Space Force Memory Map
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index 77f93ae3bdd..2f9f7dfa59f 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Super Dodge Ball / Nekketsu Koukou Dodgeball Bu
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 382960a942c..a3a1cfcac9b 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Speed Ball / Music Ball
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 560e5efd795..1f65362d54c 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** DRIVER INFO & NOTES ******************************************************
  Speed Spin (c)1994 TCH
   driver by David Haywood & Farfetch'd
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 4c8a7dd0cf8..499a6e7082e 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Super Eagle Shot
 (c)1994 Seta (distributed by Visco)
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 9df460c2ac5..9e75e409d49 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sigma Spiders hardware
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 4b7cbdcd2b9..bf3cd99edf2 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Splash! (c) 1992 Gaelco
diff --git a/src/mame/drivers/splus.c b/src/mame/drivers/splus.c
index 3ef49e96a16..52085830864 100644
--- a/src/mame/drivers/splus.c
+++ b/src/mame/drivers/splus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     S-PLUS (S+)
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index 8882971ca9a..482c4a7737d 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Super Poker (IGS)
 Driver by Mirko Buffoni
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 859794adb79..3d09bc96004 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Super Cross II (JPN Ver.)
 (c)1986 GM Shoji
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index b760b905e46..52286809958 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Sprint 2 hardware
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 352c4fe772f..331526e8d9d 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sprint 4 driver
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 65bf054e180..2549234fd4d 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sprint 8 driver
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 6e4f832661b..8955f63248d 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     S.P.Y. (c) 1989 Konami
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index c0903ff5d4c..5bfa2c9936b 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Super Real Mahjong P2
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 04a278cf138..d63ac47d6bb 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Super Real Mahjong P5
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index ac2d05af386..58acb7cafe9 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Super Real Mahjong P6 (JPN Ver.)
     (c)1996 Seta
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 21c252d60e2..61508e7f962 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Speed Rumbler
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 00e0b1f5fa0..bcd8c8009ca 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
  'RISC PC' hardware
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index e1549e2dcb1..06d5ac53cf0 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Super Shanghai Dragon's Eye             (c) 1992 Hot-B
diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c
index 59de324f935..71dc3185e8f 100644
--- a/src/mame/drivers/sshot.c
+++ b/src/mame/drivers/sshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 * Model Racing's Super Shot
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index e4c1a8a67c9..e412efed903 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  'Swinging Singles' by Ent. Ent. Ltd
  driver by Tomasz Slanina
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 8dc6e92a701..330a9657b77 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super Slam (c)1993 Playmark */
 
 /*
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 7c3b83ecdf9..0c6ea2caa14 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Syusse Oozumou
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 7843bf8f11c..61ef12e14bf 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Super Speed Race driver
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index b4282c1b9a2..2c08215f8d3 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************
  Super Speed Race Jr (c) 1985 Taito
  driver by  Tomasz Slanina
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index 35e002d6aa9..9c040717cef 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************/
 /*                                                     */
 /* Yachiyo "Space Stranger/Space Stranger 2"           */
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index adb43fc2c89..0d10afb123f 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                     -= Seta, Sammy, Visco (SSV) System =-
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 77df4bb0999..83ccf1a1259 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Sega "Space Tactics" Driver
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 9bb57076754..1fde8b6e997 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Stadium Hero (Japan)            (c) 1988 Data East Corporation
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 17ea239b595..9172f828e32 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Ramtek Star Cruiser Driver
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index 53bab888e61..63d501f1190 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Star Fire/Fire One system
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 4d87cf248d9..84668087c60 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Starship 1 driver
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 03f2dc36e6c..bb072ef8609 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Star Wars hardware
diff --git a/src/mame/drivers/stellafr.c b/src/mame/drivers/stellafr.c
index 75ee1b198bd..4e2c0725199 100644
--- a/src/mame/drivers/stellafr.c
+++ b/src/mame/drivers/stellafr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Stella
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 88a1669c65d..f422e18a8b3 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************          (by Mark McDougall)
  *** STREET FIGHT hardware ***  This has been adapted from the excellent
  *****************************  Psychic 5 description (by Roberto Ventura)
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index c105a8185e0..15dda253a1a 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Steel Force
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index e5429cdc072..22249a83f78 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 Strength & Skill (c) 1984 Sun Electronics
diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c
index 5b59f3594e4..3b5391f1963 100644
--- a/src/mame/drivers/stuntair.c
+++ b/src/mame/drivers/stuntair.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Stunt Air by Nuova Videotron 1983
diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c
index eb6ad63a157..373e019c141 100644
--- a/src/mame/drivers/su2000.c
+++ b/src/mame/drivers/su2000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Virtuality SU2000 hardware
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 327dfcdf941..3d458fd70de 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Subs hardware
diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c
index 870e6db256d..5fb10eb2938 100644
--- a/src/mame/drivers/subsino2.c
+++ b/src/mame/drivers/subsino2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
                                  -= Subsino (Newer) Tilemaps Hardware =-
diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c
index 0c73d538744..6fada7c7974 100644
--- a/src/mame/drivers/summit.c
+++ b/src/mame/drivers/summit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Summit Coin - Push Over (c)1981
diff --git a/src/mame/drivers/sumt8035.c b/src/mame/drivers/sumt8035.c
index fa77c9523b9..00ed46e697e 100644
--- a/src/mame/drivers/sumt8035.c
+++ b/src/mame/drivers/sumt8035.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Summit Coin - 8035 hardware
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index ae94711dba2..14ed56c09ff 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -=  SunA 16 Bit Games =-
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index a2d9412c31c..adcb5d58827 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -=  SunA 8 Bit Games =-
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 8da461ce703..903f3fd921e 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Super Burger Time     (c) 1990 Data East Corporation (DE-0343)
diff --git a/src/mame/drivers/supduck.c b/src/mame/drivers/supduck.c
index 40e4a943cd8..d2158889006 100644
--- a/src/mame/drivers/supduck.c
+++ b/src/mame/drivers/supduck.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************
 
    Super Duck (c) 1992 Comad
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 1cda4db1f89..6685c2ffde0 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Super Chase                         (c) 1992 Taito
diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c
index 3f9f84bde5d..d9e8e4edef6 100644
--- a/src/mame/drivers/supercrd.c
+++ b/src/mame/drivers/supercrd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
   Super Card - Fun World.
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index eb5201896a2..d5d56d6e7a1 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Universal System 1
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index c5008e44110..b24cbd222c8 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Prebillian        (c) 1986 Taito
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 38d3876e052..cdb33a8877c 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Super Tank
diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c
index 364abd14ece..2ec7f216186 100644
--- a/src/mame/drivers/superwng.c
+++ b/src/mame/drivers/superwng.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
 Super Wing - (c) 1985 Wing (UPL?)
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index 67da4f20978..95159bc628f 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Super Locomotive
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 3c8dbd68caf..1276a7a7dbb 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Super Kaneko Nova System
     Original Driver by Sylvain Glaize
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 3b7ef920770..0c978cb7b81 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** DRIVER INFORMATION & NOTES ***********************************************
 
 Super Slams - Driver by David Haywood
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 6109a92614d..62ef6f16ca5 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Surprise Attack (Konami GX911) (c) 1990 Konami
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 612ad6fb40e..477a4815455 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Sega System 1 / System 2
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index a02c9278b5c..5916bcb1f73 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     System 16 / 18 bootlegs
 
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index 6a98b6dcf04..217a2eada49 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tag Team Wrestling hardware description:
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index f91d7b36245..8d8dd4504ff 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tail to Nose / Super Formula - (c) 1989 Video System Co.
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index fbc7ccb63c3..a780a1b1fff 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito B System
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 481aa2fdb92..df47e46601a 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito F2 System
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 9635f30e88a..920cd56df98 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito F3 Package System (aka F3 Cybercore System)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index be86cf41af4..821e1a90904 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito H system
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index c1f539af84f..e69956bc752 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Taito L-System
 
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index d800e89c341..4bc09d4a877 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************
 
 Taito  'O System'
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 0a61deabd67..c07800cc902 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index f47915c6136..78c057f3692 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Z System [twin 68K with optional Z80]
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index 80479d3be47..852ba2a55be 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 GNET Motherboard
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 7a3e678c72e..0924a4f44f5 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Taito JC System
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index 53812d3c23c..79a267a95d7 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Taito Power-JC System
 
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index d0e11798c01..5dc3df017df 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito SJ system
diff --git a/src/mame/drivers/taitottl.c b/src/mame/drivers/taitottl.c
index 6b4b8eb98d6..901fb204e98 100644
--- a/src/mame/drivers/taitottl.c
+++ b/src/mame/drivers/taitottl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Taito Discrete Hardware Games
diff --git a/src/mame/drivers/taitotx.c b/src/mame/drivers/taitotx.c
index ba7f95f3fff..e2f240f2e6f 100644
--- a/src/mame/drivers/taitotx.c
+++ b/src/mame/drivers/taitotx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Taito Type X Skeleton
  - PC based platforms
 
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 0e5ccc188f2..0b5b66b63e5 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
    Taito Type-Zero hardware
 
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index e08ece8bac7..3d93c250573 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Taito Wolf System
 
     Driver by Ville Linde
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index d008ecb05d6..b8cc1a8f304 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Tank 8 driver
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index acaf02f076b..fc555e8c0c4 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tank Battalion memory map (preliminary)
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 4f46ce7bf3c..37822bf10b3 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tank Busters memory map
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 242f16cf8fa..bc0090fdec1 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Tao Taido             (c) 1993 Video System
diff --git a/src/mame/drivers/tapatune.c b/src/mame/drivers/tapatune.c
index 0940ef336f5..d4cc7d82749 100644
--- a/src/mame/drivers/tapatune.c
+++ b/src/mame/drivers/tapatune.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tap a Tune
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index 2f5b5a11863..64596c4d7ff 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Target Hits (c) 1994 Gaelco (Designed & Developed by Zigurat. Produced by Gaelco)
diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c
index a25e849e7ee..ffab0b366a2 100644
--- a/src/mame/drivers/tasman.c
+++ b/src/mame/drivers/tasman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Konami Gambling Games ("Tasman" hardware)
   System GX derivative
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 09627983132..d1de4752a4d 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Apache 3                                            ATF-011
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index 2a7c4d5b7aa..9194c2815cb 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
     Time Attacker
 
diff --git a/src/mame/drivers/taxidriv.c b/src/mame/drivers/taxidriv.c
index 7e6fe117762..20b81291426 100644
--- a/src/mame/drivers/taxidriv.c
+++ b/src/mame/drivers/taxidriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taxi Driver  (c) 1984 Graphic Techno
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 1a6aefe439d..4987d965c49 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** Tecmo Bowl (c)1987 Tecmo
 
 driver by David Haywood
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 090160afae7..ba6abaa642f 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Thunder Ceptor board
  *  (C) 1986 Namco
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 7b67ad819c3..d22b4e24b57 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taiwan Chess Legend
 Uniwang, 1995
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index e16516159fb..a721e15eb40 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 tecmo.c
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index cba50c5fd27..6f794f2d004 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Ganbare Ginkun  (Japan)  (c)1995 TECMO
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 3db6798ac49..15f639de5a3 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Tecmo System
  Driver by Farfetch, David Haywood & Tomasz Slanina
  Protection simulation by nuapete
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 1720aef93a7..0e9b7a76a2c 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Notes: DJH 04 Jan 2008
 
   fixed gridiron079gre (shared access to spriteram was broken)
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index e8b3b08e040..4e91768703f 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Tempest hardware
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index b9dbf26655b..6ca8e42aeba 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 Terra Cresta (preliminary)
 Nichibutsu 1985
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 7c15f3e969e..7562be170ef 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Tetris Plus 2 =-
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index b53dbf6d4d8..9d92ef3dd54 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami Target Panic (cabinet test PCB)
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index c7cd01f9f99..b60f8dffe8c 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     TODO:
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index b28bb92237d..8fd6ead9b55 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Run Deep / The Deep =-
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 84db65527ea..b4826feb92d 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The Pit/Round Up/Intrepid/Super Mouse memory map (preliminary)
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 2bf459982df..d7566564acb 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
 Shark Attack
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 108cef40772..683fd77a1d9 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Thunder Hoop II: Strikes Back (c) 1994 Gaelco
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index db00ce1cb0d..07f2754fc54 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Super Contra  (GX775) (c) 1988 Konami
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 6e27a071cc6..66ad20dc21a 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
   TIA-MC1 driver
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index ef1d42553db..59263921aa9 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tiger Road     (C) 1987 Capcom (licensed to Romstar)
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 7b345eb55b2..67c98fc0fe5 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Time Limit (c) 1983 Chuo
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index cdc2c1e21fe..a0e269095d3 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Time Pilot
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 74af7831811..733e52ffada 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                       -= Touch Master / Galaxy Games =-
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index b2b6f98c3b4..94ecee030a1 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* tmmjprd.c
 
  - split from rabbit.c  (it uses the same GFX chip, but is otherwise a different PCB, and until the methods
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index cb567d13ef3..a29295e024c 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 This driver contains several Konami 68000 based games. For the most part they
diff --git a/src/mame/drivers/tmspoker.c b/src/mame/drivers/tmspoker.c
index 4bfd4485867..cb3c27dbad0 100644
--- a/src/mame/drivers/tmspoker.c
+++ b/src/mame/drivers/tmspoker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Unknown TMS9980 Poker Game  <--- We need the real name & manufacturer! :)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index e8768503b7c..54e6924eec9 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 7490311c622..da6d257f1dd 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         ToaPlan game hardware from 1988-1991
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index e3cb8ce25cb..05e3467999e 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
         ToaPlan      game hardware from 1991 - 1994
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 922e5f6e074..4a4c57ae687 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Toki
diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c
index ebfbdcf2c34..ce87243c2ff 100644
--- a/src/mame/drivers/tokyocop.c
+++ b/src/mame/drivers/tokyocop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Tokyo Cop
 
 TODO:
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index 8dbbdfc3cf7..a633d57e49d 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Atari Tomcat prototype hardware
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 06c2d938794..e632c3dc29e 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************+************************************************************
 
 Top Speed / Full Throttle    (c) Taito 1987
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index fd9926dd114..367106b33e7 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tora Tora (c) 1980 Game Plan
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index ebb0df4ec75..5cbefd850f9 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Atari Tournament Table driver
diff --git a/src/mame/drivers/tourvis.c b/src/mame/drivers/tourvis.c
index 477581b6468..336a07ee739 100644
--- a/src/mame/drivers/tourvis.c
+++ b/src/mame/drivers/tourvis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     TourVision
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 1d92ebc227e..ccd6f5d7a2f 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************
 
 Libble Rabble (c) 1983 Namco
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index 91d82245c16..468d77f8fab 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Time Pilot 84  (c) 1984 Konami
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 6505eb14aed..cac7593b0ba 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Track & Field / Hyper Olympic
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index 3c20bef068c..21965d61e59 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Traverse USA / Zippy Race  (c) 1983 Irem
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index 0e92df4fdc8..a85948758f6 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Triforce Skeleton
  -- split from Naomi.c
 
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index e903f0c4dbe..5da2fdc6669 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Triple Hunt Driver
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index 3b6d743d9de..33b695afbaa 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************************
 
   Truco-Tron - (c) 198? Playtronic SRL, Argentina.
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index ea8b28aebac..8ab6804294a 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Truco Clemente (c) 1991 Miky SRL
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index a69e6012faa..9f9ab6b6e42 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Trivia Madness
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index e8e3722814b..13930746fab 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Trivia Quest
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 8b2259c7b43..7794ec982d8 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************
 
  Pro Baseball Skill Tryout (JPN Ver.)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 9cda0ce3a86..e57978205ad 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Samurai, Nunchackun, Yuke Yuke Yamaguchi-kun (c) Taito 1985
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 12f0d3f4896..53873ae75cc 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Table Tennis Champions
    (c) 1995 Gamart
 
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 52c1a890607..386a01acc14 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tube Panic
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 9c4d965ac3d..e22929793e4 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Tug Boat
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index a324b3199ef..c54a57e0518 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   the following run on hardware which is physically not the same as
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index c1803eb925d..4143b84d46f 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Tumblepop (World)     (c) 1991 Data East Corporation
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index dedf819a395..834774112c7 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Tunnel Hunt hardware
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index bcfc49ce228..0bd1b947494 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Sega Z80-3D system
diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c
index b05dededada..577d3ab019f 100644
--- a/src/mame/drivers/turrett.c
+++ b/src/mame/drivers/turrett.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Turret Tower by Dell Electronics
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index b7849650a6a..bb48b47d1eb 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tutankham
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index c7d5a49a9f0..fe6a2f6f4b2 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami "Twin16"
 
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index e02214bec82..e823e5ea690 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
         ToaPlan game hardware from 1987
diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c
index aa6a5733f02..b0394714703 100644
--- a/src/mame/drivers/twinkle.c
+++ b/src/mame/drivers/twinkle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Twinkle System
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 2efa996a04a..a1249bd7120 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Twins
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index b620f409d5d..a8c78d77daa 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatsumi TX-1/Buggy Boy hardware
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 96da81b95ca..5ee06bd4c90 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     United Amusements PC-Engine based hardware
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index b2e6a1ef587..70b016a5410 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ultraman (c) 1991  Banpresto / Bandai
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index edad1a059e9..e950f79b480 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Ultra Tank driver
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 3eefeb5ce9c..1d1c682e294 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Konami Ultra Sports hardware
 
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index aee0e807fc3..e4af74138b3 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Underfire                           (c) 1993 Taito
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 26e0362e1e7..7872742f435 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Unico Games =-
diff --git a/src/mame/drivers/unkfr.c b/src/mame/drivers/unkfr.c
index c6714879478..43ef67c24b3 100644
--- a/src/mame/drivers/unkfr.c
+++ b/src/mame/drivers/unkfr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Unknown Fruit Machine ROMs
 
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 990fa988b86..b1fcb20bef6 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     Up Scope
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 3255d088aef..e088d3b5c44 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 US Games - Trivia / Quiz / 'Amusement Only' Gambling Games
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 1a19f263ede..3fa6404d51b 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Vapor Trail (World version)  (c) 1989 Data East Corporation
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 64b794f8475..3ed8e978550 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Vastar memory map (preliminary)
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index c426adda602..c14866b0dd7 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************************************************
  Championship VBall
  Driver by Paul "TBBle" Hampson
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index a156dc2715f..6a977a47ec6 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Virtual Combat hardware games.
 
diff --git a/src/mame/drivers/vectrex.c b/src/mame/drivers/vectrex.c
index 98accf09b4c..88d11dd9ae5 100644
--- a/src/mame/drivers/vectrex.c
+++ b/src/mame/drivers/vectrex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************
 
 GCE Vectrex
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index d26c747280b..bf03cf7e296 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Vega by Olympia
 ---------------
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index a7d252051ae..c09ef8b134f 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
  Eolith 32 bits hardware: Vega system
 
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 24103b8371f..546ccaae331 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Vendetta (GX081) (c) 1991 Konami
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index c53167400bf..7be50e5ae65 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exidy Vertigo hardware
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 9fd5ce8b4df..a0a2b787060 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VIC Dual Game board
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 4c13079d6da..c220efaef5c 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Video Pinball driver
diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c
index a55048bfc8d..c0970b8f12e 100644
--- a/src/mame/drivers/videopkr.c
+++ b/src/mame/drivers/videopkr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     VIDEO POKER - IGT/INTERFLIP
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index ef910062437..00b454ba6f8 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Vigilante
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 7aeb2252613..f2fc9c8c70d 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Konami Viper Hardware Overview (last updated 5th June 2011 10:56pm)
diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c
index e82f03d0371..16a3be7d3c2 100644
--- a/src/mame/drivers/vlc.c
+++ b/src/mame/drivers/vlc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*     vlc.c
 Multi-games from VLC Nevada 1995
 CGA monitor 15Khz 60hz
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index afdd8074447..949118ada6c 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
 Volfied (c) 1989 Taito Corporation
diff --git a/src/mame/drivers/voyager.c b/src/mame/drivers/voyager.c
index 0cd0af108be..1de4c79695e 100644
--- a/src/mame/drivers/voyager.c
+++ b/src/mame/drivers/voyager.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************
 
 Star Trek Voyager (c) 2002 Team Play, Inc. / Game Refuge / Monaco Entertainment
diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c
index 464815f9253..a8985f6446d 100644
--- a/src/mame/drivers/vp101.c
+++ b/src/mame/drivers/vp101.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Play Mechanix / Right Hand Tech "VP100" and "VP101" platforms
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index a7d3241c701..86d669d6d6d 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Vegas Roulette
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 98ae7a2b307..939be8c51af 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index ca0aaa9af4e..c1344811fa5 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Vulgus memory map (preliminary)
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 1c66fdbfa5f..c46284640b7 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
 Wall Crash by Midcoin (c) 1984
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 25a9bbfdbc6..8234fd8ea44 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         ToaPlan game hardware from 1987
diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c
index c4760b0c10e..83aab5822ee 100644
--- a/src/mame/drivers/warpsped.c
+++ b/src/mame/drivers/warpsped.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Meadows Warp Speed
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 1a8442de49d..93b2af1a700 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Namco early 8080-based games
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 8d11e459e5a..2326651e764 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Dual Screen Games
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 25cfa8ebfa6..c4c145e05ef 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 World Cup 90 ( Tecmo ) driver
 -----------------------------
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index e7d9f51ebcd..baecc48c7ac 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 World Cup 90 bootleg driver
 ---------------------------
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index a1a5dbe1962..e3f8b0fb3fb 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                         WEC Le Mans 24  &   Hot Chase
 
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 6b6b3053c54..a1e0a07f312 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
  Welltris (c)1991 Video System
 
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index de4bd516aa0..9c82dd1fab1 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 World Grand Prix    (c) Taito Corporation 1989
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 6228c41569f..3b51a82a733 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************
 
 Wheels & Fire
diff --git a/src/mame/drivers/white_mod.c b/src/mame/drivers/white_mod.c
index af5fa3fe126..b581f5a218a 100644
--- a/src/mame/drivers/white_mod.c
+++ b/src/mame/drivers/white_mod.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Stern Whitestar (modified)
 */
diff --git a/src/mame/drivers/whitestar.c b/src/mame/drivers/whitestar.c
index 4a17b7706a8..394b7d7b4fc 100644
--- a/src/mame/drivers/whitestar.c
+++ b/src/mame/drivers/whitestar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Sega/Stern Whitestar
 */
diff --git a/src/mame/drivers/wildpkr.c b/src/mame/drivers/wildpkr.c
index e9a39ecb600..115311e7c7d 100644
--- a/src/mame/drivers/wildpkr.c
+++ b/src/mame/drivers/wildpkr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Wild Poker
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index bfeb2e9ad5a..111cfb5e4e5 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Williams 6809 system
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 73a6f705385..b579c226b6a 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Wink    -   (c) 1985 Midcoin
 
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 1c28df9434e..366c25d80f4 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                 Wiping
                 (C) 1982 Nichibutsu
@@ -39,6 +41,13 @@ dip: 6.7 7.7
 #include "includes/wiping.h"
 
 
+void wiping_state::machine_start()
+{
+	save_item(NAME(m_flipscreen));
+	save_item(NAME(m_main_irq_mask));
+	save_item(NAME(m_sound_irq_mask));
+}
+
 /* input ports are rotated 90 degrees */
 READ8_MEMBER(wiping_state::ports_r)
 {
@@ -76,7 +85,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, wiping_state )
 	AM_RANGE(0x9000, 0x93ff) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0x9800, 0x9bff) AM_RAM AM_SHARE("share2")
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(main_irq_mask_w)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(wiping_flipscreen_w)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(flipscreen_w)
 	AM_RANGE(0xa003, 0xa003) AM_WRITE(subcpu_reset_w)
 	AM_RANGE(0xa800, 0xa807) AM_READ(ports_r)
 	AM_RANGE(0xb000, 0xb7ff) AM_RAM
@@ -291,7 +300,7 @@ static MACHINE_CONFIG_START( wiping, wiping_state )
 	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
 	MCFG_SCREEN_SIZE(36*8, 28*8)
 	MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
-	MCFG_SCREEN_UPDATE_DRIVER(wiping_state, screen_update_wiping)
+	MCFG_SCREEN_UPDATE_DRIVER(wiping_state, screen_update)
 	MCFG_SCREEN_PALETTE("palette")
 
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", wiping)
@@ -374,5 +383,5 @@ ROM_END
 
 
 
-GAME( 1982, wiping,  0,      wiping, wiping, driver_device,  0, ROT90, "Nichibutsu", "Wiping", 0 )
-GAME( 1983, rugrats, wiping, wiping, rugrats, driver_device, 0, ROT90, "Nichibutsu", "Rug Rats", 0 )
+GAME( 1982, wiping,  0,      wiping, wiping, driver_device,  0, ROT90, "Nichibutsu", "Wiping", GAME_SUPPORTS_SAVE )
+GAME( 1983, rugrats, wiping, wiping, rugrats, driver_device, 0, ROT90, "Nichibutsu", "Rug Rats", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 8c61a876179..11bb7e1483e 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Witch / Pinball Champ '95
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 55906470be1..5ac76cdb697 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Seibu Stinger/Wiz hardware
diff --git a/src/mame/drivers/wmg.c b/src/mame/drivers/wmg.c
index 0c3903f471c..612da04d86d 100644
--- a/src/mame/drivers/wmg.c
+++ b/src/mame/drivers/wmg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************
  *
  *  Williams Multigame (6-game version) driver, by Robbbert,
diff --git a/src/mame/drivers/wms.c b/src/mame/drivers/wms.c
index 14ad2aad7a1..ea216173654 100644
--- a/src/mame/drivers/wms.c
+++ b/src/mame/drivers/wms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************************
 
   WMS 360 / 550 (also 3601?) CPU 1.5 Plus board
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 94d29122285..83d80a3d61f 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Wolf Pack (prototype) driver
diff --git a/src/mame/drivers/wpc_an.c b/src/mame/drivers/wpc_an.c
index 7273fd50946..c67faebc5ea 100644
--- a/src/mame/drivers/wpc_an.c
+++ b/src/mame/drivers/wpc_an.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Williams WPC (Alpha Numeric)
 */
diff --git a/src/mame/drivers/wpc_dcs.c b/src/mame/drivers/wpc_dcs.c
index 4adcacdf72d..1459bfca610 100644
--- a/src/mame/drivers/wpc_dcs.c
+++ b/src/mame/drivers/wpc_dcs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Williams WPC with DCS sound */
 
diff --git a/src/mame/drivers/wpc_dot.c b/src/mame/drivers/wpc_dot.c
index 202f873004d..0d6e5de193d 100644
--- a/src/mame/drivers/wpc_dot.c
+++ b/src/mame/drivers/wpc_dot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Williams WPC Dot Matrix */
 
diff --git a/src/mame/drivers/wpc_flip1.c b/src/mame/drivers/wpc_flip1.c
index 2dd4183890d..9f156be646a 100644
--- a/src/mame/drivers/wpc_flip1.c
+++ b/src/mame/drivers/wpc_flip1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Williams WPC Fliptronics I */
 
diff --git a/src/mame/drivers/wpc_flip2.c b/src/mame/drivers/wpc_flip2.c
index bef75b536e0..b8cffbe3e37 100644
--- a/src/mame/drivers/wpc_flip2.c
+++ b/src/mame/drivers/wpc_flip2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Williams WPC Fliptronics II */
 
diff --git a/src/mame/drivers/wpc_s.c b/src/mame/drivers/wpc_s.c
index 57ea33ac648..77add37fd8d 100644
--- a/src/mame/drivers/wpc_s.c
+++ b/src/mame/drivers/wpc_s.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 01f4210f983..382c99e17a1 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 World Rally (c) 1993 Gaelco (Designed & Developed by Zigurat. Produced by Gaelco)
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 1a1a11e9925..306666a0eb7 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
  WWF Superstars (C) 1989 Technos Japan  (drivers/wwfsstar.c)
 ********************************************************************************
diff --git a/src/mame/drivers/wyvernf0.c b/src/mame/drivers/wyvernf0.c
index c3929e27eac..5f46acf6523 100644
--- a/src/mame/drivers/wyvernf0.c
+++ b/src/mame/drivers/wyvernf0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Wyvern F-0 (1985, Taito)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index b13d6d334f0..7c3d0df61ec 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Solar Warrior / Xain'd Sleena
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index a77ceebb908..8a96322a5ba 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Xexex  (c) 1991 Konami - GX067
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index ac5ef82d215..0d26da8fcdb 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 X-Men
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 512a4cf47ee..e600dde3c4c 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 XOR WORLD (c) 1990 Gaelco
diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c
index 7bf0d85c94d..1da4a94531c 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 X Tom 3D
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index f1593af426f..88883f42dbd 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 XX Mission (c) 1986 UPL
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index dce27573187..6ff5ce02f26 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Xyonix *********************************************************************
 
 driver by David Haywood and Stephh
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 865b7adc155..9de45b0117b 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Yie Ar Kung-Fu memory map (preliminary)
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 89958c6a7ba..a27e42792de 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Yun Sung 16 Bit Games =-
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 3c8586207d2..3f0826d9728 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Yun Sung 8 Bit Games =-
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 0f4b9155e8a..a9c98ff1b74 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Signetics 2650 CPU Games
  *
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index a883e7b6e81..5c80b092c30 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Jack Rabbit memory map (preliminary)
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 2330b3cc68f..09cd1c3fc3c 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Zaxxon hardware
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 4995ddff9d8..5b432f62b93 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************
 
     Zero Zone memory map
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 26ff27e3248..027d019a230 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sony ZN1/ZN2 - Arcade PSX Hardware
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 11a5a7c8f5c..c20fff1cc3f 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Zodiack/Dogfight (c) 1983 Orca
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 8d82712a440..ffd910ac211 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Konami 'ZR107' Hardware
     Konami, 1995-1996
diff --git a/src/mame/etc/fd1094dp.c b/src/mame/etc/fd1094dp.c
index 5ae415f0022..204f9aab227 100644
--- a/src/mame/etc/fd1094dp.c
+++ b/src/mame/etc/fd1094dp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 FD1094 key dumper
diff --git a/src/mame/etc/jrcrypt.c b/src/mame/etc/jrcrypt.c
index b0ccd9fcf48..28ba754df47 100644
--- a/src/mame/etc/jrcrypt.c
+++ b/src/mame/etc/jrcrypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   jrcrypt.c
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index 41f33643a00..b4b3cf5b1be 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     1942
diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h
index 30a922032bb..f7ca70daf34 100644
--- a/src/mame/includes/1943.h
+++ b/src/mame/includes/1943.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     1943
diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h
index fc6ae8ca5cb..c6dc73218b6 100644
--- a/src/mame/includes/20pacgal.h
+++ b/src/mame/includes/20pacgal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ms.Pac-Man/Galaga - 20 Year Reunion hardware
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h
index 4af74e015aa..11658e915d1 100644
--- a/src/mame/includes/3do.h
+++ b/src/mame/includes/3do.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/3do.h
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 13d42da0b9b..5d092c3ed63 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/buggychl.h"
 #include "sound/msm5232.h"
 
diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h
index 1ca5e4268a7..75aaaa03b4b 100644
--- a/src/mame/includes/4enraya.h
+++ b/src/mame/includes/4enraya.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     IDSA 4 En Raya
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index 5ac14d3b427..0a0a3790a83 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     8080-based black and white hardware
diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h
index dcde848d457..6dd7ad424ed 100644
--- a/src/mame/includes/88games.h
+++ b/src/mame/includes/88games.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     88 Games
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index 82759e9bf43..a6c1c119a3b 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/decbac06.h"
 #include "video/decmxc06.h"
 
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index 888702bcdc0..244a0a093e2 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Aeroboto
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index e1521cdc750..daa32abe7c5 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/vsystem_spr.h"
 #include "video/vsystem_spr2.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index bdb9d9729cc..bd5170272e4 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Air Buster
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index 0285347c0d5..cc412b28475 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/k007232.h"
 #include "video/k052109.h"
 #include "video/k051960.h"
diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h
index 39dfcf5c336..b89c246bc59 100644
--- a/src/mame/includes/aliens.h
+++ b/src/mame/includes/aliens.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Aliens
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index 17eb8cdf869..af80581d04f 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     SNK/Alpha 68000 based games
diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h
index aac7039521a..eda2208c5ec 100644
--- a/src/mame/includes/ambush.h
+++ b/src/mame/includes/ambush.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ambush
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 73776d603ff..f4823c10cfc 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Amiga Computer / Arcadia Game System
 
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index a8b20cadc16..9497c504556 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class ampoker2_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index b12b0cb8da6..937dfc0d2a0 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     American Speedway
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index 0e2b8cabdf4..6568e390c73 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Angel Kids
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index c25920ed2a3..20dc276fb42 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class appoooh_state : public driver_device
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index 033635a1c71..964874c5dbc 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "video/excellent_spr.h"
 
diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h
index ad6cfefb60d..5fe18efe7b3 100644
--- a/src/mame/includes/arabian.h
+++ b/src/mame/includes/arabian.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sun Electronics Arabian hardware
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 632cc990961..8c12b413d97 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  *
  *  Acorn Archimedes custom chips (IOC, MEMC, VIDC)
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index 6cf9cf2fd60..1b8d6c6dc45 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/jalblend.h"
 
 class argus_state : public driver_device
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index 55a7e7578d2..a66c01ddb72 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* This it the best way to allow game specific kludges until the system is fully understood */
 enum {
 	ARKUNK = 0,  /* unknown bootlegs for inclusion of possible new sets */
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index bc13fd75755..5533202a3dc 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1414m4.h"
 #include "video/bufsprite.h"
 
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index 4cd5194857a..37faa4361e1 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Success Joe / Ashita no Joe
diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h
index 6c84f50ce0a..fcee83852e8 100644
--- a/src/mame/includes/asterix.h
+++ b/src/mame/includes/asterix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Asterix
diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h
index cbe2038e5d8..0a6f59bbaef 100644
--- a/src/mame/includes/asteroid.h
+++ b/src/mame/includes/asteroid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Asteroids hardware
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index a53a764d21a..350006594ae 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bally Astrocade-based hardware
diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h
index e613dff8e31..d9a8e4cacd0 100644
--- a/src/mame/includes/astrof.h
+++ b/src/mame/includes/astrof.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Astro Fighter hardware
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index f5c0d92cc33..e2c0461c4d0 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Asuka & Asuka  (+ Taito/Visco games on similar hardware)
diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h
index 441a1ce9b64..e01f19acb54 100644
--- a/src/mame/includes/atari.h
+++ b/src/mame/includes/atari.h
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
 
     Atari 400/800
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index 12a3cde0c3b..3b045871809 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Football hardware
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index 6408235614f..9ec8a413968 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Tetris hardware
diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h
index 91256799205..aa560446948 100644
--- a/src/mame/includes/avalnche.h
+++ b/src/mame/includes/avalnche.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Avalanche hardware
diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h
index 7590b9ffaf4..4a79397a219 100644
--- a/src/mame/includes/aztarac.h
+++ b/src/mame/includes/aztarac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Centuri Aztarac hardware
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 9d4b9ffbba2..cb21fb388a4 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/tms5110.h"
 
 class bagman_state : public driver_device
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index 682f19dd066..ca4f1c2bc21 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bank Panic
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index 3722fa55094..4bece2fdc95 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 
 class baraduke_state : public driver_device
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index 5fb7c0d7161..943ec7bd43a 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Battle Lane Vol. 5
diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h
index 72633eccc20..5779d6f5e25 100644
--- a/src/mame/includes/battlera.h
+++ b/src/mame/includes/battlera.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/huc6260.h"
 #include "video/huc6270.h"
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index 3ca1121aee5..e9a6d355023 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Battle Cross
diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h
index 67ccc9c4057..c24880b972e 100644
--- a/src/mame/includes/battlnts.h
+++ b/src/mame/includes/battlnts.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Konami Battlantis Hardware
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index abcb8c1c8b8..a37ec33e90c 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 
 class bbusters_state : public driver_device
diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h
index af7e9736f2c..d2d11d68f15 100644
--- a/src/mame/includes/beezer.h
+++ b/src/mame/includes/beezer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/6522via.h"
 #include "cpu/m6809/m6809.h"
 
diff --git a/src/mame/includes/bfm_ad5.h b/src/mame/includes/bfm_ad5.h
index a67f2cf1a3d..e664e3716ab 100644
--- a/src/mame/includes/bfm_ad5.h
+++ b/src/mame/includes/bfm_ad5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/m68000/m68000.h"
 #include "includes/bfm_sc45.h"
 
diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h
index 20b866f76fe..12ab55557e4 100644
--- a/src/mame/includes/bfm_sc45.h
+++ b/src/mame/includes/bfm_sc45.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Scorpion 4 + 5 driver related includes */
 /* mainly used for stuff which is currently shared between sc4 / 5 sets to avoid duplication */
 
diff --git a/src/mame/includes/bfm_sc5.h b/src/mame/includes/bfm_sc5.h
index a2189cfc91a..f2a12e7ed0f 100644
--- a/src/mame/includes/bfm_sc5.h
+++ b/src/mame/includes/bfm_sc5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/m68000/m68000.h"
 #include "includes/bfm_sc45.h"
 
diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h
index a3c09debd42..a5f06779909 100644
--- a/src/mame/includes/bigevglf.h
+++ b/src/mame/includes/bigevglf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5232.h"
 
 class bigevglf_state : public driver_device
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index e0cc4f47465..f4d6257aa14 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class bigstrkb_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index 2b8866b3085..b814acb2051 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bionic Commando
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index 55f9926b9f3..6259ee9f6fc 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Bishi Bashi Champ Mini Game Senshuken
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index 0e80f764bca..6f2a04284c7 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/buggychl.h"
 
 class bking_state : public driver_device
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 34b4d576f58..8f077974922 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Blades of Steel
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index d6435bf0024..9b2b759e12a 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Black Tiger
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index edd5dd7c4c2..9bae62fc751 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blomby Car
diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h
index dbe28e5a83b..967afd2d710 100644
--- a/src/mame/includes/blockade.h
+++ b/src/mame/includes/blockade.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h
index e3398af7ea9..ec1975204ba 100644
--- a/src/mame/includes/blockhl.h
+++ b/src/mame/includes/blockhl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Block Hole
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index aac623819f5..e3e09842b79 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blockout
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index c8396cb5d90..112a5624d95 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class bloodbro_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index 723e7747637..0435c99922b 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blue Print
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index f76b8889de9..74d91ecd6ac 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Bogey Manor
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 650caa9bfc3..21f5e40a3f9 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Bomb Jack
diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h
index b7a024c1e50..1dd5586baca 100644
--- a/src/mame/includes/boogwing.h
+++ b/src/mame/includes/boogwing.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Boogie Wings
diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h
index 8a5c1714ac0..994d1e8c332 100644
--- a/src/mame/includes/bottom9.h
+++ b/src/mame/includes/bottom9.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Bottom of the Ninth
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index 008b7b8d206..6230f761180 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Break Thru
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 5f7f184276f..e89c4adcd61 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Basketball hardware
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index 4c60bc805b8..c98b49bd29f 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Burger Time hardware
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index e12def8338b..c777f5eec83 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class bublbobl_state : public driver_device
 {
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 3cd03811077..1b16b9958df 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     buggychl
 */
diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h
index 6cb893619ac..4a2c4212e64 100644
--- a/src/mame/includes/bwidow.h
+++ b/src/mame/includes/bwidow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #ifndef BWIDOW_H_
 #define BWIDOW_H_
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index ed32d96ecb2..36e5ad3700d 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     B-Wings
@@ -13,18 +15,26 @@ class bwing_state : public driver_device
 public:
 	bwing_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_videoram(*this, "videoram"),
-		m_spriteram(*this, "spriteram"),
-		m_paletteram(*this, "paletteram"),
-		m_fgscrollram(*this, "fgscrollram"),
-		m_bgscrollram(*this, "bgscrollram"),
-		m_gfxram(*this, "gfxram"),
 		m_maincpu(*this, "maincpu"),
 		m_subcpu(*this, "sub"),
 		m_audiocpu(*this, "audiocpu"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
-		m_vrambank(*this, "vrambank") { }
+		m_vrambank(*this, "vrambank"),
+		m_videoram(*this, "videoram"),
+		m_spriteram(*this, "spriteram"),
+		m_paletteram(*this, "paletteram"),
+		m_fgscrollram(*this, "fgscrollram"),
+		m_bgscrollram(*this, "bgscrollram"),
+		m_gfxram(*this, "gfxram") { }
+
+	/* device */
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_subcpu;
+	required_device<cpu_device> m_audiocpu;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<palette_device> m_palette;
+	required_device<address_map_bank_device> m_vrambank;
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_videoram;
@@ -49,39 +59,37 @@ public:
 	/* misc */
 	UINT8 *m_bwp123_membase[3];
 
-	/* device */
-	required_device<cpu_device> m_maincpu;
-	required_device<cpu_device> m_subcpu;
-	required_device<cpu_device> m_audiocpu;
-	required_device<gfxdecode_device> m_gfxdecode;
-	required_device<palette_device> m_palette;
-	required_device<address_map_bank_device> m_vrambank;
-
 	DECLARE_WRITE8_MEMBER(bwp3_u8F_w);
 	DECLARE_WRITE8_MEMBER(bwp3_nmimask_w);
 	DECLARE_WRITE8_MEMBER(bwp3_nmiack_w);
 	DECLARE_READ8_MEMBER(bwp1_io_r);
 	DECLARE_WRITE8_MEMBER(bwp1_ctrl_w);
 	DECLARE_WRITE8_MEMBER(bwp2_ctrl_w);
-	DECLARE_WRITE8_MEMBER(bwing_spriteram_w);
-	DECLARE_WRITE8_MEMBER(bwing_videoram_w);
+	DECLARE_WRITE8_MEMBER(spriteram_w);
+	DECLARE_WRITE8_MEMBER(videoram_w);
 	DECLARE_WRITE8_MEMBER(fgscrollram_w);
 	DECLARE_WRITE8_MEMBER(bgscrollram_w);
 	DECLARE_WRITE8_MEMBER(gfxram_w);
-	DECLARE_WRITE8_MEMBER(bwing_scrollreg_w);
-	DECLARE_WRITE8_MEMBER(bwing_paletteram_w);
+	DECLARE_WRITE8_MEMBER(scrollreg_w);
+	DECLARE_WRITE8_MEMBER(paletteram_w);
+
 	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
 	DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed);
-	DECLARE_DRIVER_INIT(bwing);
+
 	TILE_GET_INFO_MEMBER(get_fgtileinfo);
 	TILE_GET_INFO_MEMBER(get_bgtileinfo);
 	TILE_GET_INFO_MEMBER(get_charinfo);
-	TILEMAP_MAPPER_MEMBER(bwing_scan_cols);
+	TILEMAP_MAPPER_MEMBER(scan_cols);
+
+	DECLARE_DRIVER_INIT(bwing);
 	virtual void machine_start();
 	virtual void machine_reset();
 	virtual void video_start();
-	UINT32 screen_update_bwing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(bwp3_interrupt);
+
+	UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, UINT8 *ram, int pri );
+	
+	INTERRUPT_GEN_MEMBER(bwp3_interrupt);
+
 	void fix_bwp3(  );
 };
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index e2d09c608f3..83b5c4d27d4 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Battle Zone hardware
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 244e294f30d..203148f0553 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 0fa8ee90f00..85892aecbd6 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/6850acia.h"
 #include "machine/clock.h"
 
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 16b2282876c..1ad48316f35 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Canyon Bomber hardware
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 25c51ee4acd..44d669d97c5 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Coors Light Bowling/Bowl-O-Rama hardware
diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h
index ea0dbc0fcdc..4f0a927cece 100644
--- a/src/mame/includes/carjmbre.h
+++ b/src/mame/includes/carjmbre.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     carjmbre
diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h
index 8fc22640e73..8ec6ba10825 100644
--- a/src/mame/includes/carpolo.h
+++ b/src/mame/includes/carpolo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exidy Car Polo hardware
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index d5a89b2d43a..2f033c1215a 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cave hardware
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index 40b371a082b..1cc3380eabe 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Capcom Baseball
diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h
index 650611b3d66..12def1840da 100644
--- a/src/mame/includes/cbuster.h
+++ b/src/mame/includes/cbuster.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Crude Buster
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index d02afea2db1..3fd178597ef 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Crystal Castles hardware
diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h
index 18a7c72b567..9bff4d6e190 100644
--- a/src/mame/includes/cchasm.h
+++ b/src/mame/includes/cchasm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Cinematronics Cosmic Chasm hardware
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 5860d6a19b1..a3389f24be0 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class cclimber_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index ea05bbea9f9..da687b94a2f 100644
--- a/src/mame/includes/cdi.h
+++ b/src/mame/includes/cdi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _INCLUDES_CDI_H_
 #define _INCLUDES_CDI_H_
 
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index 6184ad604aa..2abaaa59ba2 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Centipede hardware
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index a5c273d5554..9788ab8fea6 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #define MCU_INITIAL_SEED    0x81
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index fc77de93c52..48ef21463e0 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Talbot - Champion Base Ball - Exciting Soccer
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index aecb34a6ee4..f807fb60f31 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class changela_state : public driver_device
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index 4c29084979e..7cfb0241efd 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Cheeky Mouse
diff --git a/src/mame/includes/chihiro.h b/src/mame/includes/chihiro.h
index 8a5f12110d1..73acd6ae920 100644
--- a/src/mame/includes/chihiro.h
+++ b/src/mame/includes/chihiro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * geforce 3d (NV2A) vertex program disassembler
  */
diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h
index 466acc104cb..f2772ba0eb0 100644
--- a/src/mame/includes/chqflag.h
+++ b/src/mame/includes/chqflag.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Chequered Flag
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index c08214cd911..79f1b529a4f 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CIDELSA__
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index d115bf2488b..7936de7671f 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 class circus_state : public driver_device
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index a9aa57835f8..f29f0393ea5 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Circus Charlie
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index 607137de27c..9dfb88a6c07 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* TODO: some variables are per-game specifics */
 #include "sound/okim6295.h"
 
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 6f57cc41f80..be09bd81efe 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     City Connection
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 3e243cc2adb..75c0d383c0d 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Cloak & Dagger hardware
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index a9ed3c4d87f..1ff5b25602c 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Cloud 9 (prototype) hardware
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index c4bdc9de7ec..c3ce08d5457 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class clshroad_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h
index a979f643981..ef47ab5871b 100644
--- a/src/mame/includes/cninja.h
+++ b/src/mame/includes/cninja.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Caveman Ninja (and other DECO 16bit titles)
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index c942af20ab5..e38e981ec6b 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Combat School
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index e96f2b99bf3..9d86264dc54 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Commando
diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h
index 0071fc196a2..ed922e9bfee 100644
--- a/src/mame/includes/compgolf.h
+++ b/src/mame/includes/compgolf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Competition Golf Final Round
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index e4d77c45a4b..bd81bc90cac 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Contra / Gryzor
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index c78467b45f4..d8fdad9a027 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Cops 01
diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h
index ee6a0c78366..a24b7cae5d8 100644
--- a/src/mame/includes/copsnrob.h
+++ b/src/mame/includes/copsnrob.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Cops'n Robbers hardware
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 6a69d0f92f8..f1f8eb74ac9 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Cosmic Guerilla & other Universal boards (in cosmic.c)
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 437a96799b5..8b93136a2ae 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Capcom CPS1/2 hardware
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index e22f2165735..d37bef6dfe6 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Capcom CPS-3 Hardware
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index fa2a26505a3..775e75e1c83 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
 Crazy Ballooon
diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h
index 5876dc05163..8c4a208f1a0 100644
--- a/src/mame/includes/crgolf.h
+++ b/src/mame/includes/crgolf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Kitco Crowns Golf hardware
diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h
index 1e559e70468..03a07844e04 100644
--- a/src/mame/includes/crimfght.h
+++ b/src/mame/includes/crimfght.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Crime Fighters
diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h
index 4e999cb86f6..5f03a488aee 100644
--- a/src/mame/includes/crospang.h
+++ b/src/mame/includes/crospang.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Cross Pang
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index e2b28af9b2e..a7ca6127d9c 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/z80/z80.h"
 #include "video/bufsprite.h"
 #include "video/vsystem_spr.h"
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index 0871d2897d4..a00542dcfce 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Century CVS System
diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h
index 66515a5eaa4..da867597523 100644
--- a/src/mame/includes/darius.h
+++ b/src/mame/includes/darius.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Darius
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index bdde9204236..7feeb1ce2d6 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/t5182.h"
 
 class darkmist_state : public driver_device
diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h
index 8ebb638605d..4a63755b041 100644
--- a/src/mame/includes/darkseal.h
+++ b/src/mame/includes/darkseal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/deco16ic.h"
 #include "video/bufsprite.h"
 #include "video/decospr.h"
diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h
index 39eb7ee96d7..790303429bd 100644
--- a/src/mame/includes/dassault.h
+++ b/src/mame/includes/dassault.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Desert Assault
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 796c8e6109e..2776dda51bb 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Dragonball Z
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index a2c81714e0a..ecd058622c8 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     dc.h - Sega Dreamcast includes
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index fa377b68ae6..8bd5c71fe87 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class dcon_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index 3806699721e..d1a9d6873a5 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     D-Day
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index 4e794670b89..c3ace0962ff 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Double Dragon & Double Dragon II (but also China Gate)
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index d3eec72b3a2..fc7f3d2ef09 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Double Dragon 3 & The Combatribes
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index bef8d1e3003..6c0bb6198ab 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Double Dribble
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index ff8ece8d97c..4ffa507392c 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"
 
 class deadang_state : public driver_device
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index 320d698c2fe..3b58f24b1cb 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/bankdev.h"
 #include "video/decbac06.h"
 #include "video/decmxc06.h"
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 579d0c2d8a6..a8667e6cb9a 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/bufsprite.h"
 #include "video/decbac06.h"
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 68a5bb913cf..47d27a667af 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/decobsmt.h"
 #include "video/bufsprite.h"
 #include "video/decospr.h"
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 84f58699fcc..07f184895dc 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "machine/deco146.h"
 #include "sound/ymz280b.h"
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index 268b702309a..9dfd70ae46a 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifdef MAME_DEBUG
 #define LOGLEVEL  5
 #else
diff --git a/src/mame/includes/decocrpt.h b/src/mame/includes/decocrpt.h
index 84c1cf3fed8..42abdf4631a 100644
--- a/src/mame/includes/decocrpt.h
+++ b/src/mame/includes/decocrpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*----------- defined in machine/decocrpt.c -----------*/
 
 void deco56_decrypt_gfx(running_machine &machine, const char *tag);
diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h
index ea8a4a7fda4..e4191c0b5a2 100644
--- a/src/mame/includes/deniam.h
+++ b/src/mame/includes/deniam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Deniam games
diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h
index 32de8051ed8..a5b535e2c37 100644
--- a/src/mame/includes/dietgo.h
+++ b/src/mame/includes/dietgo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Diet Go Go
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index fed2344efae..6999453873a 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     DJ Boy
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index 39505d91f0d..de04caf5d9f 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/ataintf.h"
 #include "video/konami_helper.h"
 #include "video/k054156_k054157_k056832.h"
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index 2afff895247..113cd1c0e87 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo Donkey Kong hardware
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index bd37ccd18c9..fd63b4678b5 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Mr. Do's Castle hardware
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index d4be4277df2..e3fdc8a8ce2 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define PIXMAP_COLOR_BASE  (16 + 32)
 #define BITMAPRAM_SIZE      0x6000
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
index bd198227d45..0f2bc9de262 100644
--- a/src/mame/includes/dooyong.h
+++ b/src/mame/includes/dooyong.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 
 class dooyong_state : public driver_device
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index 55f815332c6..dbb260d83b5 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Drag Race hardware
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index 12e01007fff..a8fcc992947 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/okim6295.h"
 #include "cpu/pic16c5x/pic16c5x.h"
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index d06b9024456..b704734ccf2 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Dr. Micro
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 45c74dde3f0..10a260a2292 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
       Dynax hardware
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index 110f9f98baf..9b30fa1e427 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"
 #include "video/bufsprite.h"
 
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index b7922c4c44c..576dcb8ff8e 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/mcs51/mcs51.h"
 #include "sound/qs1000.h"
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index 5b5a023028a..db0d4a61899 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Epos games
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index 56360f4ae5c..ea49d918884 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 #include "sound/msm5232.h"
 #include "sound/dac.h"
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index fbac457eebf..3e53b2f27d9 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ESD 16 Bit Games
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index 18f62ed4df1..b0e43a2a4fb 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Espial hardware games (drivers: espial.c)
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index 20aeda655c6..3ec9b95c714 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Entertainment Sciences RIP System hardware
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 0d8cfa82bb9..392a9389113 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Exed Exes
diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h
index c9d46dfcea6..5da3f48b83e 100644
--- a/src/mame/includes/exprraid.h
+++ b/src/mame/includes/exprraid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Express Raider
diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h
index 692d740e7fd..aa55e363563 100644
--- a/src/mame/includes/exterm.h
+++ b/src/mame/includes/exterm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gottlieb Exterminator hardware
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index a4cf615a18e..a9d1b787d48 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class exzisus_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index f2333962ecc..30dc1634ca8 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/vsystem_spr.h"
 #include "video/vsystem_spr2.h"
 #include "video/k053936.h"
diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h
index 8b315a6ba11..fee78143299 100644
--- a/src/mame/includes/fantland.h
+++ b/src/mame/includes/fantland.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class fantland_state : public driver_device
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 3ca5d622b1b..6a2218caad9 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Fast Freddie/Jump Coaster hardware
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 041a9fdc1a4..d43f11571ab 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Fast Lane
diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h
index 761a27c1ac3..120ca05b5de 100644
--- a/src/mame/includes/fcombat.h
+++ b/src/mame/includes/fcombat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 /* this is compied from Exerion, but it should be correct */
diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h
index c5076c17558..3b91b8a95a5 100644
--- a/src/mame/includes/fgoal.h
+++ b/src/mame/includes/fgoal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/mb14241.h"
 
 class fgoal_state : public driver_device
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index da3b281b548..bb8602dfc18 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Konami Finalizer
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
index 0afb6c5eb0c..554eb760f9d 100644
--- a/src/mame/includes/firetrap.h
+++ b/src/mame/includes/firetrap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Fire Trap
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index 8ffe02f2352..09e19240d4b 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
 Atari Fire Truck + Super Bug + Monte Carlo driver
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h
index 46332a06c0b..05c90f8f890 100644
--- a/src/mame/includes/fitfight.h
+++ b/src/mame/includes/fitfight.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class fitfight_state : public driver_device
 {
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index 2bb46a1748b..0a3a4062904 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Flak Attack / MX5000
diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h
index 5d568348c2c..b144283ab73 100644
--- a/src/mame/includes/flower.h
+++ b/src/mame/includes/flower.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class flower_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index af0b346ebdf..05780c8ab41 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5232.h"
 
 class flstory_state : public driver_device
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index 4f895b6ac7e..b59c76004b5 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class freekick_state : public driver_device
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index 8e342b67299..f3ee69e0620 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 
 class fromanc2_state : public driver_device
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index 13fef6cd778..e97b244eb16 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Game Driver for Video System Mahjong series and Pipe Dream.
diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h
index 96653e09212..a6bf46ccad0 100644
--- a/src/mame/includes/funkybee.h
+++ b/src/mame/includes/funkybee.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class funkybee_state : public driver_device
diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h
index eed6c079084..a6c7945a783 100644
--- a/src/mame/includes/funkyjet.h
+++ b/src/mame/includes/funkyjet.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Funky Jet
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index dc4879e4635..25c3aeded70 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class funworld_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h
index c2e980f1fe7..7162ad40734 100644
--- a/src/mame/includes/funybubl.h
+++ b/src/mame/includes/funybubl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class funybubl_state : public driver_device
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index 22baf4a2a86..01d7d9d341b 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "video/fuukifg.h"
 
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index d15ac2ecf6a..0317d2ddd81 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/fuukifg.h"
 
 /* Define clocks based on actual OSC on the PCB */
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index 7652419260b..cec230fea48 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gaelco game hardware from 1991-1996
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index 055e9b24df9..62d7c32c652 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/m68000/m68000.h"
 #include "video/bufsprite.h"
 #include "machine/eepromser.h"
diff --git a/src/mame/includes/gaelcrpt.h b/src/mame/includes/gaelcrpt.h
index 897484de1fd..092d896fc19 100644
--- a/src/mame/includes/gaelcrpt.h
+++ b/src/mame/includes/gaelcrpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*----------- defined in machine/gaelcrpt.c -----------*/
 
 UINT16 gaelco_decrypt(address_space &space, int offset, int data, int param1, int param2);
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 61f114f1b79..c7761ad856f 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ninja Gaiden
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index f54ea8cc587..a71656db49f 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 #include "sound/namco.h"
 #include "sound/samples.h"
diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h
index b11a85c4f23..d1e0913d4d3 100644
--- a/src/mame/includes/galastrm.h
+++ b/src/mame/includes/galastrm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "video/polylgcy.h"
 #include "video/tc0100scn.h"
diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h
index 555596f640d..275db515c84 100644
--- a/src/mame/includes/galaxia.h
+++ b/src/mame/includes/galaxia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Zaccaria Galaxia HW
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index cb1a503a837..c58f6504525 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Galaxian hardware family (old)
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index fdc56056b79..a3fe4cf4ff8 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Galivan - Cosmo Police
diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h
index c0533bfd9b7..c035d34a49a 100644
--- a/src/mame/includes/galpani2.h
+++ b/src/mame/includes/galpani2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/kaneko_spr.h"
 #include "sound/okim6295.h"
 #include "machine/eepromser.h"
diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h
index 2d56d126b48..a55b7d95e52 100644
--- a/src/mame/includes/galpanic.h
+++ b/src/mame/includes/galpanic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/kaneko16.h"
 
 class galpanic_state : public driver_device
diff --git a/src/mame/includes/galpnipt.h b/src/mame/includes/galpnipt.h
index f94c0deade9..9a34f511433 100644
--- a/src/mame/includes/galpnipt.h
+++ b/src/mame/includes/galpnipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by games in the galpanic.c driver
diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h
index d5536d19abe..641a78741b0 100644
--- a/src/mame/includes/galspnbl.h
+++ b/src/mame/includes/galspnbl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Hot Pinball
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index 22868175d3d..1b4bed68eb0 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 GAME PLAN driver
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 4f596232447..560391da6c5 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 #include "sound/samples.h"
 #include "machine/namcoio.h"
diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h
index 9d92cc3e205..583a423e75a 100644
--- a/src/mame/includes/gatron.h
+++ b/src/mame/includes/gatron.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class gatron_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 8bacf570640..6071e8afcdd 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Green Beret
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index bd7569c36ae..2da75a6f1ee 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/okim6295.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h
index bdc81c03b30..66cd9934732 100644
--- a/src/mame/includes/gijoe.h
+++ b/src/mame/includes/gijoe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     GI Joe
diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h
index 8d6127e9ae1..171f2654a5b 100644
--- a/src/mame/includes/ginganin.h
+++ b/src/mame/includes/ginganin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ginga NinkyouDen
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index 0e6afa4fabe..6d2622e6bbf 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class gladiatr_state : public driver_device
diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h
index e9cbddbb8d8..9ed066c20f0 100644
--- a/src/mame/includes/glass.h
+++ b/src/mame/includes/glass.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Glass
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index 2145925d645..c301f96ad91 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ghosts'n Goblins
diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h
index a1b9e48ca5a..0399467e1a3 100644
--- a/src/mame/includes/goal92.h
+++ b/src/mame/includes/goal92.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Goal! '92
diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h
index 3491a7be741..9260ea20c3d 100644
--- a/src/mame/includes/goindol.h
+++ b/src/mame/includes/goindol.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Goindol
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index db8edbbb34e..3d6819841cb 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "machine/ticket.h"
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 1fd348d6924..03979fa2ddb 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class gomoku_state : public driver_device
 {
diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h
index 358ef5a12eb..a1c3167bd19 100644
--- a/src/mame/includes/gotcha.h
+++ b/src/mame/includes/gotcha.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gotcha
diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h
index 933e3deba83..b7c2086192e 100644
--- a/src/mame/includes/gotya.h
+++ b/src/mame/includes/gotya.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 
 class gotya_state : public driver_device
diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h
index 20418e4b738..a7d3b0ee4c7 100644
--- a/src/mame/includes/gradius3.h
+++ b/src/mame/includes/gradius3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gradius 3
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index a03265c0486..2d8003b51e0 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito Grand Champ hardware
diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h
index d8843e60305..3355e60c573 100644
--- a/src/mame/includes/groundfx.h
+++ b/src/mame/includes/groundfx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/tc0100scn.h"
 #include "video/tc0480scp.h"
 
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index 529c90dadda..e90e38cc5d7 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __GSTRIKER_H
 #define __GSTRIKER_H
 
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index ef3385aac4d..19fc27e07e7 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h
index 6ff605c8240..6747e555086 100644
--- a/src/mame/includes/gumbo.h
+++ b/src/mame/includes/gumbo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gumbo - Miss Bingo - Miss Puzzle
diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h
index e2f78cb68df..4e23f5d8b97 100644
--- a/src/mame/includes/gunbustr.h
+++ b/src/mame/includes/gunbustr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "video/tc0480scp.h"
 
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index 1ed6968b1ec..4cfcef1a075 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gun Dealer
diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h
index b0ba3322e4b..9b2125a821d 100644
--- a/src/mame/includes/gunsmoke.h
+++ b/src/mame/includes/gunsmoke.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gun.Smoke
diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h
index 66c9130d652..914bd228418 100644
--- a/src/mame/includes/gyruss.h
+++ b/src/mame/includes/gyruss.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Gyruss
diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h
index d936fc7a58f..d3ee2421e1e 100644
--- a/src/mame/includes/hanaawas.h
+++ b/src/mame/includes/hanaawas.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Hana Awase
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 012a6bedcc7..e9ae37539ec 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -35,8 +35,11 @@ extern const device_type STEELTALP_BOARD_DEVICE;
 extern const device_type STRTDRIV_BOARD_DEVICE;
 extern const device_type HDRIVAIR_BOARD_DEVICE;
 extern const device_type HDRIVAIRP_BOARD_DEVICE;
+extern const device_type HARDDRIV_SOUND_BOARD_DEVICE;
 
 
+class harddriv_sound_board_device;
+
 class harddriv_state :  public device_t
 	/* public device_video_interface */
 {
@@ -48,14 +51,13 @@ public:
 	required_device<tms34010_device> m_gsp;
 	optional_device<tms34010_device> m_msp;
 	required_device<adsp21xx_device> m_adsp;
-	optional_device<cpu_device> m_soundcpu;
-	optional_device<cpu_device> m_sounddsp;
 	optional_device<cpu_device> m_jsacpu;
 	optional_device<dsp32c_device> m_dsp32;
 	optional_device<adsp2105_device> m_ds3sdsp;
 	optional_device<adsp2105_device> m_ds3xdsp;
 	optional_device<dac_device> m_ds3dac1;
 	optional_device<dac_device> m_ds3dac2;
+	optional_device<harddriv_sound_board_device> m_harddriv_sound;
 	optional_device<atari_jsa_base_device> m_jsa;
 
 	UINT8                   m_hd34010_host_access;
@@ -97,8 +99,6 @@ public:
 	UINT32                  m_msp_speedup_count[4];
 	UINT32                  m_adsp_speedup_count[4];
 
-	optional_shared_ptr<UINT16> m_sounddsp_ram;
-
 	UINT8                   m_gsp_multisync;
 	optional_shared_ptr<UINT8> m_gsp_vram;
 	optional_shared_ptr<UINT16> m_gsp_control_lo;
@@ -185,23 +185,6 @@ public:
 	UINT32                  m_dataval[MAX_MSP_SYNC];
 	int                     m_next_msp_sync;
 
-	/* audio state */
-	UINT8                   m_soundflag;
-	UINT8                   m_mainflag;
-	UINT16                  m_sounddata;
-	UINT16                  m_maindata;
-
-	UINT8                   m_dacmute;
-	UINT8                   m_cramen;
-	UINT8                   m_irq68k;
-
-	offs_t                  m_sound_rom_offs;
-
-	UINT8 *                 m_rombase;
-	UINT32                  m_romsize;
-	UINT16                  m_comram[0x400/2];
-	UINT64                  m_last_bio_cycles;
-
 	/* video state */
 	offs_t                  m_vram_mask;
 
@@ -215,32 +198,6 @@ public:
 	virtual void update_interrupts();
 	DECLARE_READ16_MEMBER(steeltal_dummy_r);
 	DECLARE_READ32_MEMBER(rddsp_unmap_r);
-	DECLARE_READ16_MEMBER(hd68k_snd_data_r);
-	DECLARE_READ16_MEMBER(hd68k_snd_status_r);
-	DECLARE_WRITE16_MEMBER(hd68k_snd_data_w);
-	DECLARE_WRITE16_MEMBER(hd68k_snd_reset_w);
-	DECLARE_READ16_MEMBER(hdsnd68k_data_r);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_data_w);
-	DECLARE_READ16_MEMBER(hdsnd68k_switches_r);
-	DECLARE_READ16_MEMBER(hdsnd68k_320port_r);
-	DECLARE_READ16_MEMBER(hdsnd68k_status_r);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_latches_w);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_speech_w);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_irqclr_w);
-	DECLARE_READ16_MEMBER(hdsnd68k_320ram_r);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_320ram_w);
-	DECLARE_READ16_MEMBER(hdsnd68k_320ports_r);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_320ports_w);
-	DECLARE_READ16_MEMBER(hdsnd68k_320com_r);
-	DECLARE_WRITE16_MEMBER(hdsnd68k_320com_w);
-	DECLARE_READ16_MEMBER(hdsnddsp_get_bio);
-	DECLARE_WRITE16_MEMBER(hdsnddsp_comport_w);
-	DECLARE_WRITE16_MEMBER(hdsnddsp_mute_w);
-	DECLARE_WRITE16_MEMBER(hdsnddsp_gen68kirq_w);
-	DECLARE_WRITE16_MEMBER(hdsnddsp_soundaddr_w);
-	DECLARE_READ16_MEMBER(hdsnddsp_rom_r);
-	DECLARE_READ16_MEMBER(hdsnddsp_comram_r);
-	DECLARE_READ16_MEMBER(hdsnddsp_compare_r);
 	void init_driver();
 	void init_multisync(int compact_inputs);
 	void init_adsp();
@@ -278,18 +235,10 @@ public:
 	INTERRUPT_GEN_MEMBER(hd68k_irq_gen);
 	TIMER_CALLBACK_MEMBER(deferred_adsp_bank_switch);
 	TIMER_CALLBACK_MEMBER(rddsp32_sync_cb);
-	DECLARE_WRITE16_MEMBER(hdsnddsp_dac_w);
-	optional_device<dac_device> m_dac;
 	required_device<mc68681_device> m_duart;
 	optional_device<asic65_device> m_asic65;
 	DECLARE_WRITE_LINE_MEMBER(harddriv_duart_irq_handler);
 
-	/*----------- defined in audio/harddriv.c -----------*/
-
-	void hdsnd_init();
-	void update_68k_interrupts();
-	TIMER_CALLBACK_MEMBER( delayed_68k_w );
-
 	/*----------- defined in machine/harddriv.c -----------*/
 
 	/* Driver/Multisync board */
@@ -477,6 +426,73 @@ protected:
 	virtual void device_reset();
 };
 
+class harddriv_sound_board_device :  public device_t
+{
+public:
+	// construction/destruction
+	harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	~harddriv_sound_board_device() {}
+
+	DECLARE_READ16_MEMBER(hd68k_snd_data_r);
+	DECLARE_READ16_MEMBER(hd68k_snd_status_r);
+	DECLARE_WRITE16_MEMBER(hd68k_snd_data_w);
+	DECLARE_WRITE16_MEMBER(hd68k_snd_reset_w);
+	
+	DECLARE_READ16_MEMBER(hdsnd68k_data_r);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_data_w);
+	DECLARE_READ16_MEMBER(hdsnd68k_switches_r);
+	DECLARE_READ16_MEMBER(hdsnd68k_320port_r);
+	DECLARE_READ16_MEMBER(hdsnd68k_status_r);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_latches_w);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_speech_w);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_irqclr_w);
+	DECLARE_READ16_MEMBER(hdsnd68k_320ram_r);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_320ram_w);
+	DECLARE_READ16_MEMBER(hdsnd68k_320ports_r);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_320ports_w);
+	DECLARE_READ16_MEMBER(hdsnd68k_320com_r);
+	DECLARE_WRITE16_MEMBER(hdsnd68k_320com_w);
+	DECLARE_READ16_MEMBER(hdsnddsp_get_bio);
+	
+	DECLARE_WRITE16_MEMBER(hdsnddsp_dac_w);
+	DECLARE_WRITE16_MEMBER(hdsnddsp_comport_w);
+	DECLARE_WRITE16_MEMBER(hdsnddsp_mute_w);
+	DECLARE_WRITE16_MEMBER(hdsnddsp_gen68kirq_w);
+	DECLARE_WRITE16_MEMBER(hdsnddsp_soundaddr_w);
+	DECLARE_READ16_MEMBER(hdsnddsp_rom_r);
+	DECLARE_READ16_MEMBER(hdsnddsp_comram_r);
+	DECLARE_READ16_MEMBER(hdsnddsp_compare_r);
+	
+protected:
+	virtual void device_start();
+	virtual void device_reset();
+	virtual machine_config_constructor device_mconfig_additions() const;
+	
+private:
+	required_device<cpu_device> m_soundcpu;
+	required_device<dac_device> m_dac;
+	required_device<cpu_device> m_sounddsp;
+	required_shared_ptr<UINT16> m_sounddsp_ram;
+	required_region_ptr<UINT8>  m_sound_rom;
+	
+	UINT8                   m_soundflag;
+	UINT8                   m_mainflag;
+	UINT16                  m_sounddata;
+	UINT16                  m_maindata;
+
+	UINT8                   m_dacmute;
+	UINT8                   m_cramen;
+	UINT8                   m_irq68k;
+
+	offs_t                  m_sound_rom_offs;
+
+	UINT16                  m_comram[0x400/2];
+	UINT64                  m_last_bio_cycles;
+	
+	void update_68k_interrupts();
+	TIMER_CALLBACK_MEMBER( delayed_68k_w );
+};
+
 /* Hard Drivin' */
 
 class harddriv_board_device_state :  public harddriv_state
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 27c41790ce6..d6afd49b23b 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Haunted Castle
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index 564f7250e5c..d29cdd30a2b 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/k053252.h"
 
 class hexion_state : public driver_device
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index 8b08af6b706..096c592e344 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Pirate Ship Higemaru
diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h
index e148a84db7c..c1827536f91 100644
--- a/src/mame/includes/himesiki.h
+++ b/src/mame/includes/himesiki.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Himeshikibu
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index 805468ffe0c..2e60c4de404 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Hitme hardware
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index 835a3c5941b..9d47f8e1bb3 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Hana Yayoi & other Dynax games (using 1st version of their blitter)
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 6f83990a298..81e5db15fc3 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/msm6242.h"
 #include "cpu/mips/mips3.h"
 #include "cpu/nec/v53.h"
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index e8195b1f08e..fd5ad8e8286 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Hole Land
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index 99056ebde40..886fea15225 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 #include "sound/sn76496.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h
index b6d1d181da8..810b60e60cf 100644
--- a/src/mame/includes/homerun.h
+++ b/src/mame/includes/homerun.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Jaleco Moero Pro Yakyuu Homerun hardware
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index 35fa77e792d..5f32c12aa62 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1413m3.h"
 
 class hyhoo_state : public driver_device
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index c100a2ca009..89922d78f0f 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/sn76496.h"
 #include "sound/vlm5030.h"
diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h
index b856eb8321a..bd3f7353c49 100644
--- a/src/mame/includes/hyprduel.h
+++ b/src/mame/includes/hyprduel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define RASTER_LINES 262
 #define FIRST_VISIBLE_LINE 0
 #define LAST_VISIBLE_LINE 223
diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h
index 92af680ce90..3e660c56aa3 100644
--- a/src/mame/includes/ikki.h
+++ b/src/mame/includes/ikki.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ikki
diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h
index 2979bcdd5fb..d5ff01e5388 100644
--- a/src/mame/includes/inufuku.h
+++ b/src/mame/includes/inufuku.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class inufuku_state : public driver_device
 {
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index f2eccbffdf6..bfa9e3a04b9 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class iqblock_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/iremipt.h b/src/mame/includes/iremipt.h
index b530a1db1a3..d2bb97cbca2 100644
--- a/src/mame/includes/iremipt.h
+++ b/src/mame/includes/iremipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by many games in mutiple IREM drivers
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index 97f73883d5f..c24ccaa05ea 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari I, Robot hardware
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 5df3f1f5e66..78ea8661b13 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     IronHorse
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index e405b8bdb04..90270b4cdf7 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Jack the Giant Killer
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index 50327004165..97ed7712f2e 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define MASTER_CLOCK         XTAL_18_432MHz
 #define SOUND_CLOCK          XTAL_3_579545MHz
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index d4c05328c1e..64b185283cd 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Jailbreak
diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h
index f831a6648b1..c9621eefcc6 100644
--- a/src/mame/includes/jedi.h
+++ b/src/mame/includes/jedi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Return of the Jedi hardware
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 82c1ededcde..47e6c3f3bb7 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     JPM IMPACT with Video hardware
diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h
index 56df6526639..901bd2c3792 100644
--- a/src/mame/includes/jpmsys5.h
+++ b/src/mame/includes/jpmsys5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/m68000/m68000.h"
 #include "machine/6821pia.h"
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index 15e0aee2b46..7a2da26b534 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Kaneko 16 Bit Games =-
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index a79ff16b748..757f5aca3b5 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sun Electronics Kangaroo hardware
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index 9e3a44b3e89..714cf794432 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Karnov - Wonder Planet - Chelnov
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index 09dda8a0883..0dae89c7a4f 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Karate Champ
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index 3001c8ce2c5..35edbf9927c 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Kick Goal - Action Hollywood
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index 3f933004e65..702ed06d2ff 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     King of Boxer - Ring King
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index acb32e3177a..987ac5317f4 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Knuckle Joe
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index 44a09468286..a33b7b8d7ae 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/k056800.h"
 #include "sound/k054539.h"
 #include "cpu/tms57002/tms57002.h"
diff --git a/src/mame/includes/konamipt.h b/src/mame/includes/konamipt.h
index 5145b882643..e1c1eed6c4f 100644
--- a/src/mame/includes/konamipt.h
+++ b/src/mame/includes/konamipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by many games in multiple KONAMI drivers
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 2950906d5a9..e067e4df69c 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Sega KO Punch
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index 9124498d3d5..28376349333 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Kusayakyuu
diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h
index b100eaeafb0..3477924df69 100644
--- a/src/mame/includes/kyugo.h
+++ b/src/mame/includes/kyugo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kyugo hardware games
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index a6e993497bd..675ea0376a9 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Labyrinth Runner
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index fea7726ba51..6eae73598b7 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Universal 8106-A2 + 8106-B PCB set
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index dba600a34fb..f1ed82faf70 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Lady Frog
diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h
index 37679f619bb..ab42e797c55 100644
--- a/src/mame/includes/laserbat.h
+++ b/src/mame/includes/laserbat.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Laser Battle / Lazarian - Cat and Mouse
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index 8e02f434a50..4e2dcb2d81c 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Lasso and similar hardware
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 66bf04f10b1..36c545df014 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Last Duel
diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h
index af99739dbad..a86ef820ff2 100644
--- a/src/mame/includes/lazercmd.h
+++ b/src/mame/includes/lazercmd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/s2650/s2650.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index 3a8a89f5760..037e4f7fc6b 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "audio/seibu.h"
 #include "machine/raiden2cop.h"
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index 9b6cd02fb3f..20831dc6bd1 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 #include "video/decospr.h"
 #include "machine/deco146.h"
diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h
index 616bf0efcd4..fa4f93a4703 100644
--- a/src/mame/includes/lethal.h
+++ b/src/mame/includes/lethal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Lethal Enforcers
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index 97a16e08a46..47b52fd7ece 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class liberate_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h
index 007c51b47cf..acd174bf3c7 100644
--- a/src/mame/includes/liberatr.h
+++ b/src/mame/includes/liberatr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Liberator hardware
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index 869c9626cf6..326e9b5255c 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class lkage_state : public driver_device
 {
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index 2b0bd2d020d..200c6057d69 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Lock-On hardware
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 89aa2e7c2b8..1666e237ae5 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
                       -= IGS Lord Of Gun =-
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index 718488cfa47..a48eedac969 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class lsasquad_state : public driver_device
 {
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index eb014621292..b1ef69142fa 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class lucky74_state : public driver_device
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index b93b112782a..bcee7faaf07 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class lvcards_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 0d3d088d2a8..5febe083e4a 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 42dfc6b7824..83d96349940 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IREM M-10,M-11 and M-15 based hardware
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index d2016165432..dff7aa948ff 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Irem M107 hardware
diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h
index 1d60a14d7f5..92f5f03283a 100644
--- a/src/mame/includes/m52.h
+++ b/src/mame/includes/m52.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class m52_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h
index e6177ea0efd..9908f6b879f 100644
--- a/src/mame/includes/m57.h
+++ b/src/mame/includes/m57.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class m57_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h
index 2dfcfba406f..b0f18ddd6eb 100644
--- a/src/mame/includes/m58.h
+++ b/src/mame/includes/m58.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class m58_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index 33cc0b1cb47..0496b6d0a0b 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class m62_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 9b6aac4a5a8..8278b5f72bc 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Irem M72 hardware
diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h
index 076c71d07d5..b8e6fe872d4 100644
--- a/src/mame/includes/m79amb.h
+++ b/src/mame/includes/m79amb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 class m79amb_state : public driver_device
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 9ac7d7d9505..bb38b6a5695 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/m72.h"
 
 class m90_state : public driver_device
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 46e6eb13d93..fb5e957f7cc 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Irem M92 hardware
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index 68b107ca9b4..9dd65bc3efa 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Macross Plus
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 4ce0ed486d2..f80099dffd0 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mad Alien (c) 1980 Data East Corporation
diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h
index af3eccd3af6..775f7f67700 100644
--- a/src/mame/includes/madmotor.h
+++ b/src/mame/includes/madmotor.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mad Motor
diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h
index a690727eaf9..4b37ba941d4 100644
--- a/src/mame/includes/magmax.h
+++ b/src/mame/includes/magmax.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class magmax_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h
index a28fc728746..96333ef051e 100644
--- a/src/mame/includes/mainevt.h
+++ b/src/mame/includes/mainevt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     The Main Event / Devastators
diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h
index 032a2280be1..4936423148b 100644
--- a/src/mame/includes/mainsnk.h
+++ b/src/mame/includes/mainsnk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class mainsnk_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h
index 48bbd1c5e97..a400022a4c4 100644
--- a/src/mame/includes/malzak.h
+++ b/src/mame/includes/malzak.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Malzak
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 6089bff0b62..3a2d432a844 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/namcoio.h"
 #include "sound/dac.h"
 #include "sound/namco.h"
diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h
index b1e6970c65f..c5c2480294f 100644
--- a/src/mame/includes/marineb.h
+++ b/src/mame/includes/marineb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class marineb_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 11ccbe6f61f..68b52eee673 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef MARIO_H_
 #define MARIO_H_
 
diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h
index 8d0ad58cec6..965bbe0f934 100644
--- a/src/mame/includes/markham.h
+++ b/src/mame/includes/markham.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Markham
diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h
index 08929c579ff..910ac02de08 100644
--- a/src/mame/includes/matmania.h
+++ b/src/mame/includes/matmania.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class matmania_state : public driver_device
 {
diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h
index 0b37fef1537..b07cfe00bc9 100644
--- a/src/mame/includes/maygay1b.h
+++ b/src/mame/includes/maygay1b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h
index 86b59994dfd..49fe4de89d7 100644
--- a/src/mame/includes/mcatadv.h
+++ b/src/mame/includes/mcatadv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class mcatadv_state : public driver_device
 {
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index a1e64a6e6ea..4c3e0bcc16d 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Meadows S2650 hardware
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index 4413163ce98..1308ce5a7d3 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "coreutil.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 1bcc68f6b3f..548a07ce053 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Jaleco Mega System 1 =-
diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h
index d48f124d9a3..09190d6a25f 100644
--- a/src/mame/includes/megazone.h
+++ b/src/mame/includes/megazone.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Megazone
diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h
index e9c724e0873..fe6e0b75c0d 100644
--- a/src/mame/includes/mermaid.h
+++ b/src/mame/includes/mermaid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mermaid
diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h
index 2c59c0f5ea3..33b790f68f6 100644
--- a/src/mame/includes/metalmx.h
+++ b/src/mame/includes/metalmx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms34010/tms34010.h"
diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h
index 242aea28823..7eb708afa0d 100644
--- a/src/mame/includes/metlclsh.h
+++ b/src/mame/includes/metlclsh.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Metal Clash
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index 55899374b45..a9468364286 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Metro Games
diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h
index 08880887ba0..18b79731db6 100644
--- a/src/mame/includes/mexico86.h
+++ b/src/mame/includes/mexico86.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/2203intf.h"
 
 class mexico86_state : public driver_device
diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h
index c2165300eb9..55652c54680 100644
--- a/src/mame/includes/mhavoc.h
+++ b/src/mame/includes/mhavoc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Major Havoc hardware
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index 3bd69ece6c1..697be81f38b 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
      Microprose Games 3D hardware
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 9d01a55b5d7..42c9384ef69 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Driver for Midway T-unit games.
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 560209c9ec7..e5d22296d01 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Williams/Midway Y/Z-unit system
diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h
index c8afaccb4cc..fb846b5c86f 100644
--- a/src/mame/includes/mikie.h
+++ b/src/mame/includes/mikie.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mikie
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 7dd6d764a6c..e890db691ea 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mitchell hardware
diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h
index 87ad53902c4..809d749f594 100644
--- a/src/mame/includes/mjkjidai.h
+++ b/src/mame/includes/mjkjidai.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nvram.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index dc8b0f2f7fe..3c9747c918c 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/dsbz80.h"
 #include "audio/segam1audio.h"
 #include "cpu/v60/v60.h"
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 4105a48e4e5..890ca28f5d8 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/polylgcy.h"
 #include "audio/dsbz80.h"
 #include "audio/segam1audio.h"
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index aa5b171debe..c32d56fb500 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/poly.h"
 #include "bus/scsi/scsi.h"
 #include "machine/53c810.h"
diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h
index e44a36aa53d..43050f2c067 100644
--- a/src/mame/includes/momoko.h
+++ b/src/mame/includes/momoko.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Momoko 120%
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index 33a05b99b2b..a987cc2ca3e 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Wild West C.O.W.boys of Moo Mesa / Bucky O'Hare
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index c28bda1a7ca..b5076b9f45d 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mosaic
diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h
index e820e8a9c86..98fb9627ebd 100644
--- a/src/mame/includes/mouser.h
+++ b/src/mame/includes/mouser.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mouser
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index 68bea44d0f6..331e65acdec 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "machine/6821pia.h"
 #include "machine/6840ptm.h"
diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h
index df47f4c971d..0f0d4da3a55 100644
--- a/src/mame/includes/mrdo.h
+++ b/src/mame/includes/mrdo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mr. Do
diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h
index da0100b3e9c..9cbe6d6fe11 100644
--- a/src/mame/includes/mrflea.h
+++ b/src/mame/includes/mrflea.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mr. Flea
diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h
index d885c3fc668..024f1b1b6fd 100644
--- a/src/mame/includes/mrjong.h
+++ b/src/mame/includes/mrjong.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Mr. Jong
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 00f6256d3da..790296f069b 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class ms32_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index 75d2987fd6a..2808c2d1101 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/buggychl.h"
 #include "sound/msm5232.h"
 /* Disabled because the mcu dump is currently unavailable. -AS */
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index c3102167f71..ae3a39059b1 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class mugsmash_state : public driver_device
 {
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index ddb422f503d..d2d120d5244 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Multifish */
 
 
diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h
index b6f4732c98f..0e7b595e569 100644
--- a/src/mame/includes/munchmo.h
+++ b/src/mame/includes/munchmo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Munch Mobile
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index a0e80f7c258..0bb4d5b5ca7 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"    // for seibu_sound_decrypt on the MAIN cpu (not sound)
 
 class mustache_state : public driver_device
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index 7498624ad7b..05855ff8972 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 2081001b431..b7d60a34285 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Technos Mysterious Stones hardware
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index 203c3f22ac7..61696e339a1 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/k054539.h"
 #include "machine/k053252.h"
 #include "video/k055555.h"
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index 8f55c04823f..8fd3ed7d008 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _INCLUDES_N64_H_
 #define _INCLUDES_N64_H_
 
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index 5d2c69a1aa2..7886425fd00 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "sound/sn76477.h"
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index c2cbcc4b15d..9e4bfc190f0 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "namcos2.h"
 #include "video/c116.h"
 
diff --git a/src/mame/includes/namcoic.h b/src/mame/includes/namcoic.h
index 1006cc9d3e3..85e4e0d74de 100644
--- a/src/mame/includes/namcoic.h
+++ b/src/mame/includes/namcoic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* namcoic.h
 
 Custom Chips:                       Final Lap   Assault     LuckyWld    System21    NA1/2       NB1/2
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index ae00fd65814..cc739a69c88 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Namco NA-1 System hardware
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 2d5d95f83e7..23eb305ab04 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Namco System NB-1 hardware
diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h
index cb940155288..321df774cd1 100644
--- a/src/mame/includes/namcond1.h
+++ b/src/mame/includes/namcond1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   namcond1.h
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h
index 9f4bc050789..b5405bae472 100644
--- a/src/mame/includes/namcos1.h
+++ b/src/mame/includes/namcos1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/c117.h"
 #include "sound/dac.h"
 #include "sound/namco.h"
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index e527a107825..807d847423c 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   namcos2.h
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index e636e6b92a3..dfddffc7ebb 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**
  * @file namcos21.h
  */
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index cf325004b5f..258e5e0cffd 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Namco System 22 / Super System 22 hardware
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index f51921325a2..40274d02ba8 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 
 class namcos86_state : public driver_device
diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h
index def6e3d1cb8..fad374d146b 100644
--- a/src/mame/includes/naomi.h
+++ b/src/mame/includes/naomi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 naomi.h -> NAOMI includes
diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h
index 3c60b16239c..55dc71d17e4 100644
--- a/src/mame/includes/naughtyb.h
+++ b/src/mame/includes/naughtyb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/pleiads.h"
 
 class naughtyb_state : public driver_device
diff --git a/src/mame/includes/nb1413m3.h b/src/mame/includes/nb1413m3.h
index 04933f47bcb..d84417e2351 100644
--- a/src/mame/includes/nb1413m3.h
+++ b/src/mame/includes/nb1413m3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Machine Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/includes/nb1414m4.h b/src/mame/includes/nb1414m4.h
index 86e5ad9cb48..8ab82d9c4d4 100644
--- a/src/mame/includes/nb1414m4.h
+++ b/src/mame/includes/nb1414m4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class nb1414m4_device : public device_t,
 									public device_video_interface
 {
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index b617ea509b7..887626d8204 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/hd61830.h"
 #include "includes/nb1413m3.h"
 
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 76345b42fb8..9ea71be6ea1 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1413m3.h"
 
 class nbmj8891_state : public driver_device
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index 02ffd431548..4fb65de6583 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1413m3.h"
 
 class nbmj8900_state : public driver_device
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index 86f7ad9a7ad..c640a729d41 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1413m3.h"
 
 class nbmj8991_state : public driver_device
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 6dc27c73c78..608e67e4614 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     nbmj9195 - Nichibutsu Mahjong games for years 1991-1995
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index 67b5c2eda19..28e267c4d37 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/flt_rc.h"
 #include "sound/k007232.h"
 #include "sound/k005289.h"
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index 405b1212478..a6041196d40 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Neo-Geo hardware
diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h
index 8e65f10c200..a48704f7651 100644
--- a/src/mame/includes/news.h
+++ b/src/mame/includes/news.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class news_state : public driver_device
 {
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index f32cfea0292..f35693dc978 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     UPL "sprite framebuffer" hardware
diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h
index 56209b685ae..3a9fda22bb2 100644
--- a/src/mame/includes/ninjaw.h
+++ b/src/mame/includes/ninjaw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito Triple Screen Games
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index ef30406c5cd..6dbd8ba8669 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Night Driver hardware
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 27aedf6b8e0..33942f1ef0b 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 #include "machine/tmp68301.h"
 #define VRAM_MAX    3
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 7a86307dd75..82adf7c322e 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "machine/nmk004.h"
diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h
index 4012649651a..f1bbffa11ba 100644
--- a/src/mame/includes/norautp.h
+++ b/src/mame/includes/norautp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index bf6ebdb0b41..f17f41213a3 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class nova2001_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h
index c7395d655e6..2c2c074d6ed 100644
--- a/src/mame/includes/nycaptor.h
+++ b/src/mame/includes/nycaptor.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5232.h"
 
 class nycaptor_state : public driver_device
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
index 1630c37b693..7d5ee75248c 100644
--- a/src/mame/includes/ohmygod.h
+++ b/src/mame/includes/ohmygod.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Oh My God!
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index 46501cc4ce3..8b5a7ec16da 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ojanko High School & other Video System mahjong series
diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h
index fb8837b74f7..7a104c528a2 100644
--- a/src/mame/includes/oneshot.h
+++ b/src/mame/includes/oneshot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class oneshot_state : public driver_device
diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h
index 059c553a593..a8a74317ec0 100644
--- a/src/mame/includes/opwolf.h
+++ b/src/mame/includes/opwolf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Operation Wolf
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index 39b3314a4fd..5b2ca7ff348 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Orbit hardware
diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h
index c19a5c56286..48d1a61815d 100644
--- a/src/mame/includes/othunder.h
+++ b/src/mame/includes/othunder.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Operation Thunderbolt
diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h
index 87ee0c2c6d6..6147016a4e9 100644
--- a/src/mame/includes/overdriv.h
+++ b/src/mame/includes/overdriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Over Drive
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index 689bc5ddbef..b6704eceb03 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 
 class pacland_state : public driver_device
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index b21721dbb46..5d8710365f6 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 
 /*************************************************************************
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index f8f20cbc50a..c1ef6344f1c 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Pandora's Palace
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index af4dbc285df..25bef08201a 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class paradise_state : public driver_device
diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h
index 2ce1376f7d4..89d070ec5e4 100644
--- a/src/mame/includes/parodius.h
+++ b/src/mame/includes/parodius.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Parodius
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index b0413c3daed..70f942107d3 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pass_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index d054e3eddbc..03aa516cc8f 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/nb1413m3.h"
 
 class pastelg_state : public driver_device
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index ab815b38ff4..8e7ec36075f 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Pinball Action
diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h
index 2dd3a65328d..f4b4c873b80 100644
--- a/src/mame/includes/pcktgal.h
+++ b/src/mame/includes/pcktgal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/decbac06.h"
 
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index 6c5ea3ada51..33bf3d6d31a 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "machine/v3021.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index cc473a20216..446284c0019 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/pleiads.h"
 #include "sound/discrete.h"
 #include "sound/tms36xx.h"
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index 21b24c74cef..2f429ad0f15 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pingpong_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index 60b0b55e562..f71b781b336 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index c87c30ce82d..50c8743e883 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pitnrun_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h
index 90ff34f3d96..e6250c5c292 100644
--- a/src/mame/includes/pk8000.h
+++ b/src/mame/includes/pk8000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pk8000_base_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h
index 2c2948d6d67..5e0d5b1136f 100644
--- a/src/mame/includes/pktgaldx.h
+++ b/src/mame/includes/pktgaldx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Pocket Gal Deluxe
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index 82e1c278274..368ed8e7711 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/rp5h01.h"
 #include "sound/nes_apu.h"
 #include "video/ppu2c0x.h"
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index 59c787959dd..848207ef756 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "machine/eepromser.h"
 #include "cpu/pic16c5x/pic16c5x.h"
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index d4f018aae8c..d38dc75061e 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "video/k053936.h"
 #include "cpu/dsp56k/dsp56k.h"
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index 9017c19530a..74141fce9a7 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pokechmp_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index 4d0017c5f54..d36e1fda41c 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Pole Position hardware
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index 8bcff103aa2..9064531b225 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 
 #define SAMPLE_LENGTH 32
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index c521dafc36f..24ec0b5abaf 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Pool Shark hardware
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index 08ed9f48d3e..e05ef5b21d3 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class pooyan_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index 39a075505a4..7b5d8ae9b54 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class popeye_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h
index bf15dbdb525..f9e0471633a 100644
--- a/src/mame/includes/popper.h
+++ b/src/mame/includes/popper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Popper
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index 71ed30034e8..f604eb0065b 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/tms5220.h"
 
 class portrait_state : public driver_device
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index e4d069b8eda..6403575d56e 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nmk112.h"
 
 class powerins_state : public driver_device
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index 55faab9796c..605aacf29b4 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/upd7759.h"
 
 class prehisle_state : public driver_device
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index d4bd0f4121f..df2fc2af5f4 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Psikyo Games
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index 34a86dd2b8e..50d84c53098 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Psikyo PS6807 (PS4)
diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h
index b6d95f6ef09..c9d014175aa 100644
--- a/src/mame/includes/psikyosh.h
+++ b/src/mame/includes/psikyosh.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 #include "machine/eepromser.h"
 #include "cpu/sh2/sh2.h"
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index d3d8e9dc320..e92c7a74bcc 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/bankdev.h"
 #include "video/jalblend.h"
 
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 088b103af54..49af6a9f8d8 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Punch Out / Super Punch Out / Arm Wrestling
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index b088bfe25d4..fdcb4d5c97d 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/ataintf.h"
 #include "sound/k054539.h"
 #include "machine/k053252.h"
diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h
index c8779cc3834..b1bcf6f427d 100644
--- a/src/mame/includes/qix.h
+++ b/src/mame/includes/qix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Qix hardware
diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h
index bc46c4d6f78..55cf08d8184 100644
--- a/src/mame/includes/quasar.h
+++ b/src/mame/includes/quasar.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Zaccaria Quasar
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index ed4dbba10ae..da2a14fd254 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class quizdna_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index 5c572d5d73a..4212453cb60 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nmk112.h"
 
 class quizpani_state : public driver_device
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index 3e696d35ea2..053000793bb 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Seibu Raiden hardware
diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h
index d932d2c7d06..42f7a687859 100644
--- a/src/mame/includes/raiden2.h
+++ b/src/mame/includes/raiden2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"
 #include "machine/raiden2cop.h"
 #include "video/seibu_crtc.h"
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h
index b4ff4972194..9667bdc4236 100644
--- a/src/mame/includes/rainbow.h
+++ b/src/mame/includes/rainbow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Rainbow Islands
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 6a88a413c15..6ae22aa1a71 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/timeplt.h"
 #include "sound/namco.h"
 #include "sound/samples.h"
diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h
index 4187290fe21..ae31f8499b2 100644
--- a/src/mame/includes/rastan.h
+++ b/src/mame/includes/rastan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Rastan
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index dca2c50ba7e..06421d54f14 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/tmp68301.h"
 
 class realbrk_state : public driver_device
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index 7c624f8c2fa..813b36c6e70 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem Red Alert hardware
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index 3e8fc56db87..b3e8b6417d5 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 #define MCU_BUFFER_MAX 6
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index 6efbbb5b0b8..cc07e2defe3 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class retofinv_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h
index fa8fa4c117d..71cc4d23102 100644
--- a/src/mame/includes/rltennis.h
+++ b/src/mame/includes/rltennis.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 
 
diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h
index cc3660e0a29..164bda6f30f 100644
--- a/src/mame/includes/rockrage.h
+++ b/src/mame/includes/rockrage.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Rock'n Rage
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index 24ca273ef6c..772dac7b0e0 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class rocnrope_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h
index 7a3f226caa3..61064141269 100644
--- a/src/mame/includes/rohga.h
+++ b/src/mame/includes/rohga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Data East 'Rohga' era hardware
diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h
index 1393f50ba73..beb6a6230c6 100644
--- a/src/mame/includes/rollerg.h
+++ b/src/mame/includes/rollerg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Rollergames
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index d2b1009d7a3..4fafbde3ae1 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class rollrace_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h
index cf736855753..b17c56f9755 100644
--- a/src/mame/includes/route16.h
+++ b/src/mame/includes/route16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/sn76477.h"
 
 class route16_state : public driver_device
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 486775fac88..6c06e95a134 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class runaway_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index a258b83628e..a04986d0a44 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Run and Gun / Slam Dunk
diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h
index 4236f2c4722..e4d7af62c89 100644
--- a/src/mame/includes/s11.h
+++ b/src/mame/includes/s11.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * s11.h
  *
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index c6db7998ae3..338c7fd16f9 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/sp0256.h"
 
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 4a671bed6c2..f7234abdf3c 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/sn76496.h"
 #include "sound/vlm5030.h"
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index 5fe32af9d6b..112f95aecf1 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class sbugger_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index 2781c71e806..31445601b7b 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class scotrsht_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h
index 6c44551e48d..6e0864e21f7 100644
--- a/src/mame/includes/scramble.h
+++ b/src/mame/includes/scramble.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/i8255.h"
 #include "includes/galaxold.h"
 #include "sound/tms5110.h"
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index c2531e80d99..401c667396a 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class sderby_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/segaipt.h b/src/mame/includes/segaipt.h
index 6ba705ee3a1..2ad6605dc97 100644
--- a/src/mame/includes/segaipt.h
+++ b/src/mame/includes/segaipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by many games in multiple Sega drivers
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 323c95d39d1..837eee252ac 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Sega System 24
  *
diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h
index a772a03fd3c..bb5defddcd3 100644
--- a/src/mame/includes/segasp.h
+++ b/src/mame/includes/segasp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega SP (Spider)
 
  Naomi derived platform
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 8e084dd59e6..2a61b58fdc3 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Seibu SPI hardware
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index c7fe73d763c..cd5b23a4df1 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/nvram.h"
 
 class seicross_state : public driver_device
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index 2e469f6bdcc..4bd27d985b6 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/z80pio.h"
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 197efa17094..53172becfde 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Seta Hardware =-
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 383f9c1b3d8..f76c4ff30cf 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim9810.h"
 #include "machine/eepromser.h"
 #include "sound/x1_010.h"
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index a8fac3f1de0..345f1448dde 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Street Fighter hardware
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index d3ed454587c..cb198f73fa2 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class shadfrce_state : public driver_device
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index 3276f9c54e2..80b9d72d400 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class shangha3_state : public driver_device
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index d43fda6d39d..f257eaedc15 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class shangkid_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index 991112162e8..bb0c50d7828 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class shaolins_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index 661eb7568fb..3e13be9bf9e 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/m72.h"
 
 class shisen_state : public driver_device
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index 26cfd04ac95..0713e2860eb 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class shootout_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index fc42ebaef5d..aff4bcf98e0 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 
 class sidearms_state : public driver_device
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index e65cd1d699c..1a15e976f75 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Data East Side Pocket hardware
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index 73a2a689bd4..78120304b3f 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class silkroad_state : public driver_device
diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h
index 3d54b80bafb..22ace0df130 100644
--- a/src/mame/includes/simpl156.h
+++ b/src/mame/includes/simpl156.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Simple 156 based board
diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h
index 9be37168154..e580e0e5e90 100644
--- a/src/mame/includes/simple_st0016.h
+++ b/src/mame/includes/simple_st0016.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "machine/st0016.h"
 
diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h
index aa9866d2060..b8ee36c792f 100644
--- a/src/mame/includes/simpsons.h
+++ b/src/mame/includes/simpsons.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/bankdev.h"
 #include "video/k053246_k053247_k055673.h"
 #include "video/k052109.h"
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 82bfe2ce1f6..8465ef06b33 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Skydiver hardware
diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h
index f3a6a133d65..54aea98be34 100644
--- a/src/mame/includes/skyfox.h
+++ b/src/mame/includes/skyfox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Skyfox
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index ec963ec011a..647fdde8768 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/namco.h"
 
 class skykid_state : public driver_device
diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h
index 7d41df5f62b..1ae1a04d40d 100644
--- a/src/mame/includes/skyraid.h
+++ b/src/mame/includes/skyraid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 class skyraid_state : public driver_device
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index 701ad6f94de..05f75537b92 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index b00161f53ee..d459c07efbe 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Slapshot / Operation Wolf 3
diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h
index 700eb92685b..ac63d6046c9 100644
--- a/src/mame/includes/slapstic.h
+++ b/src/mame/includes/slapstic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Slapstic decoding helper
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index e18670c6ace..4857726b7b5 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _SNES_H_
 #define _SNES_H_
 
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index c819aaed55d..354a97b9cfb 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     various SNK triple Z80 games
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index de1e75c4e61..85405815a10 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     rokola hardware
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index eb8aad877e9..f2d43a14801 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/upd7759.h"
 
 class snk68_state : public driver_device
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index fd0781d6407..7b278b8d52a 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class snookr10_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index afe12849579..c519774e29a 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/okim6295.h"
 #include "video/kan_pand.h" // for the original pandora
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index 843be9b9e72..e192c2ee0e4 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class solomon_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index 0cea5f1cad3..90974ee55e9 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Son Son
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index c476484cd74..f0a3622bc82 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Space Firebird hardware
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index 68171202393..88b473436df 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "video/tecmo_spr.h"
 #include "video/tecmo_mix.h"
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index 35c4047d1ed..0a8a97175fb 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/sn76496.h"
 
 class spcforce_state : public driver_device
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 79c587b6fe2..5d6d72c11cd 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Super Dodge Ball hardware
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index 784ff907dba..699cb543076 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/mc6845.h"
 
 class speedatk_state : public driver_device
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index a6b2f397e66..55eb3d116ad 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class speedbal_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index 3a153a54db6..0c144cc8584 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class speedspn_state : public driver_device
diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h
index 592fcec4b84..fdd1f6bd2dd 100644
--- a/src/mame/includes/spiders.h
+++ b/src/mame/includes/spiders.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sigma Spiders hardware
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index e289e01dbda..f939e2e8b47 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class splash_state : public driver_device
diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h
index c8fe4f05264..3eb780a4697 100644
--- a/src/mame/includes/sprcros2.h
+++ b/src/mame/includes/sprcros2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class sprcros2_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index 392b75c7dc6..73584a847e2 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Sprint hardware
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index 7f8e26454cd..07cf9ef5f73 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class sprint4_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index c6903f89bcb..87f39e7321f 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/discrete.h"
 
 class sprint8_state : public driver_device
diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h
index 51fb000eb77..4d8d782f19c 100644
--- a/src/mame/includes/spy.h
+++ b/src/mame/includes/spy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     S.P.Y.
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index 107b5344e59..1e12fb985b6 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/seta001.h"
 
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 3d85800db5e..26c99b52c5c 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 
 class srumbler_state : public driver_device
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index 75755e0769f..543b6ba91fa 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/deco16ic.h"
 #include "video/decospr.h"
 #include "machine/deco146.h"
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 7464adc4551..65a1a38e622 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 class sslam_state : public driver_device
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index f8c30eb5534..b0b82a42e2a 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class ssozumo_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
index b14fc6ae698..6363dbbfb19 100644
--- a/src/mame/includes/sspeedr.h
+++ b/src/mame/includes/sspeedr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class sspeedr_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index d8c61ffed71..d859d9d1855 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class ssrj_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 55e500ebc16..85378799d41 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/upd7725/upd7725.h"
 #include "video/st0020.h"
 #include "machine/eepromser.h"
diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h
index 8889c8664c3..9b3bca09fb6 100644
--- a/src/mame/includes/stactics.h
+++ b/src/mame/includes/stactics.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Sega "Space Tactics" Driver
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index 4a197607978..3ab5b1c9796 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/decbac06.h"
 #include "video/decmxc06.h"
 
diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h
index d472a980825..662546f1702 100644
--- a/src/mame/includes/starcrus.h
+++ b/src/mame/includes/starcrus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 class starcrus_state : public driver_device
 {
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index f6c35c0872e..38d64a0a25c 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Star Fire/Fire One system
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index 9b7622193de..222111c5d90 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  The schematics don't seem to make a lot of sense when it
  *  comes to the video timing chain::
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h
index ddc9cc89be0..f449153ee27 100644
--- a/src/mame/includes/starwars.h
+++ b/src/mame/includes/starwars.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Star Wars hardware
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index 9c0c3664ab1..97450a1c6e3 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class stfight_state : public driver_device
diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h
index 0fb2ce746c6..6eb678bd6be 100644
--- a/src/mame/includes/stlforce.h
+++ b/src/mame/includes/stlforce.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "machine/eepromser.h"
 
diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h
index f37d016649e..be6bbde1a39 100644
--- a/src/mame/includes/strnskil.h
+++ b/src/mame/includes/strnskil.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class strnskil_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index 4920c767a0d..34949947a29 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*----------- defined in drivers/stv.c -----------*/
 #include "cdrom.h"
 #include "machine/eepromser.h"
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 523512951f2..3a9bee45c63 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Subs hardware
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 7f641552bfe..eab330a3a54 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 
 class suna16_state : public driver_device
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 0d1df38ec1a..a6b3b626fe9 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 
 #define TILEMAPS 0
diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h
index 8ae40216898..23f1457c316 100644
--- a/src/mame/includes/supbtime.h
+++ b/src/mame/includes/supbtime.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Super Burger Time & China Town
diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h
index fbb9885ad5b..a403b5ee5fb 100644
--- a/src/mame/includes/superchs.h
+++ b/src/mame/includes/superchs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "video/tc0480scp.h"
 
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 9244e067d7a..d014ffe3e99 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 
 class superqix_state : public driver_device
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index 13b534f793d..9bb4ba416f4 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class suprloco_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 881fb957fe9..a2a781e8141 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "cpu/sh2/sh2.h"
 
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index aa855a5dda0..cd0f2737fce 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Super Slams
diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h
index 81907a6800f..5cb7692bcff 100644
--- a/src/mame/includes/surpratk.h
+++ b/src/mame/includes/surpratk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Surprise Attack
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index 28e55ce1166..807a9847b54 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index 06ac5a50746..14a4a7db9b5 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 // later, this might be merged with segas1x_state in segas16.h
 
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index e112940b234..b6a28dc7be4 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tagteam_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index ab1a4487d57..66e16d5fa46 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Tail to Nose / Super Formula
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 73331868289..93f8896694f 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/mb87078.h"
 #include "machine/taitoio.h"
 #include "video/hd63484.h"
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index bea3ff9000b..5bbeefba353 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/taitoio.h"
 #include "sound/okim6295.h"
 #include "video/tc0100scn.h"
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index 67d1897adbd..5cba17ebf36 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 
 /* This it the best way to allow game specific kludges until the system is fully understood */
diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h
index 8dc79ac28ca..e5e927a6e11 100644
--- a/src/mame/includes/taito_h.h
+++ b/src/mame/includes/taito_h.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito H system
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 5d824c4285b..c4a216796c3 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h
index 0b14bf7fef3..8b67c350803 100644
--- a/src/mame/includes/taito_o.h
+++ b/src/mame/includes/taito_o.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito O system
diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h
index 8701281c24e..0290ae5678c 100644
--- a/src/mame/includes/taito_x.h
+++ b/src/mame/includes/taito_x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/seta.h"
 
 class taitox_state : public seta_state
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index ff009dfa09c..334417e5794 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
 
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 14243794a1a..106e889b7a1 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito Air System
diff --git a/src/mame/includes/taitoipt.h b/src/mame/includes/taitoipt.h
index 2ea59064a41..4410748d25c 100644
--- a/src/mame/includes/taitoipt.h
+++ b/src/mame/includes/taitoipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by many games in multiple Taito drivers
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index 2701b7ee11b..6f6ba068c65 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/poly.h"
 #include "machine/taitoio.h"
 
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h
index 22a98f6c3bb..74829f086d5 100644
--- a/src/mame/includes/taitosj.h
+++ b/src/mame/includes/taitosj.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 
 class taitosj_state : public driver_device
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 7e862932504..62c3af0e82d 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari tank8 hardware
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index d89621127f2..49f4cd7b60f 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 class tankbatt_state : public driver_device
 {
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index 37e88e410de..1dc95a5b8f0 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tankbust_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index f4012287c16..fa3120c0bb2 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class taotaido_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h
index b709789ff51..3876f3433dd 100644
--- a/src/mame/includes/targeth.h
+++ b/src/mame/includes/targeth.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class targeth_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index 5a4ea40599b..7c58e79afd1 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h
index b661783fb81..722335aaade 100644
--- a/src/mame/includes/taxidriv.h
+++ b/src/mame/includes/taxidriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class taxidriv_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index 778e273c526..5d0763c4116 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/tecmo_spr.h"
 
diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h
index 3e0168c5a29..89a51a26a9e 100644
--- a/src/mame/includes/tceptor.h
+++ b/src/mame/includes/tceptor.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 #include "sound/namco.h"
 #include "video/c45.h"
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index c1da585d36f..ba181718397 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 #include "video/tecmo_spr.h"
 
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index 397445a3042..da8bf3890cd 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/tecmo_spr.h"
 #include "video/tecmo_mix.h"
 
diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h
index 40ab993345f..f84a87cd2f1 100644
--- a/src/mame/includes/tecmosys.h
+++ b/src/mame/includes/tecmosys.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     tecmosys protection simulation
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index 68c90cdfa5a..6d4b7f68501 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class tehkanwc_state : public driver_device
diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h
index 2853a71c130..59d3d93e12c 100644
--- a/src/mame/includes/terracre.h
+++ b/src/mame/includes/terracre.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 
 class terracre_state : public driver_device
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 0adabba03f2..9c9d8f5206e 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tetrisp2_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 948f278ac60..de1c0091856 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/decmxc06.h"
 
 
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h
index 710230f6e63..a4d9e975a86 100644
--- a/src/mame/includes/thepit.h
+++ b/src/mame/includes/thepit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class thepit_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h
index 9487be4d34c..08615b383a6 100644
--- a/src/mame/includes/thief.h
+++ b/src/mame/includes/thief.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 #include "video/tms9927.h"
 
diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h
index 7eb906e3bbb..3d59b5c7ef8 100644
--- a/src/mame/includes/thoop2.h
+++ b/src/mame/includes/thoop2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class thoop2_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h
index 41d55201560..cc79031fe66 100644
--- a/src/mame/includes/thunderx.h
+++ b/src/mame/includes/thunderx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Super Contra / Thunder Cross
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 7f7b9893880..7629bf329ed 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class tiamc1_state : public driver_device
 {
diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h
index 5d01f416e1f..93d74961aa2 100644
--- a/src/mame/includes/tigeroad.h
+++ b/src/mame/includes/tigeroad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 #include "sound/msm5205.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index 91a2894e0a9..f2cb079d9dc 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class timelimt_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index a72913e8d2b..f2851f82a7d 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Time Pilot
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index c5032cd3a06..898586912b6 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/samples.h"
 #include "sound/upd7759.h"
 #include "sound/k007232.h"
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 8422417dfb4..88df300ec18 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 #include "sound/samples.h"
 #include "video/seta001.h"
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index d1fb3ffd17c..594e7608776 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                 ToaPlan game hardware from 1988-1991
                 ------------------------------------
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 3e8029f768f..35698a641a1 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************** Machine stuff ******************/
 //#define USE_HD64x180          /* Define if CPU support is available */
 //#define TRUXTON2_STEREO       /* Uncomment to hear truxton2 music in stereo */
diff --git a/src/mame/includes/toaplipt.h b/src/mame/includes/toaplipt.h
index ac86df741a0..0ab6f05eacc 100644
--- a/src/mame/includes/toaplipt.h
+++ b/src/mame/includes/toaplipt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Input port macros used by many games in multiple Toaplan drivers
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index 866b7e719a6..76e2942bad3 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/seibu.h"
 #include "sound/msm5205.h"
 #include "video/bufsprite.h"
diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h
index d523e0b8d23..c5876436ca8 100644
--- a/src/mame/includes/topspeed.h
+++ b/src/mame/includes/topspeed.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Top Speed / Full Throttle
diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h
index 62e3b2b1f2d..6f8e4530aff 100644
--- a/src/mame/includes/toypop.h
+++ b/src/mame/includes/toypop.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h
index 75de691b9a3..db5ce51747d 100644
--- a/src/mame/includes/tp84.h
+++ b/src/mame/includes/tp84.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tp84_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index a1604933cc9..10b549ed43c 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Track'n'Field
diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h
index a4712b1a8a3..8bd88b84a7e 100644
--- a/src/mame/includes/travrusa.h
+++ b/src/mame/includes/travrusa.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class travrusa_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 2a4acffb66a..bf6a324f626 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Triple Hunt hardware
diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h
index e7855a5b934..8c1c1f70289 100644
--- a/src/mame/includes/truco.h
+++ b/src/mame/includes/truco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 
 class truco_state : public driver_device
diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h
index 4ce3aaa31de..221aab2be55 100644
--- a/src/mame/includes/trucocl.h
+++ b/src/mame/includes/trucocl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/dac.h"
 
 class trucocl_state : public driver_device
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index d8e63eade36..6a63294f621 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tryout_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 62983b0fb4d..84f75bcb807 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tsamurai_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h
index dad21edaa12..3aafd4f8e88 100644
--- a/src/mame/includes/tubep.h
+++ b/src/mame/includes/tubep.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class tubep_state : public driver_device
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index 702d43c7b7d..a6e98059567 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "video/decospr.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h
index 2dbb012aeec..4a743adce23 100644
--- a/src/mame/includes/tumblep.h
+++ b/src/mame/includes/tumblep.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Tumble Pop
diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h
index 25cb3f18be0..6d86e5748a6 100644
--- a/src/mame/includes/tunhunt.h
+++ b/src/mame/includes/tunhunt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tunhunt_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index c585dac904e..9de39a8f844 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Sega Z80-3D system
diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h
index c57407f2c5d..1256c75e113 100644
--- a/src/mame/includes/turrett.h
+++ b/src/mame/includes/turrett.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Turret Tower hardware
diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h
index 3980702a056..e3260ffec72 100644
--- a/src/mame/includes/tutankhm.h
+++ b/src/mame/includes/tutankhm.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class tutankhm_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index bd7cf94855b..487c72e4f99 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/bufsprite.h"
 #include "sound/upd7759.h"
 #include "sound/k007232.h"
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index 6fff303bdac..211adf9bf99 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
         Twincobr/Flying Shark/Wardner  game hardware from 1986-1987
         -----------------------------------------------------------
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 5fda28bd3b4..dd935b7fcea 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     TX-1/Buggy Boy hardware
diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h
index abf2214fb73..af81675b74c 100644
--- a/src/mame/includes/ultraman.h
+++ b/src/mame/includes/ultraman.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Ultraman
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index 1d0e786bb5a..4740a47d29c 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Ultra Tank hardware
diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h
index 3a689e8dfb1..b4224272e8a 100644
--- a/src/mame/includes/undrfire.h
+++ b/src/mame/includes/undrfire.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 #include "video/tc0100scn.h"
 #include "video/tc0480scp.h"
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index cb5dc73436d..45f4e47018f 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/okim6295.h"
 #include "machine/eepromser.h"
 
diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h
index 8fd00869660..2e713a89a57 100644
--- a/src/mame/includes/usgames.h
+++ b/src/mame/includes/usgames.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class usgames_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h
index 905b34b9607..433e9da1900 100644
--- a/src/mame/includes/vaportra.h
+++ b/src/mame/includes/vaportra.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Vapor Trail
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index 11bd22ba958..fd3bd20c052 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class vastar_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index cfbf448b75b..3babb0a4b91 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class vball_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h
index 476af3b1543..2d1a8dcb37b 100644
--- a/src/mame/includes/vectrex.h
+++ b/src/mame/includes/vectrex.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/vectrex.h
diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h
index 0e8674b901b..bed8c1c92f3 100644
--- a/src/mame/includes/vendetta.h
+++ b/src/mame/includes/vendetta.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Vendetta
diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h
index d370740c0d5..4cd9d20d798 100644
--- a/src/mame/includes/vertigo.h
+++ b/src/mame/includes/vertigo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Exidy Vertigo hardware
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 9332cd2650b..2335b699a6d 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     VIC Dual Game board
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index e8beff32998..92460937837 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Video Pinball hardware
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index 342b6c8c287..31e3131ee3c 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/m72.h"
 
 class vigilant_state : public driver_device
diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h
index 830e2ac1ff2..6112e9d85e2 100644
--- a/src/mame/includes/volfied.h
+++ b/src/mame/includes/volfied.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Volfied
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index d2bf17b2d23..0ea820fdc8c 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/nes_apu.h"
 #include "video/ppu2c0x.h"
 
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index 19383814077..59f64535a45 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Capcom Vulgus hardware
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 8a37f402d6a..a8bf44d8ce3 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "audio/warpwarp.h"
 
 class warpwarp_state : public driver_device
diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h
index e51cbccec51..986b2981b67 100644
--- a/src/mame/includes/warriorb.h
+++ b/src/mame/includes/warriorb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Taito Dual Screen Games
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index de7c66acdc7..c06941ad0e4 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/tecmo_spr.h"
 
 class wc90_state : public driver_device
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index b5d513d69dc..a29103884cf 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/msm5205.h"
 
 class wc90b_state : public driver_device
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index de92702f6f9..a6e9e2f1f11 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/k007232.h"
 #include "video/k051316.h"
 
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index f969c2e36ad..87b30e2ec1d 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "video/vsystem_spr2.h"
 
 class welltris_state : public driver_device
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index aec8a31d7f1..77bbd5a387f 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     World Grand Prix
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index b61a86f960a..87a01cbd621 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Driver for early Williams games
diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h
index dcb3e9ebdc8..094d6702d5a 100644
--- a/src/mame/includes/wiping.h
+++ b/src/mame/includes/wiping.h
@@ -1,35 +1,43 @@
+// license:???
+// copyright-holders:???
 class wiping_state : public driver_device
 {
 public:
 	wiping_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_videoram(*this, "videoram"),
-		m_colorram(*this, "colorram"),
-		m_spriteram(*this, "spriteram"),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_gfxdecode(*this, "gfxdecode"),
-		m_palette(*this, "palette") { }
+		m_palette(*this, "palette"),
+		m_videoram(*this, "videoram"),
+		m_colorram(*this, "colorram"),
+		m_spriteram(*this, "spriteram") { }
 
-	required_shared_ptr<UINT8> m_videoram;
-	required_shared_ptr<UINT8> m_colorram;
-	int m_flipscreen;
-	UINT8 *m_soundregs;
-	required_shared_ptr<UINT8> m_spriteram;
-
-	UINT8 m_main_irq_mask;
-	UINT8 m_sound_irq_mask;
-	DECLARE_READ8_MEMBER(ports_r);
-	DECLARE_WRITE8_MEMBER(subcpu_reset_w);
-	DECLARE_WRITE8_MEMBER(main_irq_mask_w);
-	DECLARE_WRITE8_MEMBER(sound_irq_mask_w);
-	DECLARE_WRITE8_MEMBER(wiping_flipscreen_w);
-	DECLARE_PALETTE_INIT(wiping);
-	UINT32 screen_update_wiping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(vblank_irq);
-	INTERRUPT_GEN_MEMBER(sound_timer_irq);
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
+
+	required_shared_ptr<UINT8> m_videoram;
+	required_shared_ptr<UINT8> m_colorram;
+	required_shared_ptr<UINT8> m_spriteram;
+	
+	int m_flipscreen;
+	UINT8 *m_soundregs;  // if 0-ed
+	UINT8 m_main_irq_mask;
+	UINT8 m_sound_irq_mask;
+
+	DECLARE_READ8_MEMBER(ports_r);
+	DECLARE_WRITE8_MEMBER(subcpu_reset_w);
+	DECLARE_WRITE8_MEMBER(main_irq_mask_w);
+	DECLARE_WRITE8_MEMBER(sound_irq_mask_w);
+	DECLARE_WRITE8_MEMBER(flipscreen_w);
+
+	DECLARE_PALETTE_INIT(wiping);
+	virtual void machine_start();
+
+	UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	INTERRUPT_GEN_MEMBER(vblank_irq);
+	INTERRUPT_GEN_MEMBER(sound_timer_irq);
 };
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index 06798fe74cb..4272826e748 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Seibu Stinger/Wiz hardware
diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h
index 73dc821603b..c1c08dcceaa 100644
--- a/src/mame/includes/wolfpack.h
+++ b/src/mame/includes/wolfpack.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/s14001a.h"
 
 class wolfpack_state : public driver_device
diff --git a/src/mame/includes/wpc_pin.h b/src/mame/includes/wpc_pin.h
index dc9816fda42..cb0a68ce862 100644
--- a/src/mame/includes/wpc_pin.h
+++ b/src/mame/includes/wpc_pin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wpc_pin.h
  *
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index e611d5b8b6c..fb2c7f8f954 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class wrally_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 7c422216ad7..72cfe9c0449 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class wwfsstar_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index 364134fc3ef..ab704fc3123 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class xain_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 074f19ff3e8..b4d592d5ad1 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Xexex
diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h
index f78fa6c8672..8855670a083 100644
--- a/src/mame/includes/xmen.h
+++ b/src/mame/includes/xmen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/k054539.h"
 #include "video/k053246_k053247_k055673.h"
 #include "video/k053251.h"
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index 2c64efc2f6a..0e6e44296d7 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/eepromser.h"
 
 class xorworld_state : public driver_device
diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h
index b9910763fbe..b24edc3cc6e 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class xxmissio_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h
index 84c22d1d242..ded29e3dd2b 100644
--- a/src/mame/includes/xyonix.h
+++ b/src/mame/includes/xyonix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class xyonix_state : public driver_device
 {
 public:
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index 3c8313f55b5..e6a3801d172 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "sound/sn76496.h"
 #include "sound/vlm5030.h"
 
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 568b3a32f9d..5b292aea418 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Yun Sung 16 Bit Games
diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h
index 9b9cc3dfc96..ad45aa5f0f9 100644
--- a/src/mame/includes/yunsung8.h
+++ b/src/mame/includes/yunsung8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Yun Sung 8 Bit Games
diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h
index 678d2252daf..c633e30f69a 100644
--- a/src/mame/includes/zac2650.h
+++ b/src/mame/includes/zac2650.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/s2636.h"
 
 class zac2650_state : public driver_device
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index e1a1961e8e4..3020e2370e9 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/6821pia.h"
 #include "sound/ay8910.h"
 #include "sound/tms5220.h"
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index 055e843a25b..a967067d2d3 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Zaxxon hardware
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index 1d645072b70..8b335f85c6a 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Zero Zone
diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h
index bf989760a1d..e45f09ea661 100644
--- a/src/mame/includes/zodiack.h
+++ b/src/mame/includes/zodiack.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 
diff --git a/src/mame/machine/315-5838_317-0229_comp.c b/src/mame/machine/315-5838_317-0229_comp.c
index be5f1297dfb..0fafd8a151a 100644
--- a/src/mame/machine/315-5838_317-0229_comp.c
+++ b/src/mame/machine/315-5838_317-0229_comp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega Compression (and possibly encryption) device
 
     315-5838 - Decathlete (ST-V)
diff --git a/src/mame/machine/315-5838_317-0229_comp.h b/src/mame/machine/315-5838_317-0229_comp.h
index 8afd515f051..143c85c7604 100644
--- a/src/mame/machine/315-5838_317-0229_comp.h
+++ b/src/mame/machine/315-5838_317-0229_comp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 
diff --git a/src/mame/machine/315-5881_crypt.c b/src/mame/machine/315-5881_crypt.c
index 3acc4d9c47e..99d0f85e15b 100644
--- a/src/mame/machine/315-5881_crypt.c
+++ b/src/mame/machine/315-5881_crypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   re: Tecmo World Cup '98 (ST-V) (from ANY)
 
diff --git a/src/mame/machine/315-5881_crypt.h b/src/mame/machine/315-5881_crypt.h
index 7b8b5088362..9be2011e36d 100644
--- a/src/mame/machine/315-5881_crypt.h
+++ b/src/mame/machine/315-5881_crypt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 
diff --git a/src/mame/machine/315_5296.c b/src/mame/machine/315_5296.c
index 902087a1399..7b2d23b8f58 100644
--- a/src/mame/machine/315_5296.c
+++ b/src/mame/machine/315_5296.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega 315-5296 I/O chip
diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h
index 5f85f5c0d2c..667265c9886 100644
--- a/src/mame/machine/315_5296.h
+++ b/src/mame/machine/315_5296.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Sega 315-5296 I/O chip
diff --git a/src/mame/machine/3do.c b/src/mame/machine/3do.c
index 04023941e8f..1473c8df46f 100644
--- a/src/mame/machine/3do.c
+++ b/src/mame/machine/3do.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Reset boot sequence:
diff --git a/src/mame/machine/acitya.c b/src/mame/machine/acitya.c
index 4b752f60eef..beeec4bcda0 100644
--- a/src/mame/machine/acitya.c
+++ b/src/mame/machine/acitya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index 35a42c0b387..e9ad7aa6924 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index db18261eaf5..ec43debafd4 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Computer / Arcadia Game System
diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c
index a1e8bd5749f..a48b4ef4e88 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  *
  *  Acorn Archimedes custom chips (IOC, MEMC, VIDC)
diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c
index 7ea84fe6086..ba023058829 100644
--- a/src/mame/machine/arkanoid.c
+++ b/src/mame/machine/arkanoid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index fb2c1296621..2218b763f21 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 7a0a29f692d..34b2cdbbb4c 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     Atari 400/800
diff --git a/src/mame/machine/atari_vg.c b/src/mame/machine/atari_vg.c
index f945582119c..43b95de3143 100644
--- a/src/mame/machine/atari_vg.c
+++ b/src/mame/machine/atari_vg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari vector hardware
diff --git a/src/mame/machine/atari_vg.h b/src/mame/machine/atari_vg.h
index f987dcb2ff7..095085ffe09 100644
--- a/src/mame/machine/atari_vg.h
+++ b/src/mame/machine/atari_vg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari vector hardware
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index 51b5a28ea6b..ccdb58277c2 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Football hardware
diff --git a/src/mame/machine/awboard.c b/src/mame/machine/awboard.c
index d041f07e3d2..71d9d9fbc18 100644
--- a/src/mame/machine/awboard.c
+++ b/src/mame/machine/awboard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "awboard.h"
diff --git a/src/mame/machine/awboard.h b/src/mame/machine/awboard.h
index c47b2aa4b23..5b6854260ce 100644
--- a/src/mame/machine/awboard.h
+++ b/src/mame/machine/awboard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _AWBOARD_H_
 #define _AWBOARD_H_
 
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index e5ff0a3be7d..3b4bfccf28a 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   bagman.c
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index c64e8810354..abb5f95dd10 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
diff --git a/src/mame/machine/bfm_bd1.c b/src/mame/machine/bfm_bd1.c
index a8a2f8b22f2..94ef6bd2a11 100644
--- a/src/mame/machine/bfm_bd1.c
+++ b/src/mame/machine/bfm_bd1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Bellfruit BD1 VFD module interface and emulation by J.Wallace
diff --git a/src/mame/machine/bfm_bd1.h b/src/mame/machine/bfm_bd1.h
index 212fac803de..ad50842b18b 100644
--- a/src/mame/machine/bfm_bd1.h
+++ b/src/mame/machine/bfm_bd1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef BFM_BD1_H
 #define BFM_BD1_H
diff --git a/src/mame/machine/bfm_bda.c b/src/mame/machine/bfm_bda.c
index a1c6d2d8cce..c9d0b5789ef 100644
--- a/src/mame/machine/bfm_bda.c
+++ b/src/mame/machine/bfm_bda.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Bellfruit 7x5 Dot matrix VFD module interface and emulation by J.Wallace
diff --git a/src/mame/machine/bfm_bda.h b/src/mame/machine/bfm_bda.h
index 6e7153a4ea6..e1b6c3ff2f7 100644
--- a/src/mame/machine/bfm_bda.h
+++ b/src/mame/machine/bfm_bda.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef BFM_BDA_H
 #define BFM_BDA_H
diff --git a/src/mame/machine/bfm_comn.c b/src/mame/machine/bfm_comn.c
index 65196d54b5d..020a2a5d600 100644
--- a/src/mame/machine/bfm_comn.c
+++ b/src/mame/machine/bfm_comn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Bellfruit Common Hardware / Functions */
 #include "emu.h"
 
diff --git a/src/mame/machine/bfm_comn.h b/src/mame/machine/bfm_comn.h
index 0a5ec5d21cf..009776d6327 100644
--- a/src/mame/machine/bfm_comn.h
+++ b/src/mame/machine/bfm_comn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 void bfm_decode_mainrom(running_machine &machine, const char *rom_region, UINT8* codec_data);
diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c
index b0aafa15094..1094671c043 100644
--- a/src/mame/machine/bigevglf.c
+++ b/src/mame/machine/bigevglf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/bonzeadv.c b/src/mame/machine/bonzeadv.c
index e193d9789a6..67a8c364618 100644
--- a/src/mame/machine/bonzeadv.c
+++ b/src/mame/machine/bonzeadv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Bonze Adventure C-Chip
diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c
index 7ba2a62494b..9ec13381ab0 100644
--- a/src/mame/machine/bsktball.c
+++ b/src/mame/machine/bsktball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Basketball hardware
diff --git a/src/mame/machine/btime.c b/src/mame/machine/btime.c
index 1ef33b37426..41689336bad 100644
--- a/src/mame/machine/btime.c
+++ b/src/mame/machine/btime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/btime.h"
 
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index 8aa1c3ea4fc..8ba86b997ea 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c
index d6c014edadf..a74e15e3810 100644
--- a/src/mame/machine/buggychl.c
+++ b/src/mame/machine/buggychl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "machine/buggychl.h"
diff --git a/src/mame/machine/buggychl.h b/src/mame/machine/buggychl.h
index 271b9a1dba2..48d741f5d50 100644
--- a/src/mame/machine/buggychl.h
+++ b/src/mame/machine/buggychl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class buggychl_mcu_device : public device_t
 {
 public:
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index 77b27b41467..1185a309439 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exidy Car Polo hardware
diff --git a/src/mame/machine/cat702.c b/src/mame/machine/cat702.c
index 9c322e0ff52..5e2e5f44873 100644
--- a/src/mame/machine/cat702.c
+++ b/src/mame/machine/cat702.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   CAT702 ZN security chip
diff --git a/src/mame/machine/cat702.h b/src/mame/machine/cat702.h
index 818ecd2d584..39b7690f017 100644
--- a/src/mame/machine/cat702.h
+++ b/src/mame/machine/cat702.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  CAT702 security chip */
 
 #pragma once
diff --git a/src/mame/machine/cchasm.c b/src/mame/machine/cchasm.c
index f6388e6b9ff..4a5d451ad7b 100644
--- a/src/mame/machine/cchasm.c
+++ b/src/mame/machine/cchasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cinematronics Cosmic Chasm hardware
diff --git a/src/mame/machine/cchip.c b/src/mame/machine/cchip.c
index 2955f15705e..dcbcb2fc7e7 100644
--- a/src/mame/machine/cchip.c
+++ b/src/mame/machine/cchip.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    cchip.c
diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c
index 4c6c581db11..a599d0b72ed 100644
--- a/src/mame/machine/cclimber.c
+++ b/src/mame/machine/cclimber.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/cclimber.h"
 
diff --git a/src/mame/machine/cdi070.c b/src/mame/machine/cdi070.c
index 9d4d32d6d08..c1207bac607 100644
--- a/src/mame/machine/cdi070.c
+++ b/src/mame/machine/cdi070.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h
index c5f0f56c8a7..97a5c33d04a 100644
--- a/src/mame/machine/cdi070.h
+++ b/src/mame/machine/cdi070.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/cdicdic.c b/src/mame/machine/cdicdic.c
index 5e58eefbaf2..6814489f020 100644
--- a/src/mame/machine/cdicdic.c
+++ b/src/mame/machine/cdicdic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 1d8b4d2418f..abb0279bc26 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/cdislave.c b/src/mame/machine/cdislave.c
index ef29be5d3f7..235b15579cf 100644
--- a/src/mame/machine/cdislave.c
+++ b/src/mame/machine/cdislave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h
index a1a2c1c02dd..16301bf132a 100644
--- a/src/mame/machine/cdislave.h
+++ b/src/mame/machine/cdislave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/machine/chaknpop.c b/src/mame/machine/chaknpop.c
index 3cde92b17e4..3b65dfdd42d 100644
--- a/src/mame/machine/chaknpop.c
+++ b/src/mame/machine/chaknpop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Chack'n Pop (C) 1983 TAITO Corp.
  *  simulate 68705 MCU
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index 5aed5b8e2b5..b8dd188f340 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 CPS-2 Encryption
diff --git a/src/mame/machine/dc-ctrl.c b/src/mame/machine/dc-ctrl.c
index ac6d8662587..71afaa89678 100644
--- a/src/mame/machine/dc-ctrl.c
+++ b/src/mame/machine/dc-ctrl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "dc-ctrl.h"
 
diff --git a/src/mame/machine/dc-ctrl.h b/src/mame/machine/dc-ctrl.h
index dfa02f1b0f1..1c75cd9218c 100644
--- a/src/mame/machine/dc-ctrl.h
+++ b/src/mame/machine/dc-ctrl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _DC_CTRL_H_
 #define _DC_CTRL_H_
 
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index 9792f56ee15..8e7425ccea1 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     dc.c - Sega Dreamcast hardware
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index 7f23cb4ca21..fcf28cf47e1 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 Data East machine functions - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c
index 4110aa03f7e..74bab8937d9 100644
--- a/src/mame/machine/deco102.c
+++ b/src/mame/machine/deco102.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Data East Custom Chip 102 decryption
diff --git a/src/mame/machine/deco104.c b/src/mame/machine/deco104.c
index 3e869429c62..8fdcf6c6fea 100644
--- a/src/mame/machine/deco104.c
+++ b/src/mame/machine/deco104.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Data East 104 based protection/IO chips
diff --git a/src/mame/machine/deco104.h b/src/mame/machine/deco104.h
index dc50793d109..a4f29e919f0 100644
--- a/src/mame/machine/deco104.h
+++ b/src/mame/machine/deco104.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __DECO104_H__
 #define __DECO104_H__
diff --git a/src/mame/machine/deco146.c b/src/mame/machine/deco146.c
index bfe32961a3c..1026301d226 100644
--- a/src/mame/machine/deco146.c
+++ b/src/mame/machine/deco146.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Data East 146 protection chip / memory-mapper & I/O interface */
 
 /*
diff --git a/src/mame/machine/deco146.h b/src/mame/machine/deco146.h
index fe1c5120347..8f17f9d8552 100644
--- a/src/mame/machine/deco146.h
+++ b/src/mame/machine/deco146.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __DECO146_H__
 #define __DECO146_H__
diff --git a/src/mame/machine/deco156.c b/src/mame/machine/deco156.c
index 3985b7aa222..80bf23e99ea 100644
--- a/src/mame/machine/deco156.c
+++ b/src/mame/machine/deco156.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Deco 156 analysis
 
  Data East chip 156 is an encrypted ARM processor.
diff --git a/src/mame/machine/deco222.c b/src/mame/machine/deco222.c
index f204a5ed77d..c9205d91644 100644
--- a/src/mame/machine/deco222.c
+++ b/src/mame/machine/deco222.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Data East encrypted CPU 222, aka C10707?
  also sometimes implemented as basic logic outside the CPU on early revs and bootlegs */
diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h
index 50c019b3108..c78652ce15d 100644
--- a/src/mame/machine/deco222.h
+++ b/src/mame/machine/deco222.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c
index f0910db1434..d3dfbaaf820 100644
--- a/src/mame/machine/decocass.c
+++ b/src/mame/machine/decocass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     DECO Cassette System machine
diff --git a/src/mame/machine/decocass_tape.c b/src/mame/machine/decocass_tape.c
index c1937a1e576..a8d5b86c144 100644
--- a/src/mame/machine/decocass_tape.c
+++ b/src/mame/machine/decocass_tape.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     DECO Cassette System machine
diff --git a/src/mame/machine/decocass_tape.h b/src/mame/machine/decocass_tape.h
index ff5dfeb3602..81a14861ee0 100644
--- a/src/mame/machine/decocass_tape.h
+++ b/src/mame/machine/decocass_tape.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DECOCASS_TAPE_H__
 #define __DECOCASS_TAPE_H__
 
diff --git a/src/mame/machine/decocpu6.c b/src/mame/machine/decocpu6.c
index ed47608f89d..e2de6122cba 100644
--- a/src/mame/machine/decocpu6.c
+++ b/src/mame/machine/decocpu6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* apparently Deco CPU-6 used by ProGolf
  just seems to be a bitswap on the opcodes like 222, but not the same one
  not a complex scheme like CPU-7?
diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h
index 9085d7eb52c..39a845b3507 100644
--- a/src/mame/machine/decocpu6.h
+++ b/src/mame/machine/decocpu6.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/mame/machine/decocpu7.c b/src/mame/machine/decocpu7.c
index a5e6c9e8821..1339af37f67 100644
--- a/src/mame/machine/decocpu7.c
+++ b/src/mame/machine/decocpu7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "decocpu7.h"
 
diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h
index e12f369865c..341d8844fd4 100644
--- a/src/mame/machine/decocpu7.h
+++ b/src/mame/machine/decocpu7.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/machine/decocrpt.c b/src/mame/machine/decocrpt.c
index 47721c4e8c2..570696c162d 100644
--- a/src/mame/machine/decocrpt.c
+++ b/src/mame/machine/decocrpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 Data East gfx encryption emulation                            by Nicola Salmoria
diff --git a/src/mame/machine/decopincpu.c b/src/mame/machine/decopincpu.c
index fa951483f55..e9ef5ed2d11 100644
--- a/src/mame/machine/decopincpu.c
+++ b/src/mame/machine/decopincpu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Data East Pinball CPU boards
  *
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index 6cf3508fc2d..4412c3784d1 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Data East Pinball CPU boards
  *
diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c
index e50d088eb73..cd6e5473139 100644
--- a/src/mame/machine/docastle.c
+++ b/src/mame/machine/docastle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index 3128f56a7b8..3e93a4f4693 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hitachi FD1089A/FD1089B encryption emulation
diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h
index 0543bfc4a07..2a67be833cc 100644
--- a/src/mame/machine/fd1089.h
+++ b/src/mame/machine/fd1089.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hitachi FD1089A/FD1089B encryption emulation
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 050755aed69..08f466a67c0 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hitachi FD1089FD1094 encryption emulation
diff --git a/src/mame/machine/fd1094.h b/src/mame/machine/fd1094.h
index 0d09d1ee6d8..266b41c0240 100644
--- a/src/mame/machine/fd1094.h
+++ b/src/mame/machine/fd1094.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Hitachi FD1094 encryption emulation
diff --git a/src/mame/machine/fddebug.h b/src/mame/machine/fddebug.h
index 40a9536b0fc..588769dc944 100644
--- a/src/mame/machine/fddebug.h
+++ b/src/mame/machine/fddebug.h
@@ -1,2 +1,4 @@
+// license:???
+// copyright-holders:???
 void fd1094_regenerate_key(running_machine &machine);
 void fd1094_init_debugging(running_machine &machine, const char *cpureg, const char *keyreg, const char *statreg, void (*changed)(running_machine &));
diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c
index 41e3b36491f..9b7929eb82e 100644
--- a/src/mame/machine/flstory.c
+++ b/src/mame/machine/flstory.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index 146d59d7789..5e24f1a710e 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gaelco CG-1V/GAE1 based games
diff --git a/src/mame/machine/gaelcrpt.c b/src/mame/machine/gaelcrpt.c
index ff201960de8..26c55ad8a90 100644
--- a/src/mame/machine/gaelcrpt.c
+++ b/src/mame/machine/gaelcrpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Gaelco video RAM encryption
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index e46bbd5d648..a462331665e 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/gaplus.c b/src/mame/machine/gaplus.c
index 1599bedc7e6..27f42b56c7d 100644
--- a/src/mame/machine/gaplus.c
+++ b/src/mame/machine/gaplus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/gdrom.c b/src/mame/machine/gdrom.c
index 57708e8825c..ffa7c338d8f 100644
--- a/src/mame/machine/gdrom.c
+++ b/src/mame/machine/gdrom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  gdrom.c - Implementation of the Sega GD-ROM device
diff --git a/src/mame/machine/gdrom.h b/src/mame/machine/gdrom.h
index d832001d42a..7bc609d64d2 100644
--- a/src/mame/machine/gdrom.h
+++ b/src/mame/machine/gdrom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  gdrom.h
diff --git a/src/mame/machine/genpin.c b/src/mame/machine/genpin.c
index ba19cba010e..d1d613a572b 100644
--- a/src/mame/machine/genpin.c
+++ b/src/mame/machine/genpin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************
 
 This is for common pinball machine coding.
diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h
index 086f4ceeb79..792bb574682 100644
--- a/src/mame/machine/genpin.h
+++ b/src/mame/machine/genpin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef GENPIN_H_
 #define GENPIN_H_
 
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index e50ca399769..24a6ff0da7c 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -59,7 +59,6 @@ void  harddriv_state::device_reset()
 	/* halt several of the DSPs to start */
 	if (m_adsp != NULL) m_adsp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 	if (m_dsp32 != NULL) m_dsp32->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
-	if (m_sounddsp != NULL) m_sounddsp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 
 	m_last_gsp_shiftreg = 0;
 
diff --git a/src/mame/machine/hng64_net.c b/src/mame/machine/hng64_net.c
index 190d992a9b2..57264986c76 100644
--- a/src/mame/machine/hng64_net.c
+++ b/src/mame/machine/hng64_net.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* HNG64 Communication / Network CPU */
 
 // this is driven by a KL5C80A12CFP which is basically a super-charged Z80
diff --git a/src/mame/machine/igs022.c b/src/mame/machine/igs022.c
index cf046486b6a..10b243f0441 100644
--- a/src/mame/machine/igs022.c
+++ b/src/mame/machine/igs022.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  IGS022 is an encrypted DMA device, most likely an MCU of some sort
diff --git a/src/mame/machine/igs022.h b/src/mame/machine/igs022.h
index 2a32470b2d1..20f1992e3d9 100644
--- a/src/mame/machine/igs022.h
+++ b/src/mame/machine/igs022.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS022 */
 
 
diff --git a/src/mame/machine/igs025.c b/src/mame/machine/igs025.c
index 73b63ac853f..deb5749492e 100644
--- a/src/mame/machine/igs025.c
+++ b/src/mame/machine/igs025.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  IGS025 is some kind of state machine / logic device which the game
diff --git a/src/mame/machine/igs025.h b/src/mame/machine/igs025.h
index c1a009049fe..5a762c43b73 100644
--- a/src/mame/machine/igs025.h
+++ b/src/mame/machine/igs025.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Common device stuff for IGS025 / IGS022, should be split into devices for each chip once we know where what part does what */
 
 
diff --git a/src/mame/machine/igs028.c b/src/mame/machine/igs028.c
index d0ec4c7ff5e..21a9407bc63 100644
--- a/src/mame/machine/igs028.c
+++ b/src/mame/machine/igs028.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS 028 */
 
 // this seems to be very similar to the igs022 - encrypted DMA + some other ops with shared RAM
diff --git a/src/mame/machine/igs028.h b/src/mame/machine/igs028.h
index 0d15ef01aff..698d89925e1 100644
--- a/src/mame/machine/igs028.h
+++ b/src/mame/machine/igs028.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS 028 */
 
 
diff --git a/src/mame/machine/igs036crypt.c b/src/mame/machine/igs036crypt.c
index 7cf5140ad65..9510af39d16 100644
--- a/src/mame/machine/igs036crypt.c
+++ b/src/mame/machine/igs036crypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "igs036crypt.h"
 
 /****************************************************************************
diff --git a/src/mame/machine/igs036crypt.h b/src/mame/machine/igs036crypt.h
index 5461530c61e..7bdc899a4d3 100644
--- a/src/mame/machine/igs036crypt.h
+++ b/src/mame/machine/igs036crypt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _IGS036CRYPT_H_
 #define _IGS036CRYPT_H_
 
diff --git a/src/mame/machine/inder_sb.c b/src/mame/machine/inder_sb.c
index b7224df033b..36b421814a4 100644
--- a/src/mame/machine/inder_sb.c
+++ b/src/mame/machine/inder_sb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Inder / Dinamic Sound Board */
 
 
diff --git a/src/mame/machine/inder_sb.h b/src/mame/machine/inder_sb.h
index 2dc684a7b19..36e10bc62d9 100644
--- a/src/mame/machine/inder_sb.h
+++ b/src/mame/machine/inder_sb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* */
 
 
diff --git a/src/mame/machine/inder_vid.c b/src/mame/machine/inder_vid.c
index 3862b4ab5f8..226c23c5add 100644
--- a/src/mame/machine/inder_vid.c
+++ b/src/mame/machine/inder_vid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Inder / Dinamic Video */
 
 /* Inder / Dinamic Sound Board */
diff --git a/src/mame/machine/inder_vid.h b/src/mame/machine/inder_vid.h
index 4975e12e859..6da308d4895 100644
--- a/src/mame/machine/inder_vid.h
+++ b/src/mame/machine/inder_vid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Inder / Dinamic Video */
 
 
diff --git a/src/mame/machine/irem_cpu.c b/src/mame/machine/irem_cpu.c
index 11b02bed773..13fef15e11c 100644
--- a/src/mame/machine/irem_cpu.c
+++ b/src/mame/machine/irem_cpu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*****************************************************************************
 
diff --git a/src/mame/machine/irem_cpu.h b/src/mame/machine/irem_cpu.h
index eb538bf22a3..c86e9973d20 100644
--- a/src/mame/machine/irem_cpu.h
+++ b/src/mame/machine/irem_cpu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 extern const UINT8 gunforce_decryption_table[];
 extern const UINT8 bomberman_decryption_table[];
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index 81f41d80069..de118bc1fc6 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari I, Robot hardware
diff --git a/src/mame/machine/iteagle_fpga.c b/src/mame/machine/iteagle_fpga.c
index df236ff21c2..29241291b33 100644
--- a/src/mame/machine/iteagle_fpga.c
+++ b/src/mame/machine/iteagle_fpga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "iteagle_fpga.h"
 #include "coreutil.h"
 
diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h
index d0b4738e349..bf8e13d3bbe 100644
--- a/src/mame/machine/iteagle_fpga.h
+++ b/src/mame/machine/iteagle_fpga.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //*************************************
 // iteagle fpga device
 //*************************************
diff --git a/src/mame/machine/jalcrpt.c b/src/mame/machine/jalcrpt.c
index dd713c09542..09193e1aa0b 100644
--- a/src/mame/machine/jalcrpt.c
+++ b/src/mame/machine/jalcrpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "machine/jalcrpt.h"
 
diff --git a/src/mame/machine/jalcrpt.h b/src/mame/machine/jalcrpt.h
index c52f552e964..09ce7fde62e 100644
--- a/src/mame/machine/jalcrpt.h
+++ b/src/mame/machine/jalcrpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 void astyanax_rom_decode(running_machine &machine, const char *region);
 void phantasm_rom_decode(running_machine &machine, const char *region);
 void rodland_rom_decode (running_machine &machine, const char *region);
diff --git a/src/mame/machine/jumpshot.c b/src/mame/machine/jumpshot.c
index 7e34c958d1e..a6be5f1b9b2 100644
--- a/src/mame/machine/jumpshot.c
+++ b/src/mame/machine/jumpshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pacman.h"
 
diff --git a/src/mame/machine/jvs13551.c b/src/mame/machine/jvs13551.c
index 5bbf5115301..508045f7d8d 100644
--- a/src/mame/machine/jvs13551.c
+++ b/src/mame/machine/jvs13551.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "jvs13551.h"
 
 const device_type SEGA_837_13551 = &device_creator<sega_837_13551>;
diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h
index b4462afb95f..e11bdc1de22 100644
--- a/src/mame/machine/jvs13551.h
+++ b/src/mame/machine/jvs13551.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __JVS13551_H__
 #define __JVS13551_H__
 
diff --git a/src/mame/machine/k573dio.c b/src/mame/machine/k573dio.c
index 74fc69c2aa4..505caae0320 100644
--- a/src/mame/machine/k573dio.c
+++ b/src/mame/machine/k573dio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "k573dio.h"
 
diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h
index c215ee7c429..41f13eb3d07 100644
--- a/src/mame/machine/k573dio.h
+++ b/src/mame/machine/k573dio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef _K573DIO_H_
diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c
index eded5dd3324..f644ffe3fca 100644
--- a/src/mame/machine/kabuki.c
+++ b/src/mame/machine/kabuki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 "Kabuki" Z80 encryption
diff --git a/src/mame/machine/kabuki.h b/src/mame/machine/kabuki.h
index 54d37a32eb6..3bb715abfd6 100644
--- a/src/mame/machine/kabuki.h
+++ b/src/mame/machine/kabuki.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 void mgakuen2_decode(running_machine &machine);
diff --git a/src/mame/machine/kaneko_calc3.c b/src/mame/machine/kaneko_calc3.c
index a59ae811aab..aacc95f7b41 100644
--- a/src/mame/machine/kaneko_calc3.c
+++ b/src/mame/machine/kaneko_calc3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
  KANEKO CALC3 MCU simulation ( KANEKO CALC3 508 (74 PIN PQFP) )
 
diff --git a/src/mame/machine/kaneko_calc3.h b/src/mame/machine/kaneko_calc3.h
index 3ad16702c4a..b158de04c96 100644
--- a/src/mame/machine/kaneko_calc3.h
+++ b/src/mame/machine/kaneko_calc3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* CALC 3 */
 
 #define VERBOSE_OUTPUT 0
diff --git a/src/mame/machine/kaneko_hit.c b/src/mame/machine/kaneko_hit.c
index b1b90dc2f3f..776e4aa0c2c 100644
--- a/src/mame/machine/kaneko_hit.c
+++ b/src/mame/machine/kaneko_hit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko 'Calc' hitbox collision / protection
 
    It is thought that this is done by the 'CALC1' 'TOYBOX' and 'CALC3' protection chips found on the various boards
diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h
index 5c5add38b54..48e4fabc89e 100644
--- a/src/mame/machine/kaneko_hit.h
+++ b/src/mame/machine/kaneko_hit.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko Hit protection */
 
 
diff --git a/src/mame/machine/kaneko_toybox.c b/src/mame/machine/kaneko_toybox.c
index ff6ffd0fcbe..7d779969abb 100644
--- a/src/mame/machine/kaneko_toybox.c
+++ b/src/mame/machine/kaneko_toybox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko 'Toybox' protection
 
  the following chips have been seen
diff --git a/src/mame/machine/kaneko_toybox.h b/src/mame/machine/kaneko_toybox.h
index e3a72e4c99b..6378094a2e7 100644
--- a/src/mame/machine/kaneko_toybox.h
+++ b/src/mame/machine/kaneko_toybox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko Toybox */
 
 
diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c
index 5a7035a77b6..b9c2e6a6841 100644
--- a/src/mame/machine/konami1.c
+++ b/src/mame/machine/konami1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   The Konami_1 CPU is a 6809 with opcodes scrambled. Here is how to
diff --git a/src/mame/machine/konami1.h b/src/mame/machine/konami1.h
index 1137e7a58cc..56c18552694 100644
--- a/src/mame/machine/konami1.h
+++ b/src/mame/machine/konami1.h
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 UINT8 *konami1_decode(running_machine &machine, const char *cpu);
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index c88d08e90f3..3b3fbec63ed 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * machine/konamigx.c - contains various System GX hardware abstractions
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index 9855ac9f928..eefa4785be2 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Konami PowerPC-based 3D games common functions */
 
 #include "emu.h"
diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h
index 6fb8a8806a9..acf408d3efc 100644
--- a/src/mame/machine/konppc.h
+++ b/src/mame/machine/konppc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _KONPPC_H
 #define _KONPPC_H
 
diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c
index 28a8193b274..daf2e8c3f35 100644
--- a/src/mame/machine/lkage.c
+++ b/src/mame/machine/lkage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c
index e8406d6edf8..9cdce6cd795 100644
--- a/src/mame/machine/lsasquad.c
+++ b/src/mame/machine/lsasquad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "includes/lsasquad.h"
diff --git a/src/mame/machine/maple-dc.c b/src/mame/machine/maple-dc.c
index f608d54331e..76800bd193c 100644
--- a/src/mame/machine/maple-dc.c
+++ b/src/mame/machine/maple-dc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "maple-dc.h"
diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h
index 2d5cec14f1f..ca431a255ca 100644
--- a/src/mame/machine/maple-dc.h
+++ b/src/mame/machine/maple-dc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MAPLE_DC_H__
 #define __MAPLE_DC_H__
 
diff --git a/src/mame/machine/mapledev.c b/src/mame/machine/mapledev.c
index 60a94455d45..ac1e9d7fe83 100644
--- a/src/mame/machine/mapledev.c
+++ b/src/mame/machine/mapledev.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "mapledev.h"
 #include "maple-dc.h"
diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h
index 8f9b41db046..4543870bda8 100644
--- a/src/mame/machine/mapledev.h
+++ b/src/mame/machine/mapledev.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _MAPLEDEV_H_
 #define _MAPLEDEV_H_
 
diff --git a/src/mame/machine/mathbox.c b/src/mame/machine/mathbox.c
index 94bb70a84d2..3841f48e95a 100644
--- a/src/mame/machine/mathbox.c
+++ b/src/mame/machine/mathbox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mathbox.c: math box simulation (Battlezone/Red Baron/Tempest)
  *
diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h
index 120ce4ad3b1..6e869dd7ba4 100644
--- a/src/mame/machine/mathbox.h
+++ b/src/mame/machine/mathbox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * mathbox.h: math box simulation (Battlezone/Red Baron/Tempest)
  *
diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c
index fda805d4f10..d0f6be28a3c 100644
--- a/src/mame/machine/mc8123.c
+++ b/src/mame/machine/mc8123.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 NEC MC-8123 encryption emulation
diff --git a/src/mame/machine/mc8123.h b/src/mame/machine/mc8123.h
index c1d914026e9..7ee3d6879b2 100644
--- a/src/mame/machine/mc8123.h
+++ b/src/mame/machine/mc8123.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   NEC MC-8123 encryption emulation
diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c
index e5bf7d69910..aa76356083e 100644
--- a/src/mame/machine/megadriv.c
+++ b/src/mame/machine/megadriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Megadrive / Genesis support
diff --git a/src/mame/machine/meters.c b/src/mame/machine/meters.c
index 4165c97031e..f8b1c679e17 100644
--- a/src/mame/machine/meters.c
+++ b/src/mame/machine/meters.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // Electro mechanical meters                                             //
diff --git a/src/mame/machine/meters.h b/src/mame/machine/meters.h
index 4a54fea55ec..a67f13ecdcb 100644
--- a/src/mame/machine/meters.h
+++ b/src/mame/machine/meters.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // Electro mechanical meters                                             //
diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c
index 1166744e2fa..1df67cddfef 100644
--- a/src/mame/machine/mexico86.c
+++ b/src/mame/machine/mexico86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/mexico86.h"
 
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index e9c517f192c..66e6b8df991 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Major Havoc hardware
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 06ef87aa250..f47dfab31ac 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microprose Games machine hardware
diff --git a/src/mame/machine/midikbd.c b/src/mame/machine/midikbd.c
index 2c9fef21e28..706f8e36427 100644
--- a/src/mame/machine/midikbd.c
+++ b/src/mame/machine/midikbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/midikbd.h"
 
 const device_type MIDI_KBD = &device_creator<midi_keyboard_device>;
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index 9198e5e983e..2c37f2ae78b 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef MIDIKBD_H_
 #define MIDIKBD_H_
 
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index 4c197c21f4a..c7b88f3db8e 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Driver for Midway T-unit games.
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index 8dc79cabdf7..bfb87d28226 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Williams/Midway Y/Z-unit system
diff --git a/src/mame/machine/mie.c b/src/mame/machine/mie.c
index c52623f2f1d..2b738e356e4 100644
--- a/src/mame/machine/mie.c
+++ b/src/mame/machine/mie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "mie.h"
diff --git a/src/mame/machine/mie.h b/src/mame/machine/mie.h
index babe47ad830..a0b6ceff894 100644
--- a/src/mame/machine/mie.h
+++ b/src/mame/machine/mie.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MIE_H__
 #define __MIE_H__
 
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index b3499d7116d..63fdfddd3a6 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** Model 1 coprocessor TGP simulation
 */
diff --git a/src/mame/machine/model3.c b/src/mame/machine/model3.c
index d679424c561..2bea340cbf7 100644
--- a/src/mame/machine/model3.c
+++ b/src/mame/machine/model3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   machine/model3.c: functions emulating various aspects of the Model 3 hardware
diff --git a/src/mame/machine/mw8080bw.c b/src/mame/machine/mw8080bw.c
index 911780be2b9..bdaebac8ddf 100644
--- a/src/mame/machine/mw8080bw.c
+++ b/src/mame/machine/mw8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index 90899a0ab11..28a5cd0a6d4 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* machine/n64.c - contains N64 hardware emulation shared between MAME and MESS */
 
 #include "emu.h"
diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c
index de31253c472..bdd215c0946 100644
--- a/src/mame/machine/namco62.c
+++ b/src/mame/machine/namco62.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Namco 62XX
diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h
index 212fa9fb085..c54f3187a4e 100644
--- a/src/mame/machine/namco62.h
+++ b/src/mame/machine/namco62.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef NAMCO62_H
 #define NAMCO62_H
 
diff --git a/src/mame/machine/namco_settings.c b/src/mame/machine/namco_settings.c
index eca197b730b..54d380f20fb 100644
--- a/src/mame/machine/namco_settings.c
+++ b/src/mame/machine/namco_settings.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "namco_settings.h"
 
diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c
index 1481af06d57..44020e35ca6 100644
--- a/src/mame/machine/namcoio.c
+++ b/src/mame/machine/namcoio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The following Namco custom chips are all instances of the same 4-bit MCU,
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 7c2b4e14249..d1b35f6049d 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NAMCOIO_H__
 #define __NAMCOIO_H__
 
diff --git a/src/mame/machine/namcomcu.c b/src/mame/machine/namcomcu.c
index 1d677140efb..94eb5b12f7a 100644
--- a/src/mame/machine/namcomcu.c
+++ b/src/mame/machine/namcomcu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Mitsubishi M37702 MCUs with Namco custom labels.
 
diff --git a/src/mame/machine/namcomcu.h b/src/mame/machine/namcomcu.h
index d19e76702e7..5906b6c9a19 100644
--- a/src/mame/machine/namcomcu.h
+++ b/src/mame/machine/namcomcu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NAMCOMCU_H__
diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c
index 2915598ea70..a516aebc1a3 100644
--- a/src/mame/machine/namcond1.c
+++ b/src/mame/machine/namcond1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Namco ND-1
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index a71fd1f5221..d99f8a928d2 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/namcos1.h"
 
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 3927af2da44..ceecb04fbe3 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Namco System II
diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c
index 56e78f28e60..e437a586eb3 100644
--- a/src/mame/machine/naomi.c
+++ b/src/mame/machine/naomi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Per-game specific JVS settings / idle loop skips for the MAME Naomi driver.
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index d1fdbf9efc5..26e6b66154e 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomibd.h"
diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h
index c3484a436af..c4823e7abf1 100644
--- a/src/mame/machine/naomibd.h
+++ b/src/mame/machine/naomibd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIBD_H_
 #define _NAOMIBD_H_
 
diff --git a/src/mame/machine/naomig1.c b/src/mame/machine/naomig1.c
index fa8ec8370c2..09908151dca 100644
--- a/src/mame/machine/naomig1.c
+++ b/src/mame/machine/naomig1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "machine/naomig1.h"
diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h
index 6aac02c5d2f..f5bfd204586 100644
--- a/src/mame/machine/naomig1.h
+++ b/src/mame/machine/naomig1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIG1_H_
 #define _NAOMIG1_H_
 
diff --git a/src/mame/machine/naomigd.c b/src/mame/machine/naomigd.c
index 7de7709ffa7..eefb2704d88 100644
--- a/src/mame/machine/naomigd.c
+++ b/src/mame/machine/naomigd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomigd.h"
diff --git a/src/mame/machine/naomigd.h b/src/mame/machine/naomigd.h
index a2a58933a2b..ef754b347ac 100644
--- a/src/mame/machine/naomigd.h
+++ b/src/mame/machine/naomigd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIGD_H_
 #define _NAOMIGD_H_
 
diff --git a/src/mame/machine/naomim1.c b/src/mame/machine/naomim1.c
index 6b1ba5be871..2d26bc793c3 100644
--- a/src/mame/machine/naomim1.c
+++ b/src/mame/machine/naomim1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomim1.h"
diff --git a/src/mame/machine/naomim1.h b/src/mame/machine/naomim1.h
index 4044c119d9d..1314e7f0a14 100644
--- a/src/mame/machine/naomim1.h
+++ b/src/mame/machine/naomim1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIM1_H_
 #define _NAOMIM1_H_
 
diff --git a/src/mame/machine/naomim2.c b/src/mame/machine/naomim2.c
index e52fd5548f5..7d973810dfd 100644
--- a/src/mame/machine/naomim2.c
+++ b/src/mame/machine/naomim2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomim2.h"
diff --git a/src/mame/machine/naomim2.h b/src/mame/machine/naomim2.h
index acbd94fc64d..34a6679c1b7 100644
--- a/src/mame/machine/naomim2.h
+++ b/src/mame/machine/naomim2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIM2_H_
 #define _NAOMIM2_H_
 
diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c
index dc322ed0aa1..55011c9bd53 100644
--- a/src/mame/machine/naomim4.c
+++ b/src/mame/machine/naomim4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomim4.h"
diff --git a/src/mame/machine/naomim4.h b/src/mame/machine/naomim4.h
index 804affca87f..d80ac33b118 100644
--- a/src/mame/machine/naomim4.h
+++ b/src/mame/machine/naomim4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIM4_H_
 #define _NAOMIM4_H_
 
diff --git a/src/mame/machine/naomirom.c b/src/mame/machine/naomirom.c
index c105d2a7695..12548623525 100644
--- a/src/mame/machine/naomirom.c
+++ b/src/mame/machine/naomirom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "naomirom.h"
diff --git a/src/mame/machine/naomirom.h b/src/mame/machine/naomirom.h
index e264d27d0eb..35fdd3036ee 100644
--- a/src/mame/machine/naomirom.h
+++ b/src/mame/machine/naomirom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _NAOMIROM_H_
 #define _NAOMIROM_H_
 
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index a2dce7d9207..21fe93431b1 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Machine Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c
index c5399014fae..a36021df56e 100644
--- a/src/mame/machine/neoboot.c
+++ b/src/mame/machine/neoboot.c
@@ -1,2 +1,4 @@
+// license:???
+// copyright-holders:???
 
 // empty
diff --git a/src/mame/machine/neocrypt.c b/src/mame/machine/neocrypt.c
index e93b406b9c1..5c449eca50e 100644
--- a/src/mame/machine/neocrypt.c
+++ b/src/mame/machine/neocrypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /***************************************************************************
 
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index 29696e7579e..02c28af0e8b 100644
--- a/src/mame/machine/neoprot.c
+++ b/src/mame/machine/neoprot.c
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 /// empty
diff --git a/src/mame/machine/ng_memcard.c b/src/mame/machine/ng_memcard.c
index ffc578cf1dd..d9c99576a8a 100644
--- a/src/mame/machine/ng_memcard.c
+++ b/src/mame/machine/ng_memcard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ng_memcard.c
diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h
index ea1a419ecd0..97222f3d4a1 100644
--- a/src/mame/machine/ng_memcard.h
+++ b/src/mame/machine/ng_memcard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     ng_memcard.h
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index daae81d8212..37d28284b2b 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Night Driver hardware
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index cba844a89ee..08e16f26f94 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  NMK112 - NMK custom IC for bankswitching the sample ROMs of a pair of
     OKI6295 ADPCM chips
 
diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h
index 9c05e1a44d4..a8d5b3591c6 100644
--- a/src/mame/machine/nmk112.h
+++ b/src/mame/machine/nmk112.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     nmk112.h
diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c
index bcf14b7c5ac..2317bec9f1c 100644
--- a/src/mame/machine/nycaptor.c
+++ b/src/mame/machine/nycaptor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c
index e297034db17..240d11eb4b4 100644
--- a/src/mame/machine/opwolf.c
+++ b/src/mame/machine/opwolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Operation Wolf C-Chip Protection
diff --git a/src/mame/machine/pacplus.c b/src/mame/machine/pacplus.c
index 8c0e0ebe91e..889a06c121f 100644
--- a/src/mame/machine/pacplus.c
+++ b/src/mame/machine/pacplus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pacman.h"
 
diff --git a/src/mame/machine/pcecommn.c b/src/mame/machine/pcecommn.c
index 693f7b38a04..9d2015754a2 100644
--- a/src/mame/machine/pcecommn.c
+++ b/src/mame/machine/pcecommn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "machine/pcecommn.h"
diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h
index ca36e7ce38e..433d682cd61 100644
--- a/src/mame/machine/pcecommn.h
+++ b/src/mame/machine/pcecommn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   pcecommn.h
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 25c3f23d529..56b750abd14 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/pcshare.c
diff --git a/src/mame/machine/pcshare.h b/src/mame/machine/pcshare.h
index d61c2c2f81a..59deb3c3bce 100644
--- a/src/mame/machine/pcshare.h
+++ b/src/mame/machine/pcshare.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/am9517a.h"
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c
index 014181058fb..9f05427c068 100644
--- a/src/mame/machine/pgmcrypt.c
+++ b/src/mame/machine/pgmcrypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS 027 Encryptions
 
   the IGS027 chips are typically used with encrypted ROMs.
diff --git a/src/mame/machine/pgmcrypt.h b/src/mame/machine/pgmcrypt.h
index a92c7a7a27b..6a273ded839 100644
--- a/src/mame/machine/pgmcrypt.h
+++ b/src/mame/machine/pgmcrypt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* IGS 027 Encryptions */
 
 void pgm_kov_decrypt(running_machine &machine);
diff --git a/src/mame/machine/pgmprot_igs025_igs012.c b/src/mame/machine/pgmprot_igs025_igs012.c
index 2da122081f0..f068a86e348 100644
--- a/src/mame/machine/pgmprot_igs025_igs012.c
+++ b/src/mame/machine/pgmprot_igs025_igs012.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM 012 + 025 PGM protection emulation
 
diff --git a/src/mame/machine/pgmprot_igs025_igs022.c b/src/mame/machine/pgmprot_igs025_igs022.c
index c85fadd0f17..1f6401923e8 100644
--- a/src/mame/machine/pgmprot_igs025_igs022.c
+++ b/src/mame/machine/pgmprot_igs025_igs022.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM 022 + 025 PGM protection emulation
 
diff --git a/src/mame/machine/pgmprot_igs025_igs028.c b/src/mame/machine/pgmprot_igs025_igs028.c
index 4e53fdb2253..eba78c76b8f 100644
--- a/src/mame/machine/pgmprot_igs025_igs028.c
+++ b/src/mame/machine/pgmprot_igs025_igs028.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  IGS28 + IGS025 PGM protection emulation
 
diff --git a/src/mame/machine/pgmprot_igs027a_type1.c b/src/mame/machine/pgmprot_igs027a_type1.c
index 9c15641e489..14b3747cdd7 100644
--- a/src/mame/machine/pgmprot_igs027a_type1.c
+++ b/src/mame/machine/pgmprot_igs027a_type1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM IGS027A ARM protection simulations & emulation - type 1
 
diff --git a/src/mame/machine/pgmprot_igs027a_type2.c b/src/mame/machine/pgmprot_igs027a_type2.c
index a555de18a16..24967e3791d 100644
--- a/src/mame/machine/pgmprot_igs027a_type2.c
+++ b/src/mame/machine/pgmprot_igs027a_type2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM IGS027A ARM protection emulation - type 2
 
diff --git a/src/mame/machine/pgmprot_igs027a_type3.c b/src/mame/machine/pgmprot_igs027a_type3.c
index 6795118233b..fa7a579918d 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.c
+++ b/src/mame/machine/pgmprot_igs027a_type3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM IGS027A ARM protection emulation
 
diff --git a/src/mame/machine/pgmprot_orlegend.c b/src/mame/machine/pgmprot_orlegend.c
index a9f96018119..d1350bbbcda 100644
--- a/src/mame/machine/pgmprot_orlegend.c
+++ b/src/mame/machine/pgmprot_orlegend.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
  PGM ASIC3 PGM protection emulation
 
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index 9574ed4774b..7aa7738429b 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pit&Run
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index df9f73e53e7..e4d46475ae1 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/ppu2c0x.h"
 #include "machine/nvram.h"
diff --git a/src/mame/machine/pxa255.h b/src/mame/machine/pxa255.h
index dbfb0fa038d..5057ee459d3 100644
--- a/src/mame/machine/pxa255.h
+++ b/src/mame/machine/pxa255.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * Intel PXA255 on-chip peripheral emulation
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 69df81883eb..7c38e2696a7 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Qix hardware
diff --git a/src/mame/machine/r2crypt.c b/src/mame/machine/r2crypt.c
index 7d0d2c4cc2e..2f66a453b27 100644
--- a/src/mame/machine/r2crypt.c
+++ b/src/mame/machine/r2crypt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Raiden 2 Sprite Decryption */
 
 #include "emu.h"
diff --git a/src/mame/machine/raiden2cop.c b/src/mame/machine/raiden2cop.c
index 5e06c12dff8..613275a680d 100644
--- a/src/mame/machine/raiden2cop.c
+++ b/src/mame/machine/raiden2cop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Seibu Cop (Co-Processor) emulation
diff --git a/src/mame/machine/raiden2cop.h b/src/mame/machine/raiden2cop.h
index 63db2eab45c..4469948d7a5 100644
--- a/src/mame/machine/raiden2cop.h
+++ b/src/mame/machine/raiden2cop.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Seibu Cop (Co-Processor) emulation
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c
index 46db538807e..e2a79625f54 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rainbow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Rainbow Islands C-Chip Protection
diff --git a/src/mame/machine/retofinv.c b/src/mame/machine/retofinv.c
index 0f67392d177..00755adf12a 100644
--- a/src/mame/machine/retofinv.c
+++ b/src/mame/machine/retofinv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "includes/retofinv.h"
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 684028126aa..d928dbf5269 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/sec.c b/src/mame/machine/sec.c
index ce877c7e165..57e32d4f4a2 100644
--- a/src/mame/machine/sec.c
+++ b/src/mame/machine/sec.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Serial Electronic Counter (SEC) */
 
 #include "emu.h"
diff --git a/src/mame/machine/sec.h b/src/mame/machine/sec.h
index ee4f8347feb..bddeefab42a 100644
--- a/src/mame/machine/sec.h
+++ b/src/mame/machine/sec.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* commands */
 
diff --git a/src/mame/machine/segabb.c b/src/mame/machine/segabb.c
index 4594239213c..a4419369386 100644
--- a/src/mame/machine/segabb.c
+++ b/src/mame/machine/segabb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "segabb.h"
 
 const device_type SEGA_LINDBERGH_BASEBOARD = &device_creator<sega_lindbergh_baseboard_device>;
diff --git a/src/mame/machine/segabb.h b/src/mame/machine/segabb.h
index fefad6163a7..ee79bb52e95 100644
--- a/src/mame/machine/segabb.h
+++ b/src/mame/machine/segabb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Lindbergh Sega baseboard
 
 #ifndef SEGABB_H
diff --git a/src/mame/machine/segacrp2.c b/src/mame/machine/segacrp2.c
index 7c3bd6ffa05..d2a98904591 100644
--- a/src/mame/machine/segacrp2.c
+++ b/src/mame/machine/segacrp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Sega encryption emulation                                 by Nicola Salmoria
diff --git a/src/mame/machine/segacrp2.h b/src/mame/machine/segacrp2.h
index 6c0b227b569..5d100cc0fda 100644
--- a/src/mame/machine/segacrp2.h
+++ b/src/mame/machine/segacrp2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 void sega_315_5162_decode(running_machine &machine, const char *cputag);
 void sega_315_5177_decode(running_machine &machine, const char *cputag);
 void sega_315_5178_decode(running_machine &machine, const char *cputag);
diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c
index 9fa63b5d099..17aaa2753e8 100644
--- a/src/mame/machine/segacrpt.c
+++ b/src/mame/machine/segacrpt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Sega encryption emulation                                 by Nicola Salmoria
diff --git a/src/mame/machine/segacrpt.h b/src/mame/machine/segacrpt.h
index d49414c7e28..808ea660d13 100644
--- a/src/mame/machine/segacrpt.h
+++ b/src/mame/machine/segacrpt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 void buckrog_decode(running_machine &machine, const char *cputag);
 void pengo_decode(running_machine &machine, const char *cputag);
 void szaxxon_decode(running_machine &machine, const char *cputag);
diff --git a/src/mame/machine/segag80.c b/src/mame/machine/segag80.c
index 7e1b07aaf50..844a3ccfc5d 100644
--- a/src/mame/machine/segag80.c
+++ b/src/mame/machine/segag80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega G-80 raster hardware
diff --git a/src/mame/machine/segag80.h b/src/mame/machine/segag80.h
index a114cf1d4c4..625349492e1 100644
--- a/src/mame/machine/segag80.h
+++ b/src/mame/machine/segag80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 typedef UINT8 (*segag80_decrypt_func)(offs_t, UINT8);
 
 segag80_decrypt_func segag80_security(int chip);
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index 9777265256d..7acc5aedb46 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega System 32 Protection related functions */
 
 #include "emu.h"
diff --git a/src/mame/machine/seibuspi.c b/src/mame/machine/seibuspi.c
index 32c5f2b24fd..01090bf8a55 100644
--- a/src/mame/machine/seibuspi.c
+++ b/src/mame/machine/seibuspi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "machine/seibuspi.h"
 
diff --git a/src/mame/machine/seibuspi.h b/src/mame/machine/seibuspi.h
index cc39abc6f8f..cfd1943dc8a 100644
--- a/src/mame/machine/seibuspi.h
+++ b/src/mame/machine/seibuspi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 UINT32 partial_carry_sum32(UINT32 add1,UINT32 add2,UINT32 carry_mask);
 
 void seibuspi_text_decrypt(UINT8 *rom);
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index f42cf28b524..abc6e57e9e1 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
   OLD Seibu Cop simulation code.
diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicop.h
index f19b96e3312..c9ff6df66c8 100644
--- a/src/mame/machine/seicop.h
+++ b/src/mame/machine/seicop.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "raiden2cop.h"
 
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index da998ffe30c..f9795ed573b 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "cpu/m6809/konami.h"
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index e64edb0fd7f..a95ad870fad 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index 53e8d4390be..ec744a8f0a9 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Slick Shot input handling
diff --git a/src/mame/machine/spisprit.c b/src/mame/machine/spisprit.c
index 62a350cef61..db7b41740be 100644
--- a/src/mame/machine/spisprit.c
+++ b/src/mame/machine/spisprit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #if 0
 key tables: table[n] is the column of bit n
 cpu #0 (PC=0033C2F5): unmapped program memory dword write to 00000530 = 0000xxxx & FFFFFFFF (256 times, see key_table[])
diff --git a/src/mame/machine/st0016.c b/src/mame/machine/st0016.c
index cc7c871c385..fcb3c55eca9 100644
--- a/src/mame/machine/st0016.c
+++ b/src/mame/machine/st0016.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ST0016 - CPU (z80) + Sound + Video */
 
 #include "st0016.h"
diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h
index 3e137bcee47..f9035396ad3 100644
--- a/src/mame/machine/st0016.h
+++ b/src/mame/machine/st0016.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ST0016 - CPU (z80) + Sound + Video */
 
 #pragma once
diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c
index 12b654dc55a..5bbbb43ac99 100644
--- a/src/mame/machine/starwars.c
+++ b/src/mame/machine/starwars.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Star Wars hardware
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 426afcbfcc0..ffe66e1ca80 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   stfight.c
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index c1c1759340e..471b5506db7 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ST-V hookup for 315-5881 encryption/compression chip */
 
 /*
diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c
index b16c52671c7..5fc4adffacb 100644
--- a/src/mame/machine/subs.c
+++ b/src/mame/machine/subs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Subs hardware
diff --git a/src/mame/machine/subsino.c b/src/mame/machine/subsino.c
index 96deb908dd5..64cdd84dea1 100644
--- a/src/mame/machine/subsino.c
+++ b/src/mame/machine/subsino.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Subsino XOR + Bitswap Encryption
diff --git a/src/mame/machine/subsino.h b/src/mame/machine/subsino.h
index 4153c1b258f..16c7015d105 100644
--- a/src/mame/machine/subsino.h
+++ b/src/mame/machine/subsino.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MACHINE_SUBSINO__
 #define __MACHINE_SUBSINO__
 
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index b6b4a6cd75a..c0e10451343 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Taito 8741 emulation
diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h
index 5fc07eb2122..3b240e31ff6 100644
--- a/src/mame/machine/tait8741.h
+++ b/src/mame/machine/tait8741.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TAITO8741__
 #define __TAITO8741__
 
diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c
index faeb67bc4a1..11cf39cf034 100644
--- a/src/mame/machine/taitoio.c
+++ b/src/mame/machine/taitoio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 TC0220IOC
diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h
index 9e60fc48bd8..b5c6c22785e 100644
--- a/src/mame/machine/taitoio.h
+++ b/src/mame/machine/taitoio.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     taitoio.h
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index 4f23a82c82f..6fe1dceca9e 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 4c51c62da0b..60a3ff137ce 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tatsumi.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/machine/tecmosys.c b/src/mame/machine/tecmosys.c
index e5dd0d8a36d..9a9c7905c39 100644
--- a/src/mame/machine/tecmosys.c
+++ b/src/mame/machine/tecmosys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* tecmosys protection related functions */
 
 /*
diff --git a/src/mame/machine/theglobp.c b/src/mame/machine/theglobp.c
index 97b896b63f8..17b3cde9d44 100644
--- a/src/mame/machine/theglobp.c
+++ b/src/mame/machine/theglobp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/tigeroad.c b/src/mame/machine/tigeroad.c
index 3889af6b0f5..766564e0fa8 100644
--- a/src/mame/machine/tigeroad.c
+++ b/src/mame/machine/tigeroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tigeroad.h"
 
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index 25b0ad3640e..55dcac5bc5c 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index bd34f3c50c8..3ed580453b5 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                 ToaPlan game hardware from 1988-1991
                 ------------------------------------
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 4807a755b77..7d3727e9bae 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
  *  Twin Cobra                                                              *
  *  Communications and memory functions between shared CPU memory spaces    *
diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c
index b8551618a28..05b51fc17cf 100644
--- a/src/mame/machine/tx1.c
+++ b/src/mame/machine/tx1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatsumi TX-1/Buggy Boy machine hardware
diff --git a/src/mame/machine/vectrex.c b/src/mame/machine/vectrex.c
index 4cfd14046e9..3b8b9ff58ef 100644
--- a/src/mame/machine/vectrex.c
+++ b/src/mame/machine/vectrex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index 1ea7a55d78a..84e58fdc984 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Exidy Vertigo hardware
diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c
index aecde231582..e4eae420231 100644
--- a/src/mame/machine/volfied.c
+++ b/src/mame/machine/volfied.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Volfied C-Chip Protection
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index af63c95d5b7..1b5e789369f 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index bf44741da70..f4087f8e9cf 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Williams 6809 system
diff --git a/src/mame/machine/wpc.c b/src/mame/machine/wpc.c
index d8096085d7e..29391f67b17 100644
--- a/src/mame/machine/wpc.c
+++ b/src/mame/machine/wpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wpc.c  --  Williams WPC ASIC, used on Williams WPC pinball machines
  *
diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h
index 5594082ff74..018f0abad22 100644
--- a/src/mame/machine/wpc.h
+++ b/src/mame/machine/wpc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * wpc.h
  *
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index 50d39ed9e5b..9ef18ca3ae5 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     World Rally
diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c
index 38b6f0bfc04..b7af5ae0700 100644
--- a/src/mame/machine/xevious.c
+++ b/src/mame/machine/xevious.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mame/mame.c b/src/mame/mame.c
index bff5a89726f..c84746743df 100644
--- a/src/mame/mame.c
+++ b/src/mame/mame.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     mame.c
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 7aa4b6b1958..0384640e766 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     mame.lst
@@ -5,37 +7,6 @@
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.
 
-****************************************************************************
-
-    Copyright Aaron Giles
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in
-          the documentation and/or other materials provided with the
-          distribution.
-        * Neither the name 'MAME' nor the names of its contributors may be
-          used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
 ******************************************************************************/
 
 
@@ -6364,6 +6335,7 @@ ddribble        // GX690 (c) 1986
 ddribblep       // GX690 (c) 1986
 contra          // GX633 (c) 1987
 contra1         // GX633 (c) 1987
+contrae			// GX633 (c) 1987
 contraj         // GX633 (c) 1987 (Japan)
 contraj1        // GX633 (c) 1987 (Japan)
 gryzor          // GX633 (c) 1987
@@ -10915,6 +10887,7 @@ wheelfir        // (c) 199? TCH
 littlerb        // (c) 1993 TCH
 tattack         // (c) 198? Shonan
 mosaicf2        // (c) 1999 F2 System
+royalpk2		//
 finalgdr        // (c) 2001 Semicom
 mrkicker        // (c) 2001 Semicom
 wivernwg        // (c) 2001 Semicom
diff --git a/src/mame/tiny.lst b/src/mame/tiny.lst
index 93332cfb60d..80d6de1e6b0 100644
--- a/src/mame/tiny.lst
+++ b/src/mame/tiny.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     tiny.lst
@@ -5,37 +7,6 @@
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.
 
-****************************************************************************
-
-    Copyright Aaron Giles
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in
-          the documentation and/or other materials provided with the
-          distribution.
-        * Neither the name 'MAME' nor the names of its contributors may be
-          used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
 ******************************************************************************/
 
 robby           // (c) 1981 Bally Midway
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index bde4d7d4679..78c1d5d0cd4 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index c72d9d9a262..65d52284da8 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 1943 Video Hardware
diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c
index 4a2206459bf..bd6353287a6 100644
--- a/src/mame/video/20pacgal.c
+++ b/src/mame/video/20pacgal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ms.Pac-Man/Galaga - 20 Year Reunion hardware
diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c
index b592500519e..8485480b1df 100644
--- a/src/mame/video/40love.c
+++ b/src/mame/video/40love.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 *   Video Driver for Forty-Love
 */
diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c
index 6e5778f44a1..05096f9754f 100644
--- a/src/mame/video/4enraya.c
+++ b/src/mame/video/4enraya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   IDSA 4 En Raya
diff --git a/src/mame/video/8080bw.c b/src/mame/video/8080bw.c
index 39f9bf8fb3a..5ff09276718 100644
--- a/src/mame/video/8080bw.c
+++ b/src/mame/video/8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/88games.c b/src/mame/video/88games.c
index 5545ea30056..d817b662472 100644
--- a/src/mame/video/88games.c
+++ b/src/mame/video/88games.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/88games.h"
 
diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c
index 589c86a8f56..629b6a6e7e4 100644
--- a/src/mame/video/actfancr.c
+++ b/src/mame/video/actfancr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     actfancr - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 5a2b3aac72d..fde5c153b64 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/aeroboto.c
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index ae95bc61fbe..d2de1313bb1 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/aerofgt.h"
 
diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c
index d6284608c83..40d814b7b38 100644
--- a/src/mame/video/airbustr.c
+++ b/src/mame/video/airbustr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
                                 Air Buster
diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c
index 037017050ef..68bfd7dcfe2 100644
--- a/src/mame/video/ajax.c
+++ b/src/mame/video/ajax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c
index ae0199d1d50..4531db87dbe 100644
--- a/src/mame/video/aliens.c
+++ b/src/mame/video/aliens.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/aliens.h"
 
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index db2385c7fb2..00ecc38b004 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Alpha 68k video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index ab1360a1bee..27dde39ded1 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 08a19426433..07e84879af4 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga hardware
diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c
index 3fc9745b0ba..4bf3c929e44 100644
--- a/src/mame/video/amigaaga.c
+++ b/src/mame/video/amigaaga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga AGA hardware
diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c
index 6969ca40c85..5522b501ec8 100644
--- a/src/mame/video/ampoker2.c
+++ b/src/mame/video/ampoker2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************************
 
 
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index 06ade938ef1..ed1436ec192 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= American Speedway =-
diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c
index e42f3b510f6..d3e95514460 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/angelkds.c - see drivers/angelkds.c for more info */
 
 /* graphical issues
diff --git a/src/mame/video/antic.c b/src/mame/video/antic.c
index 1998d24182f..0e7381c29e9 100644
--- a/src/mame/video/antic.c
+++ b/src/mame/video/antic.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
     Atari 400/800
 
diff --git a/src/mame/video/antic.h b/src/mame/video/antic.h
index 9107fa24c4f..bb08a37361b 100644
--- a/src/mame/video/antic.h
+++ b/src/mame/video/antic.h
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     Atari 400/800
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index b70b6390ad3..87f026c3cc3 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c
index 7849ccf225d..679fff9eb9a 100644
--- a/src/mame/video/aquarium.c
+++ b/src/mame/video/aquarium.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Aquarium */
 
 #include "emu.h"
diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c
index 30fe9e7fe32..551fdba2dc3 100644
--- a/src/mame/video/arabian.c
+++ b/src/mame/video/arabian.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/archimds.c b/src/mame/video/archimds.c
index ed203f0b44f..a8e19420380 100644
--- a/src/mame/video/archimds.c
+++ b/src/mame/video/archimds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Acorn Archimedes VIDC (VIDeo Controller) emulation
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index b976d87cee0..21705f07484 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 7ae26b139ab..53f66486b67 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index d33d6e43038..60a26a39a34 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Armed Formation video emulation
diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c
index 2cd8d3f5349..075cab9fd38 100644
--- a/src/mame/video/ashnojoe.c
+++ b/src/mame/video/ashnojoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
     Ashita no Joe (Success Joe) [Wave]
diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c
index 810dd10b771..01abe5cd59c 100644
--- a/src/mame/video/asterix.c
+++ b/src/mame/video/asterix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/asterix.h"
 
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index 91c8ae4a0c5..3e0fce476f7 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bally Astrocade-based hardware
diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c
index 01701f36614..fd6aa814b40 100644
--- a/src/mame/video/asuka.c
+++ b/src/mame/video/asuka.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/asuka.h"
 
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index 881e5094ecc..e67fd6f55d0 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
     Atari 400/800
 
diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c
index 2bf3c5feb22..70ce6f834b9 100644
--- a/src/mame/video/atarifb.c
+++ b/src/mame/video/atarifb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Football hardware
diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c
index c0f6432c62b..2aac5caa48f 100644
--- a/src/mame/video/atetris.c
+++ b/src/mame/video/atetris.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Tetris hardware
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index c93e0f59b2d..52ed71a0008 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     avgdvg.c: Atari DVG and AVG
diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h
index 821c2f5c831..a74acddc627 100644
--- a/src/mame/video/avgdvg.h
+++ b/src/mame/video/avgdvg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __AVGDVG__
 #define __AVGDVG__
 
diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c
index 58708b17bd8..e86467abe04 100644
--- a/src/mame/video/awpvid.c
+++ b/src/mame/video/awpvid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
     AWP Hardware video simulation system
diff --git a/src/mame/video/awpvid.h b/src/mame/video/awpvid.h
index 7ce1928de8c..3748e9c2292 100644
--- a/src/mame/video/awpvid.h
+++ b/src/mame/video/awpvid.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
     AWP Hardware video simulation system
diff --git a/src/mame/video/aztarac.c b/src/mame/video/aztarac.c
index df99f492f45..6fe600c49a2 100644
--- a/src/mame/video/aztarac.c
+++ b/src/mame/video/aztarac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Centuri Aztarac hardware
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index 2232d30721c..8a42100e548 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   bagman.c
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index b59ef03a15b..b8742a089b6 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index f16e1c7745d..8e60a531c31 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/baraduke.h"
 
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index 9a8ecd07177..d958694137c 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Battle Lane Vol. 5
diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c
index 1187f6fbc2e..421695a3443 100644
--- a/src/mame/video/battlera.c
+++ b/src/mame/video/battlera.c
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 // delete me
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index c2b085f0952..9ac8321ee77 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Video emulation for Omori Battle Cross
diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c
index 605cfa8d263..722bdb52055 100644
--- a/src/mame/video/battlnts.c
+++ b/src/mame/video/battlnts.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/battlnts.h"
 
diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c
index dcc064e8037..73358787cb0 100644
--- a/src/mame/video/bbusters.c
+++ b/src/mame/video/bbusters.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Emulation by Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c
index 4ae88f817b3..01f2ec7521c 100644
--- a/src/mame/video/beezer.c
+++ b/src/mame/video/beezer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c
index 85ceb4432e9..6751ee54808 100644
--- a/src/mame/video/bfm_adr2.c
+++ b/src/mame/video/bfm_adr2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Bellfruit Adder2 video board driver, (under heavy construction !!!)
diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h
index 8316f8a4b6a..2d22bc8ee25 100644
--- a/src/mame/video/bfm_adr2.h
+++ b/src/mame/video/bfm_adr2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef INC_BFMADDER2
 #define INC_BFMADDER2
 
diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c
index c1860bf9352..1504c62063d 100644
--- a/src/mame/video/bfm_dm01.c
+++ b/src/mame/video/bfm_dm01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bellfruit dotmatrix driver, (under heavy construction !!!)
diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h
index df68264a556..c134c8ce526 100644
--- a/src/mame/video/bfm_dm01.h
+++ b/src/mame/video/bfm_dm01.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************
 
     Bellfruit dotmatrix driver, (under heavy construction !!!)
diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c
index b69f8e547cf..33549262555 100644
--- a/src/mame/video/bigevglf.c
+++ b/src/mame/video/bigevglf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c
index ed7d355cc15..d405c6a9a2a 100644
--- a/src/mame/video/bigstrkb.c
+++ b/src/mame/video/bigstrkb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Big Striker (bootleg) Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 1765b418f34..cd3f82db575 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bionic Commando Video Hardware
diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c
index d361abdd815..17822eecd91 100644
--- a/src/mame/video/bishi.c
+++ b/src/mame/video/bishi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Bishi Bashi Champ Mini Game Senshuken
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index ce871a1cbac..2d483e6756b 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   bking.c
diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c
index 68b85244934..72a0d3564aa 100644
--- a/src/mame/video/bladestl.c
+++ b/src/mame/video/bladestl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/bladestl.h"
 
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 4fff65e723c..19940b4887e 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/blktiger.h"
 
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index 13a6f6cdf59..c75d727e7b8 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Blomby Car =-
diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c
index f66ab32f758..268959ab7ac 100644
--- a/src/mame/video/blockade.c
+++ b/src/mame/video/blockade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/blockade.h"
 
diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c
index f62591bba08..592ab953b5c 100644
--- a/src/mame/video/blockhl.c
+++ b/src/mame/video/blockhl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/blockhl.h"
 
diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c
index c41451f5cca..db52679e219 100644
--- a/src/mame/video/blockout.c
+++ b/src/mame/video/blockout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Block Out
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index 5df031809c4..41bc53bc086 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Video Hardware for Blood Brothers
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index 5f74234a5ba..fff8e98e07d 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Blue Print
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index c2ef0d14024..469515b3baf 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/bogeyman.h"
 
diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c
index b8c9bd07288..56e76c8dcd5 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index 8f4dfd40e69..f54c8c3825b 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/boogwing.h"
 
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index a5f534acb87..50e868e7737 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c
index 08f37df3960..fbff2b0f1ee 100644
--- a/src/mame/video/bottom9.c
+++ b/src/mame/video/bottom9.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/bottom9.h"
 
diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c
index a9de766263b..a753b567b7e 100644
--- a/src/mame/video/brkthru.c
+++ b/src/mame/video/brkthru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/brkthru.c
diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c
index 32ff1190720..a433a6c4e34 100644
--- a/src/mame/video/bsktball.c
+++ b/src/mame/video/bsktball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Basketball hardware
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 79245dbfd2e..bd74b9b34a3 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video.c
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index 44cbb0a4828..b573002c7d6 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index 69c6eb36f56..255c53c83ae 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/buggychl.h"
 
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index e49c953ea91..31ace2ef881 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
 B-Wings  (c) 1984 Data East Corporation
@@ -17,7 +19,7 @@ revised by Alex W. Jackson
 // Exports
 
 
-WRITE8_MEMBER(bwing_state::bwing_videoram_w)
+WRITE8_MEMBER(bwing_state::videoram_w)
 {
 	m_videoram[offset] = data;
 	m_charmap->mark_tile_dirty(offset);
@@ -46,7 +48,7 @@ WRITE8_MEMBER(bwing_state::gfxram_w)
 }
 
 
-WRITE8_MEMBER(bwing_state::bwing_scrollreg_w)
+WRITE8_MEMBER(bwing_state::scrollreg_w)
 {
 	m_sreg[offset] = data;
 
@@ -62,7 +64,7 @@ WRITE8_MEMBER(bwing_state::bwing_scrollreg_w)
 }
 
 
-WRITE8_MEMBER(bwing_state::bwing_paletteram_w)
+WRITE8_MEMBER(bwing_state::paletteram_w)
 {
 	static const float rgb[4][3] = {
 		{0.85f, 0.95f, 1.00f},
@@ -113,7 +115,7 @@ TILE_GET_INFO_MEMBER(bwing_state::get_charinfo)
 	SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0);
 }
 
-TILEMAP_MAPPER_MEMBER(bwing_state::bwing_scan_cols)
+TILEMAP_MAPPER_MEMBER(bwing_state::scan_cols)
 {
 	return (row & 0xf) | ((col & 0xf) << 4) | ((row & 0x30) << 4) | ((col & 0x30) << 6);
 }
@@ -124,8 +126,8 @@ void bwing_state::video_start()
 	int i;
 
 	m_charmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_charinfo),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32);
-	m_fgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_fgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64);
-	m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_bgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64);
+	m_fgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_fgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::scan_cols),this), 16, 16, 64, 64);
+	m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_bgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::scan_cols),this), 16, 16, 64, 64);
 
 	m_charmap->set_transparent_pen(0);
 	m_fgmap->set_transparent_pen(0);
@@ -178,7 +180,7 @@ void bwing_state::draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, UINT8
 }
 
 
-UINT32 bwing_state::screen_update_bwing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+UINT32 bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	unsigned flip, x, y, shiftx;
 
diff --git a/src/mame/video/c45.c b/src/mame/video/c45.c
index 9d0995e5b5b..f79cfdb4178 100644
--- a/src/mame/video/c45.c
+++ b/src/mame/video/c45.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************************************************/
 /*
     Land Line Buffer
diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h
index a976d733ec6..2aedc960411 100644
--- a/src/mame/video/c45.h
+++ b/src/mame/video/c45.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __C45_H__
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index 4f1ada04ba9..b0e33cca6a1 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   cabal.c
diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c
index 723090e1de7..aa65b6817e6 100644
--- a/src/mame/video/calomega.c
+++ b/src/mame/video/calomega.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************
 
     +-------------------------------------+
diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c
index b7182c8e841..5c786fe08ff 100644
--- a/src/mame/video/canyon.c
+++ b/src/mame/video/canyon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Canyon Bomber video emulation
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index 5e227ae918b..ce8fc06abd2 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Coors Light Bowling/Bowl-O-Rama hardware
diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c
index a9e60d898b1..919435732d5 100644
--- a/src/mame/video/carjmbre.c
+++ b/src/mame/video/carjmbre.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Car Jamboree
diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c
index 65b8ba08343..88eba8a578b 100644
--- a/src/mame/video/carpolo.c
+++ b/src/mame/video/carpolo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Exidy Car Polo hardware
diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c
index 3a00aa42eb4..7d535f441b9 100644
--- a/src/mame/video/cave.c
+++ b/src/mame/video/cave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Cave Hardware =-
diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c
index f8e3df670fb..bee49309c0d 100644
--- a/src/mame/video/cbasebal.c
+++ b/src/mame/video/cbasebal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/cbasebal.h"
 
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index d1ebea1182f..0a3eff1416c 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Crude Buster Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index 169d02fb973..322c17d983b 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Crystal Castles hardware
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index 768a752911a..c6f8f613d94 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Cinematronics Cosmic Chasm hardware
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index ee3741fafd5..1e9ec2890e9 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index 6f3d234be5b..43ae1f15445 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Centipede hardware
diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c
index cbf94cb3950..da68e0d88f8 100644
--- a/src/mame/video/chaknpop.c
+++ b/src/mame/video/chaknpop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Chack'n Pop (C) 1983 TAITO Corp.
  *  emulate video hardware
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index f941ed409b8..4632a7bac3a 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/resnet.h"
 #include "includes/champbas.h"
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index 3be86c5d9a2..1effb511aa0 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 Change Lanes - Video Hardware
 (C) Taito 1983
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index dff9e56f2b2..0556ed58e50 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
     Universal Cheeky Mouse Driver
     (c)Lee Taylor May 1998, All rights reserved.
diff --git a/src/mame/video/chihiro.c b/src/mame/video/chihiro.c
index 3cc9175d0d7..ede19297dea 100644
--- a/src/mame/video/chihiro.c
+++ b/src/mame/video/chihiro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/poly.h"
 #include "bitmap.h"
diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c
index a588c33b78c..4bb64f2c0ff 100644
--- a/src/mame/video/chqflag.c
+++ b/src/mame/video/chqflag.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c
index 59e73c3fcc6..b4b888fc8f4 100644
--- a/src/mame/video/circus.c
+++ b/src/mame/video/circus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   circus.c video
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 92a9810747c..fe4a61ed5a7 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index ba0d85c364c..23a08934a88 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Jaleco Driving Games =-
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index d3d906f8d75..a65f4de2144 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 42f48acab70..2d78de0672a 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cloak & Dagger hardware
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index 495a82dcc0f..d6cfed43cc0 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cloud 9 (prototype) hardware
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index d06bf536270..4df2d311ade 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Clash Road =-
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index 91d3d7c9ffa..a3eac10ed17 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Caveman Ninja Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 9b3f17442f6..487b247d084 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index dc0a0970e12..0b99549685c 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c
index 703c0ca67ae..b625a4bb9cf 100644
--- a/src/mame/video/compgolf.c
+++ b/src/mame/video/compgolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
  Competition Golf Final Round
diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c
index d67c79c0350..84496cbd780 100644
--- a/src/mame/video/contra.c
+++ b/src/mame/video/contra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/contra.c
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index c5f86f269bb..059bb84c828 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c
index b14949bd928..389870eb526 100644
--- a/src/mame/video/copsnrob.c
+++ b/src/mame/video/copsnrob.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Cops'n Robbers hardware
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index 4f9d2a01d50..1fdf4ce1f1f 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  cosmic.c
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index f50066f26ed..46f596a1001 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The CPS1 system is made of 3 boards: A, B and C. The first two games also exist
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index bccabafe026..5071e3f4e30 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c
index 16127f2acaf..c2364a638fd 100644
--- a/src/mame/video/crgolf.c
+++ b/src/mame/video/crgolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kitco Crowns Golf hardware
diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c
index 34a1641428b..c951de724c5 100644
--- a/src/mame/video/crimfght.c
+++ b/src/mame/video/crimfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/crimfght.h"
 
diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c
index fd0257c24cd..b638777249f 100644
--- a/src/mame/video/crospang.c
+++ b/src/mame/video/crospang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Cross Pang
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 6b7041914d5..14865a9ac1a 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/crshrace.h"
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 8669a033665..ebea4bb24dd 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video\cvs.c
diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c
index a4bae112cb1..55ed2b381e6 100644
--- a/src/mame/video/darius.c
+++ b/src/mame/video/darius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/darius.h"
 
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index 2a2a44e8aa3..8d36bc99d2f 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/darkmist.h"
 
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index ab8b941da02..7e8396e84bf 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Dark Seal Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index 1b3ef442a93..fec46846ea7 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Desert Assault Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c
index 2296379c706..9d92f21595d 100644
--- a/src/mame/video/dbz.c
+++ b/src/mame/video/dbz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Dragonball Z
   (c) 1993 Banpresto
diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c
index b8ab93404ea..8cac8ab67ce 100644
--- a/src/mame/video/dcheese.c
+++ b/src/mame/video/dcheese.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     HAR MadMax hardware
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index bca9b9dedb1..64431f8fb90 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     D-Con video hardware.
diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c
index b8502153bbf..0f63f9ee916 100644
--- a/src/mame/video/dday.c
+++ b/src/mame/video/dday.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index baa69b4a4e5..c3cd4c48f9a 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Video Hardware for some Technos games:
diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c
index 0b5d4aa04b9..64ff46e3dd2 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Video Hardware for Double Dragon 3
diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c
index ab9a5beb5b6..9504a3a87bf 100644
--- a/src/mame/video/ddribble.c
+++ b/src/mame/video/ddribble.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index f1f9360798d..11c6748ba21 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/deadang.h"
 
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 31039803277..fe62173d515 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Dec0 Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 4d0bd1e80f4..41cdef3c116 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Cobra Command:
diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c
index 9d88d4145f4..f4cbe11ad24 100644
--- a/src/mame/video/decbac06.c
+++ b/src/mame/video/decbac06.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Deco BAC06 tilemap generator:
 
diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h
index e8bb6c644fc..cb997e39b14 100644
--- a/src/mame/video/decbac06.h
+++ b/src/mame/video/decbac06.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* BAC06 */
 
 
diff --git a/src/mame/video/deckarn.c b/src/mame/video/deckarn.c
index 6d3e4383688..eeec25fc4cd 100644
--- a/src/mame/video/deckarn.c
+++ b/src/mame/video/deckarn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Data East 'Karnov style' sprites */
 /* Custom Chip ??? */
 
diff --git a/src/mame/video/deckarn.h b/src/mame/video/deckarn.h
index 893b6b70894..22872cecd6a 100644
--- a/src/mame/video/deckarn.h
+++ b/src/mame/video/deckarn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class deco_karnovsprites_device : public device_t
diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c
index e8c7a5972a8..dd40739b749 100644
--- a/src/mame/video/decmxc06.c
+++ b/src/mame/video/decmxc06.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  Deco MXC06 sprite generator:
 
diff --git a/src/mame/video/decmxc06.h b/src/mame/video/decmxc06.h
index 114ffd865d6..ce724b8880f 100644
--- a/src/mame/video/decmxc06.h
+++ b/src/mame/video/decmxc06.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* MXC06 */
 
 
diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c
index def8f6fdfbc..31ceba5da3b 100644
--- a/src/mame/video/deco16ic.c
+++ b/src/mame/video/deco16ic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************************
 
      deco16ic.c
diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h
index 115d429d366..17d5c7dc1f9 100644
--- a/src/mame/video/deco16ic.h
+++ b/src/mame/video/deco16ic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     deco16ic.h
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 6e3393d09e1..eafbda4cbfd 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/deco32.h"
 
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index 21685ed920f..cb45df3f151 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     The MLC graphics hardware is quite complicated - the usual method of having 'object ram' that
     controls sprites is expanded into object ram that controls sprite blocks that may be stored
diff --git a/src/mame/video/deco_zoomspr.c b/src/mame/video/deco_zoomspr.c
index 440a9c39984..99ae59bedc6 100644
--- a/src/mame/video/deco_zoomspr.c
+++ b/src/mame/video/deco_zoomspr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* the sprites used by DragonGun + Lock 'n' Loaded */
 
diff --git a/src/mame/video/deco_zoomspr.h b/src/mame/video/deco_zoomspr.h
index caf8a03f9c9..11f0e037c6d 100644
--- a/src/mame/video/deco_zoomspr.h
+++ b/src/mame/video/deco_zoomspr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class deco_zoomspr_device : public device_t
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index e01b7e99000..c596e43f99d 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     DECO Cassette System video
diff --git a/src/mame/video/decocomn.c b/src/mame/video/decocomn.c
index 425a6b923a5..bd88df2bc1b 100644
--- a/src/mame/video/decocomn.c
+++ b/src/mame/video/decocomn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Common DECO video functions (general, not sorted by IC) */
 /* I think most of this stuff is driver specific and really shouldn't be in a device at all.
    It was only put here because I wanted to split deco_tilegen1 to just be the device for the
diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h
index aa614b05e39..d65306fec3a 100644
--- a/src/mame/video/decocomn.h
+++ b/src/mame/video/decocomn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     decocomn.h
diff --git a/src/mame/video/decodmd1.c b/src/mame/video/decodmd1.c
index 8ceaf478b1b..7c630ea7500 100644
--- a/src/mame/video/decodmd1.c
+++ b/src/mame/video/decodmd1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *   Data East Pinball Dot Matrix Display
  *
diff --git a/src/mame/video/decodmd1.h b/src/mame/video/decodmd1.h
index 16b73737ebc..07c5badb155 100644
--- a/src/mame/video/decodmd1.h
+++ b/src/mame/video/decodmd1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Data East Pinball DMD Type 1 display
  */
diff --git a/src/mame/video/decodmd2.c b/src/mame/video/decodmd2.c
index b10eaf52229..4f4f864edc7 100644
--- a/src/mame/video/decodmd2.c
+++ b/src/mame/video/decodmd2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *   Data East Pinball Dot Matrix Display
  *
diff --git a/src/mame/video/decodmd2.h b/src/mame/video/decodmd2.h
index 9855fa3041d..083c94006e0 100644
--- a/src/mame/video/decodmd2.h
+++ b/src/mame/video/decodmd2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Data East Pinball DMD Type 2 Display
  */
diff --git a/src/mame/video/decodmd3.c b/src/mame/video/decodmd3.c
index b4133ae8da3..581b0dffa55 100644
--- a/src/mame/video/decodmd3.c
+++ b/src/mame/video/decodmd3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Data East Pinball / Sega Pinball Dot Matrix Display
  *
diff --git a/src/mame/video/decodmd3.h b/src/mame/video/decodmd3.h
index e2085c2a2ab..6133f6392f7 100644
--- a/src/mame/video/decodmd3.h
+++ b/src/mame/video/decodmd3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Data East Pinball DMD Type 3 Display
  */
diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c
index 348a6385e36..4cc9e30496e 100644
--- a/src/mame/video/decospr.c
+++ b/src/mame/video/decospr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Data East Sprite Chip
    DECO 52
 
diff --git a/src/mame/video/decospr.h b/src/mame/video/decospr.h
index 1725320cd12..d250b193a4e 100644
--- a/src/mame/video/decospr.h
+++ b/src/mame/video/decospr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 typedef device_delegate<UINT16 (UINT16 pri)> decospr_pri_cb_delegate;
 typedef device_delegate<UINT16 (UINT16 col)> decospr_col_cb_delegate;
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index d430a9427c2..a5fa8a6a414 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/deniam.h"
 
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index 150672b6e00..02ea0c4bbad 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/dietgo.h"
 
diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c
index 86e4c4a94f8..c9e6ce88b47 100644
--- a/src/mame/video/digdug.c
+++ b/src/mame/video/digdug.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/galaga.h"
 
diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c
index 10da431a411..f7e286b3f85 100644
--- a/src/mame/video/djboy.c
+++ b/src/mame/video/djboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**
  * @file video/djboy.c
  *
diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c
index a4fd44782ac..c18ad6ba676 100644
--- a/src/mame/video/djmain.c
+++ b/src/mame/video/djmain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Beatmania DJ Main Board (GX753)
  *  emulate video hardware
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 88b68619bc3..08e57f74e73 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index db79f4e8f3f..a8528418ec3 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Mr. Do's Castle hardware
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 5fcf050b694..beeae83526f 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/dogfgt.h"
 
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 988eea425fa..1b468f2b125 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/dooyong.h"
 
diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c
index ada420b9385..4f585eab689 100644
--- a/src/mame/video/dragrace.c
+++ b/src/mame/video/dragrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Drag Race video emulation
diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c
index 5d2a07d2729..67416a93539 100644
--- a/src/mame/video/drgnmst.c
+++ b/src/mame/video/drgnmst.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // remaining gfx glitches
 
 // layer priority register not fully understood
diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c
index 49d0f83b14b..a8b16216ce0 100644
--- a/src/mame/video/drmicro.c
+++ b/src/mame/video/drmicro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 Dr. Micro (c) 1983 Sanritsu
diff --git a/src/mame/video/dvi.c b/src/mame/video/dvi.c
index 25461248925..5dea8f30739 100644
--- a/src/mame/video/dvi.c
+++ b/src/mame/video/dvi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 // This just attempts to parse some of the header structures in the DVI data Dragon Gun uses...
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index f588a436d2c..e899b784eb9 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     The CPU controls a video blitter that can read data from the ROMs
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index ba71a858dd8..65253975150 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/dynduke.h"
 
diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c
index 3dad1367816..c0a970b3248 100644
--- a/src/mame/video/eolith.c
+++ b/src/mame/video/eolith.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/eolith.h"
 
diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c
index f4fbced856b..1dad9435cb1 100644
--- a/src/mame/video/epos.c
+++ b/src/mame/video/epos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Epos games
diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c
index fce52152da5..a73ebf5d82a 100644
--- a/src/mame/video/eprom.c
+++ b/src/mame/video/eprom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Escape hardware
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index f15a3972dc6..43e2ad61630 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/equites.h"
 
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index 60f8f65a027..a5de074ee85 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= ESD 16 Bit Games =-
diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c
index 7c68b9125b0..bc2690a4046 100644
--- a/src/mame/video/espial.c
+++ b/src/mame/video/espial.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/esripsys.c b/src/mame/video/esripsys.c
index c3f816427ac..965ea6bb65e 100644
--- a/src/mame/video/esripsys.c
+++ b/src/mame/video/esripsys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Entertainment Sciences Real-Time Image Processor (RIP) video hardware
diff --git a/src/mame/video/excellent_spr.c b/src/mame/video/excellent_spr.c
index 62829200f75..6d807ad8ed7 100644
--- a/src/mame/video/excellent_spr.c
+++ b/src/mame/video/excellent_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Excellent Systems Sprite chip
 
diff --git a/src/mame/video/excellent_spr.h b/src/mame/video/excellent_spr.h
index ec4d5e65d04..458f23f8344 100644
--- a/src/mame/video/excellent_spr.h
+++ b/src/mame/video/excellent_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class excellent_spr_device : public device_t,
 						public device_video_interface
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 15f4a6378dd..fd1c1daaadf 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index 3a59cfcf9da..518ae99a257 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/exprraid.h"
 
diff --git a/src/mame/video/exterm.c b/src/mame/video/exterm.c
index 740427758b0..7a9a2d8b563 100644
--- a/src/mame/video/exterm.c
+++ b/src/mame/video/exterm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gottlieb Exterminator hardware
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index c1cb706014b..ac09fb70da4 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index 0ca9a996317..8ed96d762a1 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/f1gp.h"
diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c
index 353a9081dcb..a3df7b16d0a 100644
--- a/src/mame/video/fantland.c
+++ b/src/mame/video/fantland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************
 
                       -= Electronic Devices / International Games =-
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 3909970fc5c..37c007aef51 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c
index eef377e6929..dc591b06653 100644
--- a/src/mame/video/fastlane.c
+++ b/src/mame/video/fastlane.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/fastlane.h"
 
diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c
index 1625b6fdfa3..5289ea3a4e5 100644
--- a/src/mame/video/fcombat.c
+++ b/src/mame/video/fcombat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Jaleco fcombat
diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c
index 59dc52cf034..5a935481bb6 100644
--- a/src/mame/video/fgoal.c
+++ b/src/mame/video/fgoal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Field Goal video emulation
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index 1e08ccc6ef8..094247da863 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Konami Finalizer
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index 8995e857b22..20e468f338e 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c
index fe7b4630494..6bb346664bf 100644
--- a/src/mame/video/firetrk.c
+++ b/src/mame/video/firetrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Fire Truck + Super Bug + Monte Carlo video emulation
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index dbaff995e27..063e41b790e 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Fit of Fighting Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index f1fdf4bf64f..0e1b89b7b1e 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index 8b5e22931f5..2ab0646ebbe 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Flower Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 9a14c68c4c6..0b0f893d2eb 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index 497d1e3dc88..d91142fdab1 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Free Kick Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c
index b20a82a7dfb..493227fe3fe 100644
--- a/src/mame/video/fromanc2.c
+++ b/src/mame/video/fromanc2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Video System Mahjong series.
diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c
index fd21c82d850..76634316fa5 100644
--- a/src/mame/video/fromance.c
+++ b/src/mame/video/fromance.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Video System Mahjong series and Pipe Dream.
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index 7994550c2af..c9dc3bcc856 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index 6444faa1b8a..cdea66bad3a 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Funky Jet Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c
index ad0bfd6e266..c00dbc0a56a 100644
--- a/src/mame/video/funworld.c
+++ b/src/mame/video/funworld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
   Fun World / Amatic / TAB / Impera.
diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c
index f1a572965aa..465e85bf1d1 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Funny Bubble Video hardware
 
 todo - convert to tilemap
diff --git a/src/mame/video/fuukifg.c b/src/mame/video/fuukifg.c
index eeb0ee29454..42e787f7b4f 100644
--- a/src/mame/video/fuukifg.c
+++ b/src/mame/video/fuukifg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 */
 
diff --git a/src/mame/video/fuukifg.h b/src/mame/video/fuukifg.h
index 8db1c87353c..0a72948e8be 100644
--- a/src/mame/video/fuukifg.h
+++ b/src/mame/video/fuukifg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index 13843dbe941..0b0934234b2 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Fuuki 16 Bit Games (FG-2) =-
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index d993614ca9f..51a198616fa 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Fuuki 32 Bit Games (FG-3) =-
diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c
index d423e556009..26676f83a70 100644
--- a/src/mame/video/gaelco.c
+++ b/src/mame/video/gaelco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Gaelco Type 1 Video Hardware
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index 51f0926d524..0a0dbe717fd 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Gaelco Type CG-1V/GAE1 Video Hardware
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index 3988d4d336a..c45a16a12cf 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Ninja Gaiden / Tecmo Knights Video Hardware
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index 9cb5e22b7e5..c99a8073ef6 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c
index 898c60384bb..47ac87db7e7 100644
--- a/src/mame/video/galastrm.c
+++ b/src/mame/video/galastrm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/polylgcy.h"
 #include "includes/galastrm.h"
diff --git a/src/mame/video/galaxia.c b/src/mame/video/galaxia.c
index 0b2b965344f..c871d93f165 100644
--- a/src/mame/video/galaxia.c
+++ b/src/mame/video/galaxia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Galaxia Video HW
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index e9ae486b0dd..1b61e932c3f 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Galaxian hardware family
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 34e3dadeaaf..d447a6a11aa 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c
index ff20852e088..7c08ff35c73 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Gal's Panic II =-
diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c
index db25b5e3018..f13c4f04886 100644
--- a/src/mame/video/galpanic.c
+++ b/src/mame/video/galpanic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "kan_pand.h"
 #include "includes/galpanic.h"
diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c
index 38180756e5a..647137c3cfb 100644
--- a/src/mame/video/galspnbl.c
+++ b/src/mame/video/galspnbl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/galspnbl.h"
 
diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c
index 8d6ced67def..1056ffab291 100644
--- a/src/mame/video/gameplan.c
+++ b/src/mame/video/gameplan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 GAME PLAN driver
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 924c71ab25f..2cec5e6533c 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c
index b0d7d34b2e0..c160e3e42ed 100644
--- a/src/mame/video/gatron.c
+++ b/src/mame/video/gatron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     GAME-A-TRON gambling hardware
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index c10b7c9a952..8760081247e 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gberet.h"
 
diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c
index 3f8cdbf10ba..3254b8d2976 100644
--- a/src/mame/video/gcpinbal.c
+++ b/src/mame/video/gcpinbal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gcpinbal.h"
 
diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c
index 7d80886a834..bcd51252d8d 100644
--- a/src/mame/video/gijoe.c
+++ b/src/mame/video/gijoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gijoe.h"
 
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index 03140207ad6..6968a37bd80 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
                             Ginga NinkyouDen
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index 519f06b19d6..14b38661ff4 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Video Hardware description for Taito Gladiator
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index 0051d08e0d8..3aa8370d97e 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Glass Video Hardware
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index b0b81f3b09e..01525b803b4 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index c1353cc6216..26b9120cf66 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Goal '92 video hardware
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index fc61646b9dd..464154d1833 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Goindol
 
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index cd884264080..0a08249f847 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c
index 626f8879d77..a42853c1bd4 100644
--- a/src/mame/video/gomoku.c
+++ b/src/mame/video/gomoku.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Gomoku Narabe Renju
diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c
index 0913948e783..b25847568e1 100644
--- a/src/mame/video/gotcha.c
+++ b/src/mame/video/gotcha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gotcha.h"
 
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index 63c41d75c47..f7a20f6f214 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Gottlieb hardware
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 6e5b1504e12..a8741744f3d 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/resnet.h"
 #include "includes/gotya.h"
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index bdf509d6517..e0af85cb684 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* GP9001 Video Controller */
 
 /***************************************************************************
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index 35f80bf612d..b8140152b96 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* GP9001 Video Controller */
 
 struct gp9001layeroffsets
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index d622b2b1293..33bae4d1621 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gradius3.h"
 
diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c
index 7d35d15bb65..5f74e9532e8 100644
--- a/src/mame/video/grchamp.c
+++ b/src/mame/video/grchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Video hardware for Taito Grand Champion */
 
 /* updated by Hans Andersson, dec 2005     */
diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c
index 40aab889cdf..8c7932e9b35 100644
--- a/src/mame/video/groundfx.c
+++ b/src/mame/video/groundfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/groundfx.h"
 
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index 7a8faddf2fd..26f6bc5d1bc 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gstriker.h"
 
diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c
index 74019bcc8ae..31bff7f61ca 100644
--- a/src/mame/video/gsword.c
+++ b/src/mame/video/gsword.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Great Swordsman
 
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index fc261fa3519..59027e594af 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     Atari 400/800
diff --git a/src/mame/video/gtia.h b/src/mame/video/gtia.h
index 26455895028..146f1533511 100644
--- a/src/mame/video/gtia.h
+++ b/src/mame/video/gtia.h
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     Atari 400/800
diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c
index ce9a858b353..b2f5dd6a9fb 100644
--- a/src/mame/video/gumbo.c
+++ b/src/mame/video/gumbo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Gumbo video */
 
 #include "emu.h"
diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c
index a0aebbf25a3..87b13e6c0d6 100644
--- a/src/mame/video/gunbustr.c
+++ b/src/mame/video/gunbustr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gunbustr.h"
 
diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c
index 9b6d66cd639..b3032cdc52d 100644
--- a/src/mame/video/gundealr.c
+++ b/src/mame/video/gundealr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index d9d1ac2d897..b71d536290a 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/gunsmoke.h"
 
diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c
index c4c32bca275..d4a3e6d2fd8 100644
--- a/src/mame/video/gyruss.c
+++ b/src/mame/video/gyruss.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c
index 3c31eaf4c83..9eddbbdd635 100644
--- a/src/mame/video/hanaawas.c
+++ b/src/mame/video/hanaawas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c
index a25929fe48d..1569b06d06a 100644
--- a/src/mame/video/hcastle.c
+++ b/src/mame/video/hcastle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Haunted Castle video emulation
diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c
index 0e9be7c63d8..7a81e2241c3 100644
--- a/src/mame/video/hexion.c
+++ b/src/mame/video/hexion.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/hexion.h"
 
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index acf13a7646a..bd5045ad088 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/higemaru.h"
 
diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c
index 14f8591e405..6fe9ea49529 100644
--- a/src/mame/video/himesiki.c
+++ b/src/mame/video/himesiki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Himeshikibu (C) 1989 Hi-Soft
diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c
index 869ae57fe8b..0cd9d16460f 100644
--- a/src/mame/video/hnayayoi.c
+++ b/src/mame/video/hnayayoi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 First version of the Dynax blitter.
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 0a93b093cf6..eb992c93ced 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "drawgfxm.h"
 #include "includes/hng64.h"
diff --git a/src/mame/video/hng64_3d.c b/src/mame/video/hng64_3d.c
index 56c66cbe5c0..25e43f5707b 100644
--- a/src/mame/video/hng64_3d.c
+++ b/src/mame/video/hng64_3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Hyper NeoGeo 64 - 3D bits */
 
 // todo, use poly.c
diff --git a/src/mame/video/hng64_sprite.c b/src/mame/video/hng64_sprite.c
index 39827c4c79e..0e709779018 100644
--- a/src/mame/video/hng64_sprite.c
+++ b/src/mame/video/hng64_sprite.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Hyper NeoGeo 64 Sprite bits */
 
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index 2c8bd92ff5c..6f637866d1b 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 87b5a7a20e5..ee248ddd3e5 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "includes/homedata.h"
diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c
index 220276c0679..afe367c2c24 100644
--- a/src/mame/video/homerun.c
+++ b/src/mame/video/homerun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Jaleco Moero Pro Yakyuu Homerun hardware
diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c
index c189e204909..e41d7521460 100644
--- a/src/mame/video/hyhoo.c
+++ b/src/mame/video/hyhoo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index b7629744c59..16246a4ede5 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index d1a30a98d0b..9bf602a2a23 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* based on driver from video/metro.c by Luca Elia */
 /* modified by Hau */
diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c
index 222be4eb5e2..2f135123085 100644
--- a/src/mame/video/ikki.c
+++ b/src/mame/video/ikki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Ikki (c) 1985 Sun Electronics
diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c
index d247324d7ed..9e744bc5f3b 100644
--- a/src/mame/video/inufuku.c
+++ b/src/mame/video/inufuku.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Video System Games.
diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c
index b4950297a8c..b7f832ca865 100644
--- a/src/mame/video/iqblock.c
+++ b/src/mame/video/iqblock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/iqblock.h"
 
diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c
index f68234f6768..5599c8821a6 100644
--- a/src/mame/video/irobot.c
+++ b/src/mame/video/irobot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari I, Robot hardware
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index db5fab14e43..b33f873cfb8 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   ironhors.c
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index 0f5a6713df4..3423d597649 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video/jack.c
diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c
index 891a8cba51a..4a7d53c65ee 100644
--- a/src/mame/video/jackal.c
+++ b/src/mame/video/jackal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 80b78a3e16d..6db963ca4c4 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/jailbrek.h"
 
diff --git a/src/mame/video/jalblend.c b/src/mame/video/jalblend.c
index 1d96bc6dbbe..33a337c059c 100644
--- a/src/mame/video/jalblend.c
+++ b/src/mame/video/jalblend.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Jaleco color blend emulation
diff --git a/src/mame/video/jalblend.h b/src/mame/video/jalblend.h
index f382d63ac9c..238064244fa 100644
--- a/src/mame/video/jalblend.h
+++ b/src/mame/video/jalblend.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 class jaleco_blend_device : public device_t
 {
 public:
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index a2a5bde2217..f9345242dc9 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Return of the Jedi hardware
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index e871614d5f4..7ff75cc3c1e 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     JPM IMPACT with Video hardware
diff --git a/src/mame/video/k001005.c b/src/mame/video/k001005.c
index 13581b4f19a..0c713a23795 100644
--- a/src/mame/video/k001005.c
+++ b/src/mame/video/k001005.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "k001005.h"
 
diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h
index 160660f1769..0d8f6c4a035 100644
--- a/src/mame/video/k001005.h
+++ b/src/mame/video/k001005.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K001005_H__
 #define __K001005_H__
diff --git a/src/mame/video/k001006.c b/src/mame/video/k001006.c
index 566568b3cda..ea0ada52c8d 100644
--- a/src/mame/video/k001006.c
+++ b/src/mame/video/k001006.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "k001006.h"
 
diff --git a/src/mame/video/k001006.h b/src/mame/video/k001006.h
index 07128797da3..030c40942d0 100644
--- a/src/mame/video/k001006.h
+++ b/src/mame/video/k001006.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K001006_H__
 #define __K001006_H__
diff --git a/src/mame/video/k001604.c b/src/mame/video/k001604.c
index adc5f0e2130..413db917b5f 100644
--- a/src/mame/video/k001604.c
+++ b/src/mame/video/k001604.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "k001604.h"
diff --git a/src/mame/video/k001604.h b/src/mame/video/k001604.h
index 910dea0792f..f8fbd7da6f5 100644
--- a/src/mame/video/k001604.h
+++ b/src/mame/video/k001604.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K001604_H__
 #define __K001604_H__
diff --git a/src/mame/video/k007121.c b/src/mame/video/k007121.c
index 950ff5bf0a3..5253beea980 100644
--- a/src/mame/video/k007121.c
+++ b/src/mame/video/k007121.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 007121
 ------
diff --git a/src/mame/video/k007121.h b/src/mame/video/k007121.h
index fa5d14076c3..8fe62c45415 100644
--- a/src/mame/video/k007121.h
+++ b/src/mame/video/k007121.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K007121_H__
 #define __K007121_H__
diff --git a/src/mame/video/k007342.c b/src/mame/video/k007342.c
index 75edbdb9cfc..e332d7ec94c 100644
--- a/src/mame/video/k007342.c
+++ b/src/mame/video/k007342.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 007342
 ------
diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h
index 34bef6e39f1..e947fb0dd44 100644
--- a/src/mame/video/k007342.h
+++ b/src/mame/video/k007342.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K007342_H__
 #define __K007342_H__
diff --git a/src/mame/video/k007420.c b/src/mame/video/k007420.c
index 23d101561c2..b8dc2317ab3 100644
--- a/src/mame/video/k007420.c
+++ b/src/mame/video/k007420.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 007420
 ------
diff --git a/src/mame/video/k007420.h b/src/mame/video/k007420.h
index 417230dec1a..819f5491026 100644
--- a/src/mame/video/k007420.h
+++ b/src/mame/video/k007420.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K007420_H__
 #define __K007420_H__
diff --git a/src/mame/video/k037122.c b/src/mame/video/k037122.c
index c42c8f9b573..ac381a86b67 100644
--- a/src/mame/video/k037122.c
+++ b/src/mame/video/k037122.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 037122
 */
diff --git a/src/mame/video/k037122.h b/src/mame/video/k037122.h
index 8d52ede79e2..2aba06cf2fa 100644
--- a/src/mame/video/k037122.h
+++ b/src/mame/video/k037122.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K037122_H__
 #define __K037122_H__
diff --git a/src/mame/video/k051316.c b/src/mame/video/k051316.c
index 0ee76ec0b1c..4dd6a87c7c8 100644
--- a/src/mame/video/k051316.c
+++ b/src/mame/video/k051316.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 051316 PSAC
 ------
diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h
index dea3e1c3cae..c65c92ef401 100644
--- a/src/mame/video/k051316.h
+++ b/src/mame/video/k051316.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K051316_H__
 #define __K051316_H__
diff --git a/src/mame/video/k051733.c b/src/mame/video/k051733.c
index f4fc07dcd7f..1596b822325 100644
--- a/src/mame/video/k051733.c
+++ b/src/mame/video/k051733.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 051733
 ------
diff --git a/src/mame/video/k051733.h b/src/mame/video/k051733.h
index 218edd3980a..49e3247f813 100644
--- a/src/mame/video/k051733.h
+++ b/src/mame/video/k051733.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K051733_H__
 #define __K051733_H__
diff --git a/src/mame/video/k051960.c b/src/mame/video/k051960.c
index 7d22fc0007c..eacb302694d 100644
--- a/src/mame/video/k051960.c
+++ b/src/mame/video/k051960.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 051960/051937
 -------------
diff --git a/src/mame/video/k051960.h b/src/mame/video/k051960.h
index f768250fef6..9d11e8bb4cf 100644
--- a/src/mame/video/k051960.h
+++ b/src/mame/video/k051960.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K051960_H__
 #define __K051960_H__
diff --git a/src/mame/video/k052109.c b/src/mame/video/k052109.c
index 1a14dba97c2..5f9b4e8f4e9 100644
--- a/src/mame/video/k052109.c
+++ b/src/mame/video/k052109.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 052109/051962
 -------------
diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h
index 6848bfb673d..100e93c13d0 100644
--- a/src/mame/video/k052109.h
+++ b/src/mame/video/k052109.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K052109_H__
 #define __K052109_H__
diff --git a/src/mame/video/k053244_k053245.c b/src/mame/video/k053244_k053245.c
index 349ea25ee54..777e003dbb5 100644
--- a/src/mame/video/k053244_k053245.c
+++ b/src/mame/video/k053244_k053245.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 053245/053244
diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h
index e510cc28701..25ad2a3d513 100644
--- a/src/mame/video/k053244_k053245.h
+++ b/src/mame/video/k053244_k053245.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K053244_K053245_H__
 #define __K053244_K053245_H__
diff --git a/src/mame/video/k053246_k053247_k055673.c b/src/mame/video/k053246_k053247_k055673.c
index 8e6e74436fd..517d60e8ec5 100644
--- a/src/mame/video/k053246_k053247_k055673.c
+++ b/src/mame/video/k053246_k053247_k055673.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************/
 /*                                                                         */
 /*                                 053246                                  */
diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h
index 3183772bc72..f9a1c9d0ac6 100644
--- a/src/mame/video/k053246_k053247_k055673.h
+++ b/src/mame/video/k053246_k053247_k055673.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* */
 
 /* todo: remove code from header, linker starts throwing silly messages when I try due to the templates.. make sense of them */
diff --git a/src/mame/video/k053250.c b/src/mame/video/k053250.c
index a871cd27682..f84f4d1c21f 100644
--- a/src/mame/video/k053250.c
+++ b/src/mame/video/k053250.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "k053250.h"
 
 const device_type K053250 = &device_creator<k053250_device>;
diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h
index eb5a57e0593..c99b99cef0f 100644
--- a/src/mame/video/k053250.h
+++ b/src/mame/video/k053250.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __K053250_H__
 #define __K053250_H__
 
diff --git a/src/mame/video/k053251.c b/src/mame/video/k053251.c
index 6dae3f5f178..84bbd1c9d2d 100644
--- a/src/mame/video/k053251.c
+++ b/src/mame/video/k053251.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Konami 053251
 ------
diff --git a/src/mame/video/k053251.h b/src/mame/video/k053251.h
index fd297425bb3..9b15cf78d87 100644
--- a/src/mame/video/k053251.h
+++ b/src/mame/video/k053251.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K053251_H__
 #define __K053251_H__
diff --git a/src/mame/video/k053936.c b/src/mame/video/k053936.c
index c36165795e1..52b8b96f925 100644
--- a/src/mame/video/k053936.c
+++ b/src/mame/video/k053936.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* */
 
 #include "emu.h"
diff --git a/src/mame/video/k053936.h b/src/mame/video/k053936.h
index 8d7de39b6a7..89ec42cf0e2 100644
--- a/src/mame/video/k053936.h
+++ b/src/mame/video/k053936.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K053936_H__
 #define __K053936_H__
diff --git a/src/mame/video/k054000.c b/src/mame/video/k054000.c
index 333ca62301e..5808ca6eed4 100644
--- a/src/mame/video/k054000.c
+++ b/src/mame/video/k054000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "k054000.h"
diff --git a/src/mame/video/k054000.h b/src/mame/video/k054000.h
index d97c7d66bc9..83f6cc74346 100644
--- a/src/mame/video/k054000.h
+++ b/src/mame/video/k054000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #pragma once
 #ifndef __K054000_H__
diff --git a/src/mame/video/k054156_k054157_k056832.c b/src/mame/video/k054156_k054157_k056832.c
index 1a69fef54e2..42ba587ebdd 100644
--- a/src/mame/video/k054156_k054157_k056832.c
+++ b/src/mame/video/k054156_k054157_k056832.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* this should probably be k054156.c and k054156_device (the base management device) */
 
 /***************************************************************************/
diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h
index e9f2fe231c6..51c5e1485eb 100644
--- a/src/mame/video/k054156_k054157_k056832.h
+++ b/src/mame/video/k054156_k054157_k056832.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K056832_H__
 #define __K056832_H__
diff --git a/src/mame/video/k054338.c b/src/mame/video/k054338.c
index 24666d06ab7..afca8ef6d9a 100644
--- a/src/mame/video/k054338.c
+++ b/src/mame/video/k054338.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "k054338.h"
diff --git a/src/mame/video/k054338.h b/src/mame/video/k054338.h
index 0e332816e45..f255b9e4d18 100644
--- a/src/mame/video/k054338.h
+++ b/src/mame/video/k054338.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 #ifndef __K054338_H__
 #define __K054338_H__
diff --git a/src/mame/video/k055555.c b/src/mame/video/k055555.c
index 85887148199..48a4198bfe0 100644
--- a/src/mame/video/k055555.c
+++ b/src/mame/video/k055555.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************/
 /*                                                                         */
 /*                                 055555                                  */
diff --git a/src/mame/video/k055555.h b/src/mame/video/k055555.h
index b8b10634a7f..c5ddb880462 100644
--- a/src/mame/video/k055555.h
+++ b/src/mame/video/k055555.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* */
 
 #pragma once
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index 3da5b74dbaf..ee9ef470060 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* bootlegs of Kaneko Pandora chip, with modifications */
 
 #include "emu.h"
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index 179cddf13c8..e36707de1db 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     Kaneko Pandora Sprite Chip
diff --git a/src/mame/video/kan_pand.h b/src/mame/video/kan_pand.h
index 1b40c0aba88..2b9e2a94bfd 100644
--- a/src/mame/video/kan_pand.h
+++ b/src/mame/video/kan_pand.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     kan_pand.h
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index b054854286b..3f20060202b 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Kaneko 16 Bit Games =-
diff --git a/src/mame/video/kaneko_grap2.c b/src/mame/video/kaneko_grap2.c
index 2895516b2a8..7bbfff832cb 100644
--- a/src/mame/video/kaneko_grap2.c
+++ b/src/mame/video/kaneko_grap2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko GRAP2, RLE blitter / Framebuffer etc.? */
 
 
diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h
index cb6b6005b42..4254e0f57b1 100644
--- a/src/mame/video/kaneko_grap2.h
+++ b/src/mame/video/kaneko_grap2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/mame/video/kaneko_spr.c b/src/mame/video/kaneko_spr.c
index c4a0a8873be..47a1e9ee1cc 100644
--- a/src/mame/video/kaneko_spr.c
+++ b/src/mame/video/kaneko_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko Sprites */
 
 /*
diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h
index 69b3bc48f20..89bf0cfa54e 100644
--- a/src/mame/video/kaneko_spr.h
+++ b/src/mame/video/kaneko_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Kaneko Sprites */
 
diff --git a/src/mame/video/kaneko_tmap.c b/src/mame/video/kaneko_tmap.c
index b22cfdf2a5a..f65b487aecf 100644
--- a/src/mame/video/kaneko_tmap.c
+++ b/src/mame/video/kaneko_tmap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kaneko View2 Tilemaps */
 
 /*
diff --git a/src/mame/video/kaneko_tmap.h b/src/mame/video/kaneko_tmap.h
index e11e2e829e6..b0adf2a105d 100644
--- a/src/mame/video/kaneko_tmap.h
+++ b/src/mame/video/kaneko_tmap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class kaneko_view2_tilemap_device : public device_t
diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c
index db6e638dcce..af1b14ca2da 100644
--- a/src/mame/video/kangaroo.c
+++ b/src/mame/video/kangaroo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sun Electronics Kangaroo hardware
diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c
index f14b29f995f..3f337e38f69 100644
--- a/src/mame/video/karnov.c
+++ b/src/mame/video/karnov.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Karnov - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index 0d8e9b92df9..930182889aa 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c
index 7e0d6f9c35a..f11630a686e 100644
--- a/src/mame/video/kickgoal.c
+++ b/src/mame/video/kickgoal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Kick Goal - video */
 
 #include "emu.h"
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index f144c3a50c7..ffadbe5f77c 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/resnet.h"
 #include "includes/kingobox.h"
diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c
index 1a1140e2799..f16e306e969 100644
--- a/src/mame/video/kncljoe.c
+++ b/src/mame/video/kncljoe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Knuckle Joe - (c) 1985 Taito Corporation
diff --git a/src/mame/video/konami_helper.c b/src/mame/video/konami_helper.c
index 0afd63d0abc..7868a907348 100644
--- a/src/mame/video/konami_helper.c
+++ b/src/mame/video/konami_helper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Konami Video Helper functions */
 
 #include "emu.h"
diff --git a/src/mame/video/konami_helper.h b/src/mame/video/konami_helper.h
index 15e80709038..28fdb2470fb 100644
--- a/src/mame/video/konami_helper.h
+++ b/src/mame/video/konami_helper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Konami video helper functions */
 
 #pragma once
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 7ebc6b52831..2f0b595d99c 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * video/konamigx.c - Konami GX video hardware (here there be dragons, and achocode)
  *
diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c
index 5c358654f48..f7771b7be21 100644
--- a/src/mame/video/kopunch.c
+++ b/src/mame/video/kopunch.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Sega KO Punch
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index 75efb07e63c..1e60d5f22ea 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/ksayakyu.h"
 
diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c
index bb053a987db..65a1d58ec64 100644
--- a/src/mame/video/kyugo.c
+++ b/src/mame/video/kyugo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Kyugo hardware games
diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c
index 8805a993e26..42b930f9b5d 100644
--- a/src/mame/video/labyrunr.c
+++ b/src/mame/video/labyrunr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/labyrunr.h"
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index e74320435b3..9aebac95915 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index 6b2f4505ca6..712bf7e1aa9 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 2f61d6bc873..c2b294aa8c7 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Lasso and similar hardware
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 5cc6b4b9dd4..f0644f0cd3c 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c
index f3a2f1e816c..4f2867816e2 100644
--- a/src/mame/video/lazercmd.c
+++ b/src/mame/video/lazercmd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************/
 /*                                                           */
 /* Lazer Command video handler                               */
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 60bdc8c2fee..fecce166fa3 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Legionnaire / Heated Barrel video hardware (derived from D-Con)
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index a10abca6809..c80605478be 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Lemmings video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index 73b7565c94c..3303ca91e90 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Lethal Enforcers
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index c6827b4831d..3bed78241b8 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Todo:
diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c
index f1a3730b2d8..182781c49b0 100644
--- a/src/mame/video/liberatr.c
+++ b/src/mame/video/liberatr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/liberatr.c
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index f935efdc5a1..df6d0633c08 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/lkage.c
diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c
index 270ba35cedd..8ae4f98ff71 100644
--- a/src/mame/video/lockon.c
+++ b/src/mame/video/lockon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Lock-On video hardware
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index 48b8d292abd..fc669e9441b 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************************
 
                                                 -= IGS Lord Of Gun =-
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index 4af72995986..939412cb1d6 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/lsasquad.h"
 
diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c
index fda74ffb0e9..b63c5304d3d 100644
--- a/src/mame/video/lucky74.c
+++ b/src/mame/video/lucky74.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
 
     LUCKY 74 - WING CO.,LTD.
diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c
index 38aeeda664e..7c0abd81b45 100644
--- a/src/mame/video/lvcards.c
+++ b/src/mame/video/lvcards.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index a32131d5e58..8dda51388e3 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c
index 45cc543cbd2..8179dacf43a 100644
--- a/src/mame/video/m10.c
+++ b/src/mame/video/m10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index 20d25581e0a..50dc0895ded 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Irem M107 video hardware, Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index ae332ab8835..5785830724e 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M52 hardware
diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c
index aa8ee80b5a3..4c3927dd832 100644
--- a/src/mame/video/m57.c
+++ b/src/mame/video/m57.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Irem M57 hardware
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 6f7dd9c03be..99388b994ed 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem M58 hardware
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index 7b906b1a204..50a8cee8b09 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Video Hardware for Irem Games:
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index b941da0d847..3fb0a67a944 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/m72.h"
 
diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c
index 49c6cab0442..80a071e05dc 100644
--- a/src/mame/video/m90.c
+++ b/src/mame/video/m90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Irem M90 system.  There is 1 video chip - NANAO GA-25, it produces
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index 63c5a97bdf4..67603fd1175 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Irem M92 video hardware, Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index 9ee66f2d603..b9c258af324 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/macrossp.c */
 
 #include "emu.h"
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index 05e8d6245f3..776c74dfd2d 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mad Alien (c) 1980 Data East Corporation
diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c
index 4ccddccbb80..df178b2b646 100644
--- a/src/mame/video/madmotor.c
+++ b/src/mame/video/madmotor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Mad Motor video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c
index 9772096fd49..978733aeb16 100644
--- a/src/mame/video/magmax.c
+++ b/src/mame/video/magmax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Video Hardware for MAGMAX.
diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c
index 241ca45bba3..7bf0f10b4e6 100644
--- a/src/mame/video/mainevt.c
+++ b/src/mame/video/mainevt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index 848e616d39b..83f9f750708 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/mainsnk.h"
 
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index 0bf6f632552..386fdafdfca 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
   Malzak
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index 87b2e2fdf43..2ed8e2c9981 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/resnet.h"
 #include "includes/mappy.h"
diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c
index 3737d107f78..0a8abfdd089 100644
--- a/src/mame/video/marineb.c
+++ b/src/mame/video/marineb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index 53f154e3075..b55e4463977 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c
index 85b443044d3..4a56561c66f 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Markham (c) 1983 Sun Electronics
diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c
index 24b0b42a231..0941f299561 100644
--- a/src/mame/video/matmania.c
+++ b/src/mame/video/matmania.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video.c
diff --git a/src/mame/video/mb60553.c b/src/mame/video/mb60553.c
index 7d58a8d1e6f..eff6125a091 100644
--- a/src/mame/video/mb60553.c
+++ b/src/mame/video/mb60553.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* This is the tilemap chip used by Grand Striker, Tecmo World Cup '94 and V Goal Soccer for the backgrounds
 
   the actual line scroll / zoom is not properly understood
diff --git a/src/mame/video/mb60553.h b/src/mame/video/mb60553.h
index 90f48f0f88a..840c8ead500 100644
--- a/src/mame/video/mb60553.h
+++ b/src/mame/video/mb60553.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*** MB60553 **********************************************/
 
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index 4e6a7f82228..2596c8b0f33 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Magical Cat Adventure / Nostradamus Video Hardware */
 
 /*
diff --git a/src/mame/video/mcd212.c b/src/mame/video/mcd212.c
index 155a3e4cceb..ee9bfea88c2 100644
--- a/src/mame/video/mcd212.c
+++ b/src/mame/video/mcd212.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h
index 1716136fba7..8800d0639d8 100644
--- a/src/mame/video/mcd212.h
+++ b/src/mame/video/mcd212.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c
index 44eaa6ac488..e8506bddeb9 100644
--- a/src/mame/video/meadows.c
+++ b/src/mame/video/meadows.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Meadows S2650 driver
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index 3a5e22008cb..2e7ee0430a8 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Jaleco Mega System 1 =-
diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c
index dbe5a518e4f..2d1004ee0af 100644
--- a/src/mame/video/megazone.c
+++ b/src/mame/video/megazone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index eaa8188d9b5..ccde4f21561 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/mermaid.h"
 
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index 570e2c0b5fa..ec77c3ebf73 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Metal Clash =-
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 01fa17106e0..08e626f5778 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Metro Games =-
diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c
index 83b440f44b0..607f6fca44a 100644
--- a/src/mame/video/mexico86.c
+++ b/src/mame/video/mexico86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/mexico86.h"
 
diff --git a/src/mame/video/micro3d.c b/src/mame/video/micro3d.c
index a3c6676d13e..66a6829849d 100644
--- a/src/mame/video/micro3d.c
+++ b/src/mame/video/micro3d.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Microprose Games 3D hardware
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index d3ed15d1b53..9e23afa072a 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Driver for Midway T-unit games.
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index f1205326158..82359a5cf30 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Williams/Midway Y/Z-unit system
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index f1066c8cd0d..d31711d940f 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index cc167a9099d..f33e9ae586b 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Pang Video Hardware
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 87a4e15640b..fc534b8a03d 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/mjkjidai.h"
 
diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c
index 3caeea4efaf..61875e2b5bb 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/segaic24.h"
 #include "cpu/mb86233/mb86233.h"
diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c
index 43d9fefcc12..f38f0c77ac1 100644
--- a/src/mame/video/model2.c
+++ b/src/mame/video/model2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************************************************************************
 
     Sega Model 2 Geometry Engine and 3D Rasterizer Emulation
diff --git a/src/mame/video/model2rd.inc b/src/mame/video/model2rd.inc
index 2e65dcf2bd0..a2696326bb5 100644
--- a/src/mame/video/model2rd.inc
+++ b/src/mame/video/model2rd.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
     Sega Model 2 3D rasterization functions
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index fe63211117b..9ab2c333a90 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/poly.h"
 #include "video/rgbutil.h"
diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c
index cb4ae935619..60d216894e6 100644
--- a/src/mame/video/momoko.c
+++ b/src/mame/video/momoko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Momoko 120% (c) 1986 Jaleco
diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c
index 64733b1f7fe..b488c8e68d0 100644
--- a/src/mame/video/moo.c
+++ b/src/mame/video/moo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Wild West C.O.W.boys of Moo Mesa
diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c
index 7f1f64ba62f..af6d2f3007a 100644
--- a/src/mame/video/mosaic.c
+++ b/src/mame/video/mosaic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   mosaic.c
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index df60d550fb3..7f852b156a9 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
      Mouser - Video Hardware:
diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c
index e783b097f7c..96dad7e6fcb 100644
--- a/src/mame/video/mrdo.c
+++ b/src/mame/video/mrdo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c
index bff9170ff4f..226efff9bbb 100644
--- a/src/mame/video/mrflea.c
+++ b/src/mame/video/mrflea.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************
 
 Mr. F. Lea
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index d9458f39789..85a80b1b534 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index 11a8f101be4..2336a65942a 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Jaleco MegaSystem 32 Video Hardware */
 
 /* The Video Hardware is Similar to the Non-MS32 Version of Tetris Plus 2 */
diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c
index 325de1f0e43..dbda013f09c 100644
--- a/src/mame/video/msisaac.c
+++ b/src/mame/video/msisaac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 *   Video Driver for Metal Soldier Isaac II (1985)
 */
diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c
index 1388423ab0f..c2a4c15652b 100644
--- a/src/mame/video/mugsmash.c
+++ b/src/mame/video/mugsmash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/mugsmash.c - see drivers/mugsmash.c for more info */
 
 #include "emu.h"
diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c
index e3cb071b0ea..f3b9b10b2b6 100644
--- a/src/mame/video/munchmo.c
+++ b/src/mame/video/munchmo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/munchmo.h"
 
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index 7519dfc2b68..72438f37ba5 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mustache Boy
diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c
index 753ea7d4e5b..68a710b5a3e 100644
--- a/src/mame/video/mw8080bw.c
+++ b/src/mame/video/mw8080bw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Midway 8080-based black and white hardware
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index 67e4315bdbd..c5b6715f609 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Technos Mysterious Stones hardware
diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c
index 61c83448070..a2629199cd1 100644
--- a/src/mame/video/mystwarr.c
+++ b/src/mame/video/mystwarr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define MW_VERBOSE 0
 
 /*
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index 8a8373ffc59..d7048afb653 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/n64.h b/src/mame/video/n64.h
index 40529c0c8c5..a675d059944 100644
--- a/src/mame/video/n64.h
+++ b/src/mame/video/n64.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _VIDEO_N64_H_
 #define _VIDEO_N64_H_
 
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index 3de9de38420..09f53df689e 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Nintendo 8080 video emulation
diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c
index 88ef8559665..86883d5e4c0 100644
--- a/src/mame/video/namcofl.c
+++ b/src/mame/video/namcofl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/namcofl.c */
 
 #include "emu.h"
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 5521518cd40..c029db0fc6f 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  Namco System NA1/2 Video Hardware */
 
 /*
diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c
index 5fcd1eb2277..b651263dde2 100644
--- a/src/mame/video/namconb1.c
+++ b/src/mame/video/namconb1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/namconb1.c */
 
 #include "emu.h"
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index 423c6521437..ef3628ffba2 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 Namco System 1 Video Hardware
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index 3116893bf73..aaff655eedf 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video hardware for Namco System II */
 
 #include "emu.h"
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index eee5322f738..5979e8dec62 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Namco System 21 Video Hardware
 
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index dd0f426ed4e..115962951a2 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**
  * video hardware for Namco System22
  *
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index a181895433f..a8785ed13d4 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************
 
 Namco System 86 Video Hardware
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 508a93241e7..007444a6df2 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index a37d5b66314..b93c5581cc4 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index de017360c05..4b65ebb56e5 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index 59a30022dfc..2907011fd0c 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index 17dc1fe7ba3..e48f6dc02db 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 717d2ba063a..246f1101d2e 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index e32665691e7..bd6ed2e037e 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index fa7b028b376..3ea87199e08 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Neo-Geo hardware
diff --git a/src/mame/video/neogeo_spr.c b/src/mame/video/neogeo_spr.c
index 6b0eddf6ca9..629c34f0c63 100644
--- a/src/mame/video/neogeo_spr.c
+++ b/src/mame/video/neogeo_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* NeoGeo sprites (and fixed text layer) */
 
 #include "emu.h"
diff --git a/src/mame/video/neogeo_spr.h b/src/mame/video/neogeo_spr.h
index ff91af3f57e..46035aea39e 100644
--- a/src/mame/video/neogeo_spr.h
+++ b/src/mame/video/neogeo_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define VERBOSE     (0)
 
diff --git a/src/mame/video/news.c b/src/mame/video/news.c
index b64e93f19b1..6a65b5405ae 100644
--- a/src/mame/video/news.c
+++ b/src/mame/video/news.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/news.h"
 
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index 373d0bc91f8..3c80d0e4ffc 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     UPL "sprite framebuffer" hardware
diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c
index 8a1162dbc13..0bdf6fa6c95 100644
--- a/src/mame/video/ninjaw.c
+++ b/src/mame/video/ninjaw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/ninjaw.h"
 
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index 9f3e3619792..bded2dfbef4 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Night Driver hardware
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index 8f121ba1e40..0c6af2384b4 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 1a9420771eb..bb4eec31a51 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* notes...
 
  drawing sprites in a single pass with pdrawgfx breaks Thunder Dragon 2,
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index 5243a612544..9f5acbc918e 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/nova2001.h"
 
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index 51c310b1513..a3ce0aaf8d4 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c
index c57a181a4a8..d86e5bd0738 100644
--- a/src/mame/video/ohmygod.c
+++ b/src/mame/video/ohmygod.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/ohmygod.h"
 
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 01cdf43c00b..d66b191b10e 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Video System Mahjong series.
diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c
index bb874a096e9..8d25810ea28 100644
--- a/src/mame/video/oneshot.c
+++ b/src/mame/video/oneshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* One Shot One Kill Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/opwolf.c b/src/mame/video/opwolf.c
index 7f35452c396..9aa1be962f2 100644
--- a/src/mame/video/opwolf.c
+++ b/src/mame/video/opwolf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Functions to emulate video hardware on these Taito games:
 
diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c
index b97a9b7bbf2..03721d3d390 100644
--- a/src/mame/video/orbit.c
+++ b/src/mame/video/orbit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Orbit video emulation
diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c
index 34e086b2b29..b3a636e5e63 100644
--- a/src/mame/video/othunder.c
+++ b/src/mame/video/othunder.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/othunder.h"
 
diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c
index 18468f72415..ebbfcd0993e 100644
--- a/src/mame/video/overdriv.c
+++ b/src/mame/video/overdriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/overdriv.h"
 
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index 3ed38891898..b3c41a5ef5c 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Sprite/tile priority is quite complex in this game: it is handled both
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index c9447c2d580..6e3d844b8d5 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Namco Pac Man
diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c
index 1a92c3b14aa..25a01bfa50d 100644
--- a/src/mame/video/pandoras.c
+++ b/src/mame/video/pandoras.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pandoras.h"
 #include "video/resnet.h"
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 8c293b4acf4..df6a7e1e414 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                -= Paradise / Target Ball / Torus =-
diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c
index b7a0fd3375a..e32c3a1409e 100644
--- a/src/mame/video/parodius.c
+++ b/src/mame/video/parodius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/parodius.h"
 
diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c
index d7d5122d1a4..e9d1da99a78 100644
--- a/src/mame/video/pass.c
+++ b/src/mame/video/pass.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/pass.c - see drivers/pass.c for more info */
 
 #include "emu.h"
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index 5460e2efbc2..cc745b698bf 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Video Hardware for Nichibutsu Mahjong series.
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index bd6c3d5a662..8229d87b0e3 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/pc080sn.c b/src/mame/video/pc080sn.c
index 61e8ff45fbe..80e3e8e3868 100644
--- a/src/mame/video/pc080sn.c
+++ b/src/mame/video/pc080sn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito PC080SN
 -------
diff --git a/src/mame/video/pc080sn.h b/src/mame/video/pc080sn.h
index b0fe811eb8a..bdc07e52019 100644
--- a/src/mame/video/pc080sn.h
+++ b/src/mame/video/pc080sn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PC080SN_H__
 #define __PC080SN_H__
 
diff --git a/src/mame/video/pc090oj.c b/src/mame/video/pc090oj.c
index d037cfd247d..4995caa144e 100644
--- a/src/mame/video/pc090oj.c
+++ b/src/mame/video/pc090oj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito pc090oj
 -------
diff --git a/src/mame/video/pc090oj.h b/src/mame/video/pc090oj.h
index 97149252a3a..1dea506c6d1 100644
--- a/src/mame/video/pc090oj.h
+++ b/src/mame/video/pc090oj.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PC090OJ_H__
 #define __PC090OJ_H__
 
diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c
index 74788effe38..90ea9b0eea5 100644
--- a/src/mame/video/pcktgal.c
+++ b/src/mame/video/pcktgal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pcktgal.h"
 
diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c
index a246f22963e..c1d68d67ef5 100644
--- a/src/mame/video/pgm.c
+++ b/src/mame/video/pgm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*** Video *******************************************************************/
 /* see drivers/pgm.c for notes on where improvements can be made */
 
diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c
index 7cb4707fd80..ff983734770 100644
--- a/src/mame/video/phoenix.c
+++ b/src/mame/video/phoenix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c
index fccc1be3c1c..77176359bd0 100644
--- a/src/mame/video/pingpong.c
+++ b/src/mame/video/pingpong.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c
index 11ed28b36af..70fdbaed10b 100644
--- a/src/mame/video/pirates.c
+++ b/src/mame/video/pirates.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pirates.h"
 
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 62f5c82a3d8..2531f969f48 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   - BG layer 32x128 , 8x8 tiles 4bpp , 2 palettes  (2nd is black )
diff --git a/src/mame/video/pk8000.c b/src/mame/video/pk8000.c
index def323c9802..0a2d262e4d5 100644
--- a/src/mame/video/pk8000.c
+++ b/src/mame/video/pk8000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pk8000.h"
 
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index f823fc840d4..945f4d94652 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pktgaldx.h"
 
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index f65c8ffa49d..611ea60b079 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/ppu2c0x.h"
 #include "includes/playch10.h"
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index 2413914c607..1119e8a0481 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/playmark.h"
 
diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c
index 98b41c210c3..50a82a9d6e0 100644
--- a/src/mame/video/plygonet.c
+++ b/src/mame/video/plygonet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Polygonet Commanders (Konami, 1993)
 
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index cfb8af5dfba..8560e23734c 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Poke Champ */
 
 #include "emu.h"
diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c
index 29cfa02a60b..06640f76e97 100644
--- a/src/mame/video/polepos.c
+++ b/src/mame/video/polepos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/polepos.h"
 
diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c
index d59addd4264..546fc8a750c 100644
--- a/src/mame/video/polyplay.c
+++ b/src/mame/video/polyplay.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Poly-Play
diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c
index 629d84212a4..08127e409d0 100644
--- a/src/mame/video/poolshrk.c
+++ b/src/mame/video/poolshrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Poolshark video emulation
diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c
index 1883944c7bf..0404363ad6a 100644
--- a/src/mame/video/pooyan.c
+++ b/src/mame/video/pooyan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Pooyan
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 7b54714f90f..ed3608f8f0d 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index 36ad6d3f104..3cfc2c5348a 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Popper
diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c
index 2648841ff8c..85541642bb4 100644
--- a/src/mame/video/portrait.c
+++ b/src/mame/video/portrait.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Portraits
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index e831db71cc2..5b499a8b362 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Power Instinct =-
diff --git a/src/mame/video/powervr2.c b/src/mame/video/powervr2.c
index 77366a40467..3584a7f25df 100644
--- a/src/mame/video/powervr2.c
+++ b/src/mame/video/powervr2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Dreamcast video emulation
 */
diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h
index bb0c1f60d55..2afd08e8f5a 100644
--- a/src/mame/video/powervr2.h
+++ b/src/mame/video/powervr2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __POWERVR2_H__
 #define __POWERVR2_H__
 
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index 6b8d9fe97c3..88bcbdd07e9 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Nintendo 2C0x PPU emulation.
diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h
index c44b03b6121..d2ca439688f 100644
--- a/src/mame/video/ppu2c0x.h
+++ b/src/mame/video/ppu2c0x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Nintendo 2C0x PPU emulation.
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index 4580f5e856c..85988c7a394 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Prehistoric Isle video routines
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index 0b4246c39d0..2751f5252c6 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Psikyo Games =-
diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c
index 1a2eb6553fc..6d375d1ce15 100644
--- a/src/mame/video/psikyo4.c
+++ b/src/mame/video/psikyo4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Psikyo PS6807 (PS4):
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index 14e160a45d3..fbcf03ecccb 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Psikyo PS6406B (PS3v1/PS5/PS5v2):
 See src/drivers/psikyosh.c for more info
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 40403564aac..00c1aadd0c2 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Psychic 5
   Bombs Away
diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c
index f3c4d8af83d..6464c721e82 100644
--- a/src/mame/video/punchout.c
+++ b/src/mame/video/punchout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c
index 0b4a356ab58..6779ab222b2 100644
--- a/src/mame/video/qdrmfgp.c
+++ b/src/mame/video/qdrmfgp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index b90f22dce3e..80f0bb2b780 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Taito Qix hardware
diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c
index a8ea4ac4318..f9409f92c9d 100644
--- a/src/mame/video/quasar.c
+++ b/src/mame/video/quasar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video\quasar.c
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index fe48799e159..5ec2593a00a 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Quiz DNA no Hanran (c) 1992 Face
diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c
index d88d66f2829..d8ff7ca4afc 100644
--- a/src/mame/video/quizpani.c
+++ b/src/mame/video/quizpani.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
     Quiz Panicuru Fantasy video hardware
diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c
index b8eb5dbfdae..64263bfcc30 100644
--- a/src/mame/video/raiden.c
+++ b/src/mame/video/raiden.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Seibu Raiden hardware
diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c
index d95c90cbdbd..db162c3ee32 100644
--- a/src/mame/video/rainbow.c
+++ b/src/mame/video/rainbow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Functions to emulate video hardware on these Taito games:
 
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 2a3289181ed..a433aed3799 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 The video mixer of this hardware is peculiar.
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index 4cdcbd40c94..ba10674b331 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   Functions to emulate video hardware on these Taito games:
 
diff --git a/src/mame/video/rdpbhelp.h b/src/mame/video/rdpbhelp.h
index b143d0063eb..d187c0b60d7 100644
--- a/src/mame/video/rdpbhelp.h
+++ b/src/mame/video/rdpbhelp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/rdpblend.c b/src/mame/video/rdpblend.c
index 14b510f14fc..0974ebeabd2 100644
--- a/src/mame/video/rdpblend.c
+++ b/src/mame/video/rdpblend.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/rdpblend.h b/src/mame/video/rdpblend.h
index aa8f52f7b54..1d8ed44439a 100644
--- a/src/mame/video/rdpblend.h
+++ b/src/mame/video/rdpblend.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.inc
index 3322f7b8966..5b9cdddab2d 100644
--- a/src/mame/video/rdpfiltr.inc
+++ b/src/mame/video/rdpfiltr.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres);
 INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index);
 INLINE void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres);
diff --git a/src/mame/video/rdpspn16.c b/src/mame/video/rdpspn16.c
index a10d737009d..608fe53c8fe 100644
--- a/src/mame/video/rdpspn16.c
+++ b/src/mame/video/rdpspn16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/rdptpipe.c b/src/mame/video/rdptpipe.c
index 3a258774407..a91d2202abd 100644
--- a/src/mame/video/rdptpipe.c
+++ b/src/mame/video/rdptpipe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/rdptpipe.h b/src/mame/video/rdptpipe.h
index 80666f6dddb..6ca2fe58e7c 100644
--- a/src/mame/video/rdptpipe.h
+++ b/src/mame/video/rdptpipe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 683c38bc173..11926da0b95 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                       -= Billiard Academy Real Break =-
diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c
index 4e2b0df95f8..fd8eea5828f 100644
--- a/src/mame/video/redalert.c
+++ b/src/mame/video/redalert.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Irem Red Alert hardware
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index c9291639eeb..f6df17e21c0 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index 013c219d233..af4d9c137b4 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Renegade Video Hardware
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index 15b2d737900..7b96a504b81 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/rltennis.c b/src/mame/video/rltennis.c
index e736e90a58d..d94ddbb2c9d 100644
--- a/src/mame/video/rltennis.c
+++ b/src/mame/video/rltennis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************
  Reality Tennis - (c) 1993 TCH
 
diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c
index a547bd25148..b87b8385910 100644
--- a/src/mame/video/rockrage.c
+++ b/src/mame/video/rockrage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/rockrage.h"
 
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index 3eb6a48a33d..9ae601989f7 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index 62c17aedec7..9e7c508e22f 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Rohga Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c
index 37795d193eb..b7f35193bf8 100644
--- a/src/mame/video/rollerg.c
+++ b/src/mame/video/rollerg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/rollerg.h"
 
diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c
index f648a440b61..5dbbd7b1c4b 100644
--- a/src/mame/video/rollrace.c
+++ b/src/mame/video/rollrace.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/rollrace.h"
 
diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c
index 13c1fffb67d..e6878752315 100644
--- a/src/mame/video/route16.c
+++ b/src/mame/video/route16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   route16.c
diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c
index 75284fa3580..43ec739ecbc 100644
--- a/src/mame/video/runaway.c
+++ b/src/mame/video/runaway.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Runaway video emulation
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index d69e67cb684..20fbf3899c7 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
    Run and Gun
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index 262e7536ba7..f2ef5b07177 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   sauro.c
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index 46257f1d963..a34f87ca437 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c
index 3599b754825..f4b6215587c 100644
--- a/src/mame/video/sbugger.c
+++ b/src/mame/video/sbugger.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Space Bugger - Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index 8115007ddb0..35895248e3f 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/scotrsht.h"
 
diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c
index 86a38993ee8..a21c7541793 100644
--- a/src/mame/video/sderby.c
+++ b/src/mame/video/sderby.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/sderby.h"
 
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index 3a5882683e7..d3c82560085 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega 16-bit common hardware
diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h
index a21741ca3f0..17fbf6ba74e 100644
--- a/src/mame/video/segaic16.h
+++ b/src/mame/video/segaic16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega 16-bit common hardware
diff --git a/src/mame/video/segaic16_road.c b/src/mame/video/segaic16_road.c
index ac39a1545df..245f76520c5 100644
--- a/src/mame/video/segaic16_road.c
+++ b/src/mame/video/segaic16_road.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/mame/video/segaic16_road.h b/src/mame/video/segaic16_road.h
index b765af1c3c5..512b476c435 100644
--- a/src/mame/video/segaic16_road.h
+++ b/src/mame/video/segaic16_road.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega Road Generators */
 
 
diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c
index 556a37fadeb..62c4f406042 100644
--- a/src/mame/video/segaic24.c
+++ b/src/mame/video/segaic24.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Sega system24 hardware
 
diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h
index 7259f8f9470..e5ae080238c 100644
--- a/src/mame/video/segaic24.h
+++ b/src/mame/video/segaic24.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Sega system24 hardware
 
diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c
index 369bda2182a..e93abae6368 100644
--- a/src/mame/video/segas24.c
+++ b/src/mame/video/segas24.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Sega System 24
  *
diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h
index abfe7d3dae1..ce21c616647 100644
--- a/src/mame/video/seibu_crtc.h
+++ b/src/mame/video/seibu_crtc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Seibu CRTC device
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index 4495c479532..ae48d979266 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Seibu SPI hardware
diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c
index 74b80525413..3deb4483453 100644
--- a/src/mame/video/seicross.c
+++ b/src/mame/video/seicross.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index a4ade1fac08..48209fd06f6 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index ca5cfd8ea54..a76286673dd 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Seta Hardware =-
diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c
index 9a5468e3857..596cb2a3d99 100644
--- a/src/mame/video/seta001.c
+++ b/src/mame/video/seta001.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/*
 	emulation of Seta sprite chips
 	X1-001A  X1-002A (SDIP64)
diff --git a/src/mame/video/seta001.h b/src/mame/video/seta001.h
index bd5de9d4c80..577d35018f8 100644
--- a/src/mame/video/seta001.h
+++ b/src/mame/video/seta001.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 typedef device_delegate<int (UINT16 code, UINT8 color)> gfxbank_cb_delegate;
 
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 32a4e5055d1..a7470cd13a4 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Newer Seta Hardware =-
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 2cbe1459ff2..e5e6ff54bb3 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/sf.h"
 
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index 986a27bf094..8cc01fb0c13 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/shadfrce.h"
 
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index a54b5771a9d..fb356db942c 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Custom blitter GA9201 KA01-0249 (120pin IC)
diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c
index 1bb0c6d720d..92402e9e082 100644
--- a/src/mame/video/shangkid.c
+++ b/src/mame/video/shangkid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/shangkid */
 
 #include "emu.h"
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index 32d9785e4f5..a67b97e0c31 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   shaolins.c
diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c
index 83a08018f2d..c83192e3d0e 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/shisen.h"
 
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 919330da025..37dac1358e7 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Video Hardware for Shoot Out
     prom GB09.K6 may be related to background tile-sprite priority
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 5dbbc87cc74..a5114c2175e 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   sidearms.c
diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c
index c33bf7dedc2..c6fee9a7379 100644
--- a/src/mame/video/sidepckt.c
+++ b/src/mame/video/sidepckt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Data East Side Pocket hardware
diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c
index 5353565e73d..a2a39d341a4 100644
--- a/src/mame/video/silkroad.c
+++ b/src/mame/video/silkroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/silkroad.h"
 
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 88ef8a5b091..b2e1f67830b 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Simple 156 based board
 
 */
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index c290699c105..6c798a19cfd 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/simpsons.h"
 
diff --git a/src/mame/video/sknsspr.c b/src/mame/video/sknsspr.c
index 41b533c2753..c4226650d2f 100644
--- a/src/mame/video/sknsspr.c
+++ b/src/mame/video/sknsspr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super Kaneko Nova System Sprites
 
    "CG24173 6186" & "CG24143 4181" (always used as a pair?)
diff --git a/src/mame/video/sknsspr.h b/src/mame/video/sknsspr.h
index 3145755c487..b90aa167010 100644
--- a/src/mame/video/sknsspr.h
+++ b/src/mame/video/sknsspr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class sknsspr_device : public device_t,
 							public device_video_interface
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index ee7f45b4bad..c6a421f6f80 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Sky Diver hardware
diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c
index 9f268276b9c..93cd1a8aa8b 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                         -= Sky Fox / Exerizer =-
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index aec5cf1b4c8..77bc304d80a 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/skykid.h"
 
diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c
index 9824c586c48..d0fe479d9a9 100644
--- a/src/mame/video/skyraid.c
+++ b/src/mame/video/skyraid.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sky Raider video emulation
diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c
index 8349cdc451d..400611f137a 100644
--- a/src/mame/video/slapfght.c
+++ b/src/mame/video/slapfght.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index bbb48181383..b013522a1ed 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/slapshot.h"
 
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index 1ed8b441bad..4bf2fb23bb0 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/snk.h"
 
diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c
index 6fae356fd68..ddf639fff0a 100644
--- a/src/mame/video/snk6502.c
+++ b/src/mame/video/snk6502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index b7d073fe281..a7d57b40b5e 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     SNK 68000 video routines
diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c
index 4e80b69f0f8..62a3ccee4b8 100644
--- a/src/mame/video/snookr10.c
+++ b/src/mame/video/snookr10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************************
 
     SNOOKER 10 / SANDII'
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index ce30ac4da7b..1475975d0b9 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/solomon.h"
 
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index e0b3fe33464..72f60b1b1a3 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c
index 3685d690e48..f2b3749d973 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Space Firebird hardware
diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c
index 1b6fe218e09..61a8e73b0d1 100644
--- a/src/mame/video/spbactn.c
+++ b/src/mame/video/spbactn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "includes/spbactn.h"
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index 5f2ac59a2bb..c76ee2213c2 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   spcforce.c
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index 80c9ec84cfe..c95bfc24097 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/spdodgeb.h"
diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c
index 5f13d636cac..d62f8db4cbf 100644
--- a/src/mame/video/speedatk.c
+++ b/src/mame/video/speedatk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************************
 
  Speed Attack video hardware emulation
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index 81f8f920547..c1f08da0683 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
  *                                                                          *
  *  Speed Ball                                                              *
diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c
index 8a3c3ac8095..c25713d748d 100644
--- a/src/mame/video/speedspn.c
+++ b/src/mame/video/speedspn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Speed Spin video, see driver file for notes */
 
 #include "emu.h"
diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c
index 6a0e3fd07b8..e977e957bb9 100644
--- a/src/mame/video/splash.c
+++ b/src/mame/video/splash.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   splash.c
diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c
index bfc346809b8..4d047dfec35 100644
--- a/src/mame/video/sprcros2.c
+++ b/src/mame/video/sprcros2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Super Cross II (JPN Ver.)
 (c)1986 GM Shoji
diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c
index 361659080f7..ef658cb2997 100644
--- a/src/mame/video/sprint2.c
+++ b/src/mame/video/sprint2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Sprint 2 video emulation
diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c
index 9c95d13aeeb..cec9f9d8c5f 100644
--- a/src/mame/video/sprint4.c
+++ b/src/mame/video/sprint4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sprint 4 video emulation
diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c
index 0437b1db487..480bf263005 100644
--- a/src/mame/video/sprint8.c
+++ b/src/mame/video/sprint8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Sprint 8 video emulation
diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c
index a85f96041ee..6c08e8d0512 100644
--- a/src/mame/video/spy.c
+++ b/src/mame/video/spy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/spy.h"
 
diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c
index 4c3fd389786..f2ee40fce4d 100644
--- a/src/mame/video/srmp2.c
+++ b/src/mame/video/srmp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 4c3d722bc68..92f535920ba 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   srumbler.c
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index bb2d4a195b3..a1421c88e35 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Uses Data East custom chip 55 for backgrounds, with a special 8bpp mode
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index 10a6a759b8b..8fc691d893b 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super Slam - Video Hardware */
 
 #include "emu.h"
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 61fc6187c76..0d9b99bddd5 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Syusse Oozumou
diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c
index 8e3c5f0bb58..74535f4b166 100644
--- a/src/mame/video/sspeedr.c
+++ b/src/mame/video/sspeedr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Taito Super Speed Race video emulation
diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c
index 0a227f6ecd5..31fd25ed8e2 100644
--- a/src/mame/video/ssrj.c
+++ b/src/mame/video/ssrj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/ssrj.h"
 
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 6b48449c7af..31331214e6e 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                     -= Seta, Sammy, Visco (SSV) System =-
diff --git a/src/mame/video/st0020.c b/src/mame/video/st0020.c
index 9d7d26b8e46..889e1cd4d89 100644
--- a/src/mame/video/st0020.c
+++ b/src/mame/video/st0020.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* ST0020 - Seta Zooming Sprites + Blitter
 
   (gdfs also has a tilemap, I don't know if this chip supplies that)
diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h
index 61657349f68..b04fa8c4102 100644
--- a/src/mame/video/st0020.h
+++ b/src/mame/video/st0020.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index 0b02ad109fe..253ee0435f7 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Sega "Space Tactics" Driver
diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c
index c9a23775d9f..2a8c530e5b3 100644
--- a/src/mame/video/stadhero.c
+++ b/src/mame/video/stadhero.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   stadhero video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index 6fb230a5f1e..3061a2242e6 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /* Ramtek - Star Cruiser */
 
diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c
index c653e450c30..b7c8b937b95 100644
--- a/src/mame/video/starfire.c
+++ b/src/mame/video/starfire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Star Fire/Fire One system - video hardware
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index 752f21cb021..b8905c3f565 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Starship 1 video emulation
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index b51a427152b..375e0802fb5 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c
index 9b5f24dd30c..fda18113a87 100644
--- a/src/mame/video/stlforce.c
+++ b/src/mame/video/stlforce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/stlforce.c - see main driver for other notes */
 
 #include "emu.h"
diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c
index d7523a755e0..2ee18898204 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Strength & Skill (c) 1984 Sun Electronics
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index eca6b79a098..07611d55ac9 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Atari Subs hardware
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 777cfff419c..de62b9be50f 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -=  SunA 16 Bit Games =-
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index 6a5e541f41c..cf9c864d88b 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -=  SunA 8 Bit Games =-
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index bd71101f4a1..1cd400cc39f 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Super Burger Time Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c
index e5c10618cac..62971c93f01 100644
--- a/src/mame/video/superchs.c
+++ b/src/mame/video/superchs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/superchs.h"
 
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 0bd56ec9e8a..b70062803ea 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 1c60380f5c9..a41681d1cf0 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   suprloco.c
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index 24fd6bfdcdb..4921bc3a93b 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super Kaneko Nova System video */
 
 #include "emu.h"
diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c
index dd705d5e35f..ba43d81dd04 100644
--- a/src/mame/video/suprslam.c
+++ b/src/mame/video/suprslam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super Slams - video, see notes in driver file */
 
 #include "emu.h"
diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c
index 99dbea2a803..ce6545c8669 100644
--- a/src/mame/video/surpratk.c
+++ b/src/mame/video/surpratk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/surpratk.h"
 
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 9c9286e21c5..9e0e18de1ac 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     System1 / System 2
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index e6354fbb6f7..a547b1e5052 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     System 16 / 18 bootleg video
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index c557b752979..3711f51d116 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     tagteam.c
diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c
index a4ed0b2603a..a96122ce27c 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tail2nos.h"
 
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 3a86fc9c51f..f6a229b0ee3 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/taito_b.h"
 
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 6a3e843a620..39da01b13b8 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/taito_f2.h"
 
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index a79ba38f94e..1142a45c88a 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Taito F3 Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index b4a18513f5d..6dab593f482 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/taito_helper.c b/src/mame/video/taito_helper.c
index c26d8efda7c..458a82a98f5 100644
--- a/src/mame/video/taito_helper.c
+++ b/src/mame/video/taito_helper.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "taito_helper.h"
 
 /* These scanline drawing routines, currently used by the pc080sn, tc0080vco, tc0150rod and tc0480scp devices, were lifted from Taito F3: optimise / merge ? */
diff --git a/src/mame/video/taito_helper.h b/src/mame/video/taito_helper.h
index fa0945211c6..cd75946f3a9 100644
--- a/src/mame/video/taito_helper.h
+++ b/src/mame/video/taito_helper.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #include "emu.h"
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index 4d3611ada70..aba16b91aaa 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/taito_l.h"
 
diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c
index 44eb1e8e7aa..2e8e9f21cb7 100644
--- a/src/mame/video/taito_o.c
+++ b/src/mame/video/taito_o.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Based on taito_h.c
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 0bb9f7eea2b..341a221801d 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/taito_z.h"
 
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index 1b2195f0b93..6889ed2b843 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Functions to emulate the video hardware of the machine.
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index 02d9c77c44b..80e2832add8 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
   Taito JC System
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index a0edf710ff5..fef7a363fe0 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index 209a4c11d1b..35849c332c0 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Tank 8 video emulation
diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c
index e419c2ed4c5..c88c8135ed5 100644
--- a/src/mame/video/tankbatt.c
+++ b/src/mame/video/tankbatt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   tankbatt.c
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c
index e26cf97887f..7395fb186b9 100644
--- a/src/mame/video/tankbust.c
+++ b/src/mame/video/tankbust.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 *   Video Driver for Tank Busters
 */
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index df808169297..ed92fa53de2 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Tao Taido Video Hardware */
 
 /*
diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c
index a41c7438665..e0d16f5b515 100644
--- a/src/mame/video/targeth.c
+++ b/src/mame/video/targeth.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Target Hits Video Hardware
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index ee56ed38b8f..150f4dec97a 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tatsumi.h"
 
diff --git a/src/mame/video/taxidriv.c b/src/mame/video/taxidriv.c
index 6341ba6a30b..b12fe6f8b38 100644
--- a/src/mame/video/taxidriv.c
+++ b/src/mame/video/taxidriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/taxidriv.h"
 
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index 8d5b1a0c796..54597635373 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* video/tbowl.c */
 
 /* see drivers/tbowl.c for more info */
diff --git a/src/mame/video/tc0080vco.c b/src/mame/video/tc0080vco.c
index dca7dd0657c..9565f6b478c 100644
--- a/src/mame/video/tc0080vco.c
+++ b/src/mame/video/tc0080vco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito tc0080vco
 ---------
diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h
index 9e5656db684..4952a2f7bdc 100644
--- a/src/mame/video/tc0080vco.h
+++ b/src/mame/video/tc0080vco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0080VCO_H__
 #define __TC0080VCO_H__
 
diff --git a/src/mame/video/tc0100scn.c b/src/mame/video/tc0100scn.c
index b664594f456..05f2fc2eea0 100644
--- a/src/mame/video/tc0100scn.c
+++ b/src/mame/video/tc0100scn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0100SCN
 ---------
diff --git a/src/mame/video/tc0100scn.h b/src/mame/video/tc0100scn.h
index 84f7f243788..586989bf8d2 100644
--- a/src/mame/video/tc0100scn.h
+++ b/src/mame/video/tc0100scn.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0100SCN_H__
 #define __TC0100SCN_H__
 
diff --git a/src/mame/video/tc0110pcr.c b/src/mame/video/tc0110pcr.c
index 79938ed95a0..f0cd62ac82d 100644
--- a/src/mame/video/tc0110pcr.c
+++ b/src/mame/video/tc0110pcr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0110PCR
 ---------
diff --git a/src/mame/video/tc0110pcr.h b/src/mame/video/tc0110pcr.h
index ebdd60ece25..1d4b27fe0ef 100644
--- a/src/mame/video/tc0110pcr.h
+++ b/src/mame/video/tc0110pcr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _TC0110PCR_H_
 #define _TC0110PCR_H_
 
diff --git a/src/mame/video/tc0150rod.c b/src/mame/video/tc0150rod.c
index d03bb445613..99162d5abc3 100644
--- a/src/mame/video/tc0150rod.c
+++ b/src/mame/video/tc0150rod.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0150ROD
 ---------
diff --git a/src/mame/video/tc0150rod.h b/src/mame/video/tc0150rod.h
index 9b363385930..e05278a1bae 100644
--- a/src/mame/video/tc0150rod.h
+++ b/src/mame/video/tc0150rod.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0150ROD_H__
 #define __TC0150ROD_H__
 
diff --git a/src/mame/video/tc0180vcu.c b/src/mame/video/tc0180vcu.c
index fa40be6f2f9..1668793ba4e 100644
--- a/src/mame/video/tc0180vcu.c
+++ b/src/mame/video/tc0180vcu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Taito TC0180VCU */
 
 #include "emu.h"
diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h
index 72a2b180431..fa5b243fa3b 100644
--- a/src/mame/video/tc0180vcu.h
+++ b/src/mame/video/tc0180vcu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0180VCU_H__
 #define __TC0180VCU_H__
 
diff --git a/src/mame/video/tc0280grd.c b/src/mame/video/tc0280grd.c
index 8714aca7006..6204a17476c 100644
--- a/src/mame/video/tc0280grd.c
+++ b/src/mame/video/tc0280grd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0280GRD
 Taito TC0430GRW
diff --git a/src/mame/video/tc0280grd.h b/src/mame/video/tc0280grd.h
index feef33adfea..0f80d8fd9e7 100644
--- a/src/mame/video/tc0280grd.h
+++ b/src/mame/video/tc0280grd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0280GRD_H__
 #define __TC0280GRD_H__
 
diff --git a/src/mame/video/tc0360pri.c b/src/mame/video/tc0360pri.c
index 1b8d83fab8b..8613bf835b4 100644
--- a/src/mame/video/tc0360pri.c
+++ b/src/mame/video/tc0360pri.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0360PRI
 ---------
diff --git a/src/mame/video/tc0360pri.h b/src/mame/video/tc0360pri.h
index e20fd3ae31c..0f148c2358c 100644
--- a/src/mame/video/tc0360pri.h
+++ b/src/mame/video/tc0360pri.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _TC0360PRI_H_
 #define _TC0360PRI_H_
 
diff --git a/src/mame/video/tc0480scp.c b/src/mame/video/tc0480scp.c
index 967092fdc56..a8efdf70ce5 100644
--- a/src/mame/video/tc0480scp.c
+++ b/src/mame/video/tc0480scp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Taito TC0480SCP
 ---------
diff --git a/src/mame/video/tc0480scp.h b/src/mame/video/tc0480scp.h
index 134b5b6781d..08a3cffab70 100644
--- a/src/mame/video/tc0480scp.h
+++ b/src/mame/video/tc0480scp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __TC0480SCP_H__
 #define __TC0480SCP_H__
 
diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c
index 750ef4bdd9c..76040473be2 100644
--- a/src/mame/video/tceptor.c
+++ b/src/mame/video/tceptor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *  Thunder Ceptor board
  *  emulate video hardware
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 07f03bd4299..e31a7243244 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video hardware for Tecmo games
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index be84b01d197..3c38c93662e 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Ganbare Ginkun  (Japan)  (c)1995 TECMO
diff --git a/src/mame/video/tecmo_mix.c b/src/mame/video/tecmo_mix.c
index 37c7d5c8bb8..1607e7cce17 100644
--- a/src/mame/video/tecmo_mix.c
+++ b/src/mame/video/tecmo_mix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "tecmo_mix.h"
diff --git a/src/mame/video/tecmo_mix.h b/src/mame/video/tecmo_mix.h
index f6e021f0546..3a980e0cbe7 100644
--- a/src/mame/video/tecmo_mix.h
+++ b/src/mame/video/tecmo_mix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Tecmo Mixer */
 
 
diff --git a/src/mame/video/tecmo_spr.c b/src/mame/video/tecmo_spr.c
index 25ac2a860ef..20128b70244 100644
--- a/src/mame/video/tecmo_spr.c
+++ b/src/mame/video/tecmo_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Various Tecmo Sprite implementations
 
  - the various sprite implementations here are slightly different but can clearly be refactored to use
diff --git a/src/mame/video/tecmo_spr.h b/src/mame/video/tecmo_spr.h
index fa33c7d5fbc..7bbd65805ce 100644
--- a/src/mame/video/tecmo_spr.h
+++ b/src/mame/video/tecmo_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Tecmo Sprites */
 
 
diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c
index 56d9e9ca196..b05c8cfa647 100644
--- a/src/mame/video/tecmosys.c
+++ b/src/mame/video/tecmosys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  tecmosys video driver
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index 8e78b1b7e73..913239cb32a 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Tehkan World Cup - (c) Tehkan 1985
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 613329b7e22..aa02cfad8ea 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index d6faac2f7a0..7976324ebcc 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Tetris Plus 2 =-
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index 9397957fe3c..7dc9813351e 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                             -= Run Deep / The Deep =-
diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c
index c1a6bdf30e5..86fd1c7968b 100644
--- a/src/mame/video/thepit.c
+++ b/src/mame/video/thepit.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   thepit.c
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index 19debf657ee..abdddcc1113 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*  video hardware for Pacific Novelty games:
 **  Thief/Nato Defense
 */
diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c
index 5f6f9e577a3..736fa865e70 100644
--- a/src/mame/video/thoop2.c
+++ b/src/mame/video/thoop2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Gaelco Type 1 Video Hardware Rev B
diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c
index 0c6577383ad..9f1a92e3fde 100644
--- a/src/mame/video/thunderx.c
+++ b/src/mame/video/thunderx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/thunderx.h"
 
diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c
index bf523eda781..9215806e8bc 100644
--- a/src/mame/video/tia.c
+++ b/src/mame/video/tia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Atari TIA video emulation
diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h
index 545a3898aca..f5a29a1e909 100644
--- a/src/mame/video/tia.h
+++ b/src/mame/video/tia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _VIDEO_TIA_H_
 #define _VIDEO_TIA_H_
 
diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c
index e7185dcf1bd..df1b647bdbc 100644
--- a/src/mame/video/tiamc1.c
+++ b/src/mame/video/tiamc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   TIA-MC1 video hardware
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 757f896a5b5..eded52d88b1 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tigeroad.h"
 
diff --git a/src/mame/video/tigeroad_spr.c b/src/mame/video/tigeroad_spr.c
index d7e764f4d6c..c1c656f30f9 100644
--- a/src/mame/video/tigeroad_spr.c
+++ b/src/mame/video/tigeroad_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     very simple sprite scheme, used by some Capcom games and hardware cloned from them
diff --git a/src/mame/video/tigeroad_spr.h b/src/mame/video/tigeroad_spr.h
index 80aec88b667..36cffdeaf0a 100644
--- a/src/mame/video/tigeroad_spr.h
+++ b/src/mame/video/tigeroad_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 class tigeroad_spr_device : public device_t
 {
diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c
index 282c85155b3..47e9551309a 100644
--- a/src/mame/video/timelimt.c
+++ b/src/mame/video/timelimt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/timelimt.h"
 
diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c
index a36e1617209..e14c01af9cb 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Time Pilot
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 6779fc7a374..d4a42ab6fd8 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/tmnt.h"
 
diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c
index ce7c3ac2704..73cf7307f37 100644
--- a/src/mame/video/tnzs.c
+++ b/src/mame/video/tnzs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index a6f9b012744..a5278cd81c1 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Functions to emulate the video hardware of some Toaplan games,
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index edb27a16b89..a2f8f09b66e 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  Functions to emulate additional video hardware on several Toaplan2 games.
diff --git a/src/mame/video/toaplan_scu.c b/src/mame/video/toaplan_scu.c
index eed8e3a12da..3117fb8eb00 100644
--- a/src/mame/video/toaplan_scu.c
+++ b/src/mame/video/toaplan_scu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Toaplan Sprite Controller 'SCU'
  used by video/twincobr.c (including wardner)
  and rallybik in toaplan1.c
diff --git a/src/mame/video/toaplan_scu.h b/src/mame/video/toaplan_scu.h
index f1d9e606b48..d17c33eb306 100644
--- a/src/mame/video/toaplan_scu.h
+++ b/src/mame/video/toaplan_scu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* toaplan SCU */
 
 
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index b3a16aeeab3..39523bad210 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c
index db85d5e6470..a1b9837a278 100644
--- a/src/mame/video/topspeed.c
+++ b/src/mame/video/topspeed.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/topspeed.h"
 
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index c54a4a368fc..51540907138 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c
index a1368edd5c3..81cddb87241 100644
--- a/src/mame/video/tp84.c
+++ b/src/mame/video/tp84.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video.c
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 1eb074f3450..3904821fb9b 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index 0a0c48a4b27..c97beb0f589 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c
index ccd92201701..11c4683d919 100644
--- a/src/mame/video/triplhnt.c
+++ b/src/mame/video/triplhnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Triple Hunt video emulation
diff --git a/src/mame/video/truco.c b/src/mame/video/truco.c
index 45cddea3453..4486939480d 100644
--- a/src/mame/video/truco.c
+++ b/src/mame/video/truco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c
index 2e3ccb043c2..730ae89ce5a 100644
--- a/src/mame/video/trucocl.c
+++ b/src/mame/video/trucocl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Truco Clemente (c) 1991 Miky SRL
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index f7f284adc10..2ae53cfae56 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************
 
  Pro Yakyuu Nyuudan Test Tryout (JPN Ver.)
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index eede6d28503..0be296e1e21 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 **  Video Driver for Taito Samurai (1985)
 */
diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c
index a3db488ff0a..87f162b88cf 100644
--- a/src/mame/video/tubep.c
+++ b/src/mame/video/tubep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index d62585ad653..f2bada46bf2 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Tumblepop (bootlegs) and similar hardware
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 0fcfc806d0f..5968b7c3a14 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Tumblepop Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c
index 09142065ae8..941f9e46e6b 100644
--- a/src/mame/video/tunhunt.c
+++ b/src/mame/video/tunhunt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Tunnel Hunt hardware
diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c
index 5bc908148b4..1bea85f43fe 100644
--- a/src/mame/video/turbo.c
+++ b/src/mame/video/turbo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Sega Z80-3D system
diff --git a/src/mame/video/turrett.c b/src/mame/video/turrett.c
index 51e438e3389..d258fe21bd7 100644
--- a/src/mame/video/turrett.c
+++ b/src/mame/video/turrett.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Turrett Tower video hardware
diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c
index 4629095dd2a..b33495c5890 100644
--- a/src/mame/video/tutankhm.c
+++ b/src/mame/video/tutankhm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 2af6e1b2b10..f38ad182669 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Konami Twin16 Hardware - Video
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index fa34c615f1c..065bfb27145 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   video.c
 
diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c
index 8c095f842cb..2ec4ed499df 100644
--- a/src/mame/video/tx1.c
+++ b/src/mame/video/tx1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatsumi TX-1/Buggy Boy video hardware
diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c
index f1dbbccda1c..d9dcf6d58a5 100644
--- a/src/mame/video/ultraman.c
+++ b/src/mame/video/ultraman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/ultraman.h"
 
diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c
index 05a79a11fe5..e3529c98e14 100644
--- a/src/mame/video/ultratnk.c
+++ b/src/mame/video/ultratnk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Ultra Tank video emulation
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index fcdd2fe158c..19a343ac37d 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/undrfire.h"
 
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index 385dad3e1da..115e36b2538 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                               -= Unico Games =-
diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c
index f0258209b07..452f06d325f 100644
--- a/src/mame/video/usgames.c
+++ b/src/mame/video/usgames.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/usgames.h"
 
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index 29c7256a0b2..72cef025005 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
    Vapour Trail Video emulation - Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index fdd0f6b2ccb..9b18bfa13c4 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index f218b71acf0..7af27158ffa 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Video Hardware for Championship V'ball by Paul Hampson
diff --git a/src/mame/video/vectrex.c b/src/mame/video/vectrex.c
index 60091e7a7ae..7e98e73d962 100644
--- a/src/mame/video/vectrex.c
+++ b/src/mame/video/vectrex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <math.h>
 #include "emu.h"
 #include "includes/vectrex.h"
diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c
index 99ce32a9c28..7084d4680f9 100644
--- a/src/mame/video/vendetta.c
+++ b/src/mame/video/vendetta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/vendetta.h"
 
diff --git a/src/mame/video/vertigo.c b/src/mame/video/vertigo.c
index 5813681b013..c7c7bff6db7 100644
--- a/src/mame/video/vertigo.c
+++ b/src/mame/video/vertigo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
  Exidy Vertigo hardware
diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c
index a7f9c0c47cc..7900dffacf6 100644
--- a/src/mame/video/vicdual.c
+++ b/src/mame/video/vicdual.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VIC Dual Game board
diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c
index ec508b9d18e..eaaa33a472f 100644
--- a/src/mame/video/videopin.c
+++ b/src/mame/video/videopin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Atari Video Pinball video emulation
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index f0f6c9c44e8..acada524e1e 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   vigilant.c
diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c
index f3b906521bc..b35d89a8161 100644
--- a/src/mame/video/volfied.c
+++ b/src/mame/video/volfied.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/volfied.h"
 
diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c
index 2aa15e0eb71..3a016cdba0b 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "vrender0.h"
 
diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h
index 5b9c9572227..42c4b211d57 100644
--- a/src/mame/video/vrender0.h
+++ b/src/mame/video/vrender0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __VR0VIDEO_H__
 #define __VR0VIDEO_H__
 
diff --git a/src/mame/video/vs920a.c b/src/mame/video/vs920a.c
index 85017e33b34..5a1ff5b9d88 100644
--- a/src/mame/video/vs920a.c
+++ b/src/mame/video/vs920a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 // currently used by gstriker.c, apparently inufuku uses the same chip
 
diff --git a/src/mame/video/vs920a.h b/src/mame/video/vs920a.h
index 091a0fb8ecf..4d5d05d6c66 100644
--- a/src/mame/video/vs920a.h
+++ b/src/mame/video/vs920a.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 class vs920a_text_tilemap_device : public device_t
diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c
index 9bf781a006e..61069674aa7 100644
--- a/src/mame/video/vsnes.c
+++ b/src/mame/video/vsnes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/ppu2c0x.h"
 #include "includes/vsnes.h"
diff --git a/src/mame/video/vsystem_spr.c b/src/mame/video/vsystem_spr.c
index ff208ad3e6c..ccecae87037 100644
--- a/src/mame/video/vsystem_spr.c
+++ b/src/mame/video/vsystem_spr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Video System Sprites
 // todo:
 //  update drivers which call multiple priority passes to use the pdrawgfx version (aerofgt, gstriker)
diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h
index d5bec5cca5f..aaadf6385db 100644
--- a/src/mame/video/vsystem_spr.h
+++ b/src/mame/video/vsystem_spr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Video System Sprites
 
 
diff --git a/src/mame/video/vsystem_spr2.c b/src/mame/video/vsystem_spr2.c
index 0ff4006e128..789aa51f938 100644
--- a/src/mame/video/vsystem_spr2.c
+++ b/src/mame/video/vsystem_spr2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Video System Sprites (type 2)
 // todo:
 //  move various vsystem sprite functions here
diff --git a/src/mame/video/vsystem_spr2.h b/src/mame/video/vsystem_spr2.h
index f14eb44e3cd..e1f7a0f1ea2 100644
--- a/src/mame/video/vsystem_spr2.h
+++ b/src/mame/video/vsystem_spr2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Video System Sprites
 
 typedef device_delegate<UINT32 (UINT32)> vsystem_tile2_indirection_delegate;
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 4cd5bdbe100..f566603795b 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Capcom Vulgus hardware
diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c
index 49253f5ea23..a675f9c8200 100644
--- a/src/mame/video/warpwarp.c
+++ b/src/mame/video/warpwarp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c
index f245c5beaa4..368b84908ad 100644
--- a/src/mame/video/warriorb.c
+++ b/src/mame/video/warriorb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/warriorb.h"
 
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index 4765220df49..1c4165ca619 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/wc90.h"
 
diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c
index 951c956adf8..87305bfa6f2 100644
--- a/src/mame/video/wc90b.c
+++ b/src/mame/video/wc90b.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/wc90b.h"
 
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index b6d4f6c979b..c87b4f1424f 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
                         WEC Le Mans 24  &   Hot Chase
 
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index 648f036418b..bd03ebb3c5f 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/welltris.h"
 
diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c
index d9aa942eede..d272a4a79e3 100644
--- a/src/mame/video/wgp.c
+++ b/src/mame/video/wgp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/wgp.h"
 
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index 7161c0a2e4b..7622a9b69dd 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Williams 6809 system
diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c
index b7f34dcc150..342c62b96d8 100644
--- a/src/mame/video/wiping.c
+++ b/src/mame/video/wiping.c
@@ -1,6 +1,8 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
-  video.c
+  wiping.c
 
   Functions to emulate the video hardware of the machine.
 
@@ -77,13 +79,13 @@ PALETTE_INIT_MEMBER(wiping_state, wiping)
 
 
 
-WRITE8_MEMBER(wiping_state::wiping_flipscreen_w)
+WRITE8_MEMBER(wiping_state::flipscreen_w)
 {
 	m_flipscreen = (data & 1);
 }
 
 
-UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+UINT32 wiping_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	UINT8 *spriteram = m_spriteram;
 	int offs;
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index 8d14691a43a..43066520934 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Seibu Stinger/Wiz hardware
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index b1a1d118502..fd70b145787 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Atari Wolf Pack (prototype) video emulation
diff --git a/src/mame/video/wpc_dmd.c b/src/mame/video/wpc_dmd.c
index 22c4017eb26..3ec978cd4e2 100644
--- a/src/mame/video/wpc_dmd.c
+++ b/src/mame/video/wpc_dmd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "wpc_dmd.h"
 
diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c
index bd9e1437df9..f5a0576d2c4 100644
--- a/src/mame/video/wrally.c
+++ b/src/mame/video/wrally.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   World Rally Video Hardware
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index 56956cc37aa..08dd336f2db 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
  WWF Superstars (C) 1989 Technos Japan  (video/wwfsstar.c)
 ********************************************************************************
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index 810923e96f4..d90001ef221 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     xain.c
diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c
index 13098a70b2a..fffbf440c92 100644
--- a/src/mame/video/xevious.c
+++ b/src/mame/video/xevious.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c
index e089e575544..509c63be9af 100644
--- a/src/mame/video/xexex.c
+++ b/src/mame/video/xexex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/xexex.h"
 
diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c
index 45a7fb84463..b5d24d362ae 100644
--- a/src/mame/video/xmen.c
+++ b/src/mame/video/xmen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/xmen.h"
 
diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c
index 8753a94684a..5eaa01553a5 100644
--- a/src/mame/video/xorworld.c
+++ b/src/mame/video/xorworld.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/xorworld.h"
 
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index be678c2db22..539b42eb9c2 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 XX Mission (c) 1986 UPL
diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c
index b83abc325f0..6ffcf24b0e9 100644
--- a/src/mame/video/xyonix.c
+++ b/src/mame/video/xyonix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/xyonix.h"
 
diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c
index fd7f334bdca..72471bbe5e2 100644
--- a/src/mame/video/ygv608.c
+++ b/src/mame/video/ygv608.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
  *    Yamaha YGV608 - PVDC2 Pattern mode Video Display Controller 2
diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h
index f847cd6edfc..2ec1714a3d3 100644
--- a/src/mame/video/ygv608.h
+++ b/src/mame/video/ygv608.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __YGV608_H__
 #define __YGV608_H__
 
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 058237e95df..1360bc50057 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index 293f2d89e00..1a219ed03f5 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Yun Sung 16 Bit Games =-
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index 735f66324c4..70ab9d55d1f 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
                           -= Yun Sung 8 Bit Games =-
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index baf218d4e49..4fa4107439d 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************/
 /*                                                           */
 /* Zaccaria/Zelco S2650 based games video                    */
diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c
index 87c0e1acbd2..451fa86773b 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index 951363344dc..72b81ba47b8 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sega Zaxxon hardware
diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c
index 41cdf85c14a..8c2a8238080 100644
--- a/src/mame/video/zerozone.c
+++ b/src/mame/video/zerozone.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video/zerozone.c
diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c
index fe36a99139f..26c3e68e6dd 100644
--- a/src/mame/video/zodiack.c
+++ b/src/mame/video/zodiack.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video.c
diff --git a/src/mess/audio/arcadia.c b/src/mess/audio/arcadia.c
index f6f6c08ecfb..0d00e742281 100644
--- a/src/mess/audio/arcadia.c
+++ b/src/mess/audio/arcadia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /***************************************************************************
 
   PeT mess@utanet.at
diff --git a/src/mess/audio/arcadia.h b/src/mess/audio/arcadia.h
index 46a614f0a3b..418e58273a5 100644
--- a/src/mess/audio/arcadia.h
+++ b/src/mess/audio/arcadia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 #ifndef ARCADIA_SOUND_H_
 #define ARCADIA_SOUND_H_
 
diff --git a/src/mess/audio/channelf.c b/src/mess/audio/channelf.c
index bbcdcc9d6d3..c9e07cbd43c 100644
--- a/src/mess/audio/channelf.c
+++ b/src/mess/audio/channelf.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle
 #include "emu.h"
 #include "audio/channelf.h"
 
diff --git a/src/mess/audio/channelf.h b/src/mess/audio/channelf.h
index 339e26ca1c0..f227eb67c07 100644
--- a/src/mess/audio/channelf.h
+++ b/src/mess/audio/channelf.h
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle
 /*****************************************************************************
  *
  * audio/channelf.h
diff --git a/src/mess/audio/dai_snd.c b/src/mess/audio/dai_snd.c
index a1876b12256..0b9775765a1 100644
--- a/src/mess/audio/dai_snd.c
+++ b/src/mess/audio/dai_snd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Krzysztof Strzecha
 /***************************************************************************
 
   audio/dai_snd.c
diff --git a/src/mess/audio/dai_snd.h b/src/mess/audio/dai_snd.h
index 65d32185297..b7c9d5e89b6 100644
--- a/src/mess/audio/dai_snd.h
+++ b/src/mess/audio/dai_snd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Krzysztof Strzecha
 /*****************************************************************************
  *
  * dai_snd.h
diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c
index 1dfc93e1cad..1c4520d62c1 100644
--- a/src/mess/audio/dave.c
+++ b/src/mess/audio/dave.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Intelligent Designs DAVE emulation
diff --git a/src/mess/audio/dave.h b/src/mess/audio/dave.h
index 84301682d3f..8dfe910ea12 100644
--- a/src/mess/audio/dave.h
+++ b/src/mess/audio/dave.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Intelligent Designs DAVE emulation
diff --git a/src/mess/audio/gamate.c b/src/mess/audio/gamate.c
index 7e6a03c7be8..d33bcfa7397 100644
--- a/src/mess/audio/gamate.c
+++ b/src/mess/audio/gamate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /***************************************************************************
  gamate sound hardware
 
diff --git a/src/mess/audio/gb.c b/src/mess/audio/gb.c
index 7d212d3f466..2ca82aa5657 100644
--- a/src/mess/audio/gb.c
+++ b/src/mess/audio/gb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Anthony Kruize
 /**************************************************************************************
 * Game Boy sound emulation (c) Anthony Kruize (trandor@labyrinth.net.au)
 *
diff --git a/src/mess/audio/gb.h b/src/mess/audio/gb.h
index f56ccce8c42..d8eb9d6109b 100644
--- a/src/mess/audio/gb.h
+++ b/src/mess/audio/gb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Anthony Kruize
 #ifndef __GBSOUND_H__
 #define __GBSOUND_H__
 
diff --git a/src/mess/audio/lynx.c b/src/mess/audio/lynx.c
index 2db121308c0..c297b9e79b3 100644
--- a/src/mess/audio/lynx.c
+++ b/src/mess/audio/lynx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /******************************************************************************
  PeT mess@utanet.at 2000,2001
 ******************************************************************************/
diff --git a/src/mess/audio/lynx.h b/src/mess/audio/lynx.h
index 583c6ec75d4..af1c8259eee 100644
--- a/src/mess/audio/lynx.h
+++ b/src/mess/audio/lynx.h
@@ -1,3 +1,6 @@
+// license:???
+// copyright-holders:PeT
+
 #ifndef __LYNXSOUND_H__
 #define __LYNXSOUND_H__
 
diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c
index ded5238158a..b93b4d86e0d 100644
--- a/src/mess/audio/mac.c
+++ b/src/mess/audio/mac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Nathan Woods, Raphael Nabet, R. Belmont
 /***************************************************************************
 
     mac.c
diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c
index 9a9ba2d6438..20b30765f8e 100644
--- a/src/mess/audio/mea8000.c
+++ b/src/mess/audio/mea8000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Antoine Mine
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/audio/mea8000.h b/src/mess/audio/mea8000.h
index 67857c9561a..bf4f8aa19b5 100644
--- a/src/mess/audio/mea8000.h
+++ b/src/mess/audio/mea8000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Antoine Mine
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/audio/socrates.c b/src/mess/audio/socrates.c
index 9c615d115b0..c35896e5c25 100644
--- a/src/mess/audio/socrates.c
+++ b/src/mess/audio/socrates.c
@@ -1,4 +1,4 @@
-// license:MAME|LGPL-2.1+
+// license:BSD-3-Clause
 // copyright-holders:Jonathan Gevaryahu
 /***************************************************************************
 
diff --git a/src/mess/audio/socrates.h b/src/mess/audio/socrates.h
index dd9645ff414..f1d2b1dd002 100644
--- a/src/mess/audio/socrates.h
+++ b/src/mess/audio/socrates.h
@@ -1,4 +1,4 @@
-// license:MAME|LGPL-2.1+
+// license:BSD-3-Clause
 // copyright-holders:Jonathan Gevaryahu
 #pragma once
 
diff --git a/src/mess/audio/specimx_snd.c b/src/mess/audio/specimx_snd.c
index 4b9063064a8..2b56c6b25f8 100644
--- a/src/mess/audio/specimx_snd.c
+++ b/src/mess/audio/specimx_snd.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
   audio/special.c
diff --git a/src/mess/audio/specimx_snd.h b/src/mess/audio/specimx_snd.h
index 1a046ced050..0e07b27dc4b 100644
--- a/src/mess/audio/specimx_snd.h
+++ b/src/mess/audio/specimx_snd.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /*****************************************************************************
  *
  * specimx_snd.h
diff --git a/src/mess/audio/svis_snd.c b/src/mess/audio/svis_snd.c
index f7b7eae7ef3..47ef6009d41 100644
--- a/src/mess/audio/svis_snd.c
+++ b/src/mess/audio/svis_snd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /***************************************************************************
  supervision sound hardware
 
diff --git a/src/mess/audio/svis_snd.h b/src/mess/audio/svis_snd.h
index c41c0963912..fb4fc7f3aa0 100644
--- a/src/mess/audio/svis_snd.h
+++ b/src/mess/audio/svis_snd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /*****************************************************************************
  *
  *  svis_snd.h
diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c
index 5ab0866442f..064522d30c0 100644
--- a/src/mess/audio/upd1771.c
+++ b/src/mess/audio/upd1771.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Wilbert Pol
 /**********************************************************************
 
     NEC uPD1771-017 as used in the Epoch Super Cassette Vision (SCV)
diff --git a/src/mess/audio/upd1771.h b/src/mess/audio/upd1771.h
index f26b3a0b447..687309439fc 100644
--- a/src/mess/audio/upd1771.h
+++ b/src/mess/audio/upd1771.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Wilbert Pol
 /**********************************************************************
 
     NEC uPD1771
diff --git a/src/mess/audio/vboy.c b/src/mess/audio/vboy.c
index 4f70aacf094..32933a5f005 100644
--- a/src/mess/audio/vboy.c
+++ b/src/mess/audio/vboy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:R. Belmont
 /*
     vboy.c - Virtual Boy audio emulation
 
diff --git a/src/mess/audio/vboy.h b/src/mess/audio/vboy.h
index 256e29045e8..0015dbbd873 100644
--- a/src/mess/audio/vboy.h
+++ b/src/mess/audio/vboy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:R. Belmont
 /*
     vboy.h - Virtual Boy audio emulation
 
diff --git a/src/mess/audio/vc4000snd.c b/src/mess/audio/vc4000snd.c
index 6fc29ed200f..a3316a78cb7 100644
--- a/src/mess/audio/vc4000snd.c
+++ b/src/mess/audio/vc4000snd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /***************************************************************************
 
   PeT mess@utanet.at
diff --git a/src/mess/audio/vc4000snd.h b/src/mess/audio/vc4000snd.h
index 097c247538a..6c3d12a7e0d 100644
--- a/src/mess/audio/vc4000snd.h
+++ b/src/mess/audio/vc4000snd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:PeT
 /*****************************************************************************
  *
  * includes/vc4000snd.h
diff --git a/src/mess/audio/wswan_snd.c b/src/mess/audio/wswan_snd.c
index e24f060dfda..0c0e04c80d3 100644
--- a/src/mess/audio/wswan_snd.c
+++ b/src/mess/audio/wswan_snd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Wilbert Pol
 /**************************************************************************************
 
   Wonderswan sound emulation
diff --git a/src/mess/audio/wswan_snd.h b/src/mess/audio/wswan_snd.h
index 253308b0520..d72d6d7c59b 100644
--- a/src/mess/audio/wswan_snd.h
+++ b/src/mess/audio/wswan_snd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Wilbert Pol
 /*****************************************************************************
  *
  * includes/wswan_snd.h
diff --git a/src/mess/drivers/4004clk.c b/src/mess/drivers/4004clk.c
index 19bc512fc60..eb69ee6a227 100644
--- a/src/mess/drivers/4004clk.c
+++ b/src/mess/drivers/4004clk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         4004 Nixie Clock
diff --git a/src/mess/drivers/68ksbc.c b/src/mess/drivers/68ksbc.c
index 16ce35869d3..ae80462bbb7 100644
--- a/src/mess/drivers/68ksbc.c
+++ b/src/mess/drivers/68ksbc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index 4cd6f991f77..7e586f9fc46 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Atari VCS 2600 driver
diff --git a/src/mess/drivers/a310.c b/src/mess/drivers/a310.c
index 2a74ab37be9..ba25fbfe0e7 100644
--- a/src/mess/drivers/a310.c
+++ b/src/mess/drivers/a310.c
@@ -1,4 +1,4 @@
-// license:?
+// license:GPL-2.0+
 // copyright-holders:Angelo Salese, R. Belmont, Juergen Bunchmueller
 /******************************************************************************
  *
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index a955519ebfe..82229b29329 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Angelo Salese, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/a51xx.c b/src/mess/drivers/a51xx.c
index 799af3a09d1..51db95e8919 100644
--- a/src/mess/drivers/a51xx.c
+++ b/src/mess/drivers/a51xx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     A51xx
diff --git a/src/mess/drivers/a6809.c b/src/mess/drivers/a6809.c
index 12012d6ecea..38a455614ca 100644
--- a/src/mess/drivers/a6809.c
+++ b/src/mess/drivers/a6809.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert and unknown others
 /***************************************************************************
 
diff --git a/src/mess/drivers/a7150.c b/src/mess/drivers/a7150.c
index 82a313613bd..009de2894dc 100644
--- a/src/mess/drivers/a7150.c
+++ b/src/mess/drivers/a7150.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Robotron A7150
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index 4602c3ce941..568029240de 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   a7800.c
diff --git a/src/mess/drivers/ac1.c b/src/mess/drivers/ac1.c
index f885014ede5..46683958e08 100644
--- a/src/mess/drivers/ac1.c
+++ b/src/mess/drivers/ac1.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         AC1 video driver by Miodrag Milanovic
diff --git a/src/mess/drivers/advision.c b/src/mess/drivers/advision.c
index 148039c842c..939a7e78d42 100644
--- a/src/mess/drivers/advision.c
+++ b/src/mess/drivers/advision.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     drivers/advision.c
diff --git a/src/mess/drivers/aim65_40.c b/src/mess/drivers/aim65_40.c
index 073a11eab57..eac298882ce 100644
--- a/src/mess/drivers/aim65_40.c
+++ b/src/mess/drivers/aim65_40.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Rockwell AIM-65/40
diff --git a/src/mess/drivers/altair.c b/src/mess/drivers/altair.c
index 273cbdb99ce..af578f2d56f 100644
--- a/src/mess/drivers/altair.c
+++ b/src/mess/drivers/altair.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/alto2.c b/src/mess/drivers/alto2.c
index 85792cd38c6..00d570320c9 100644
--- a/src/mess/drivers/alto2.c
+++ b/src/mess/drivers/alto2.c
@@ -1,9 +1,8 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
  *   Xerox AltoII driver for MESS
  *
- *   Copyright Juergen Buchmueller <pullmoll@t-online.de>
- *
- *   Licenses: MAME, GPLv2
  ***************************************************************************/
 
 #include "emu.h"
diff --git a/src/mess/drivers/altos5.c b/src/mess/drivers/altos5.c
index 1d6ae952999..c58741feeb1 100644
--- a/src/mess/drivers/altos5.c
+++ b/src/mess/drivers/altos5.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/amico2k.c b/src/mess/drivers/amico2k.c
index b1a81e59d3e..2ac70c30561 100644
--- a/src/mess/drivers/amico2k.c
+++ b/src/mess/drivers/amico2k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     A.S.EL. Amico 2000
diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index ff675b55226..f7c8cd44d2f 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore Amiga
diff --git a/src/mess/drivers/ampro.c b/src/mess/drivers/ampro.c
index 24ac5259fd4..6e17ad92ffb 100644
--- a/src/mess/drivers/ampro.c
+++ b/src/mess/drivers/ampro.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/amstr_pc.c b/src/mess/drivers/amstr_pc.c
index 935606c26e6..5bded966585 100644
--- a/src/mess/drivers/amstr_pc.c
+++ b/src/mess/drivers/amstr_pc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/amstr_pc.c
diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c
index f7557ede3ba..4ef5ba6c0ba 100644
--- a/src/mess/drivers/amstrad.c
+++ b/src/mess/drivers/amstrad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     amstrad.c
diff --git a/src/mess/drivers/amust.c b/src/mess/drivers/amust.c
index 5a7bec0f757..fe471686a14 100644
--- a/src/mess/drivers/amust.c
+++ b/src/mess/drivers/amust.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c
index 38a4d6dfa6c..eaa1786ff7e 100644
--- a/src/mess/drivers/apf.c
+++ b/src/mess/drivers/apf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 driver by ?
diff --git a/src/mess/drivers/apogee.c b/src/mess/drivers/apogee.c
index 4b7240f0694..c6e6b5897f4 100644
--- a/src/mess/drivers/apogee.c
+++ b/src/mess/drivers/apogee.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Apogee BK-01 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c
index 591f7f9a9c1..d471d41ce73 100644
--- a/src/mess/drivers/apollo.c
+++ b/src/mess/drivers/apollo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * apollo.c - APOLLO DN3500/DN3000 driver
  *
diff --git a/src/mess/drivers/apple1.c b/src/mess/drivers/apple1.c
index bf144dfd5b7..a01ae8d5e13 100644
--- a/src/mess/drivers/apple1.c
+++ b/src/mess/drivers/apple1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
 Apple I
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index d5d35416be3..101c9c5fd14 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/apple2gs.c
diff --git a/src/mess/drivers/apple3.c b/src/mess/drivers/apple3.c
index 7cec34bebc1..b5b678b4e06 100644
--- a/src/mess/drivers/apple3.c
+++ b/src/mess/drivers/apple3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/apple3.c
diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c
index 2f9f05880e4..c3914a1ced1 100644
--- a/src/mess/drivers/applix.c
+++ b/src/mess/drivers/applix.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c
index 0164e89d099..93580f65184 100644
--- a/src/mess/drivers/apricot.c
+++ b/src/mess/drivers/apricot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ACT Apricot PC/Xi
diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c
index 5d12f81b086..6acd59dab3f 100644
--- a/src/mess/drivers/apricotf.c
+++ b/src/mess/drivers/apricotf.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Angelo Salese, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c
index 24966318e45..e1a887dc9d9 100644
--- a/src/mess/drivers/aquarius.c
+++ b/src/mess/drivers/aquarius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mattel Aquarius
diff --git a/src/mess/drivers/arcadia.c b/src/mess/drivers/arcadia.c
index 66600106b9b..9c15f89cf25 100644
--- a/src/mess/drivers/arcadia.c
+++ b/src/mess/drivers/arcadia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 Consolidation and enhancement of documentation by Manfred Schneider based on previous work from
  PeT mess@utanet.at and Paul Robson (autismuk@aol.com) minor updates by incog
diff --git a/src/mess/drivers/argo.c b/src/mess/drivers/argo.c
index 6524e8cecad..4520b96eaa4 100644
--- a/src/mess/drivers/argo.c
+++ b/src/mess/drivers/argo.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/asst128.c b/src/mess/drivers/asst128.c
index cd70d45068c..bfb4ba368b1 100644
--- a/src/mess/drivers/asst128.c
+++ b/src/mess/drivers/asst128.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/genpc.h"
 #include "machine/pc_fdc.h"
diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrocde.c
index 5058efc65c1..d3448fbe9bd 100644
--- a/src/mess/drivers/astrocde.c
+++ b/src/mess/drivers/astrocde.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     Bally Astrocade consumer hardware
diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c
index 7bdbed6026d..6d301f87901 100644
--- a/src/mess/drivers/at.c
+++ b/src/mess/drivers/at.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM AT Compatibles
diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c
index c800cbdad83..5722e2c6d79 100644
--- a/src/mess/drivers/atari400.c
+++ b/src/mess/drivers/atari400.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
     Atari 400/800
 
diff --git a/src/mess/drivers/atm.c b/src/mess/drivers/atm.c
index 4b4cba1cebd..d4ccc7151e6 100644
--- a/src/mess/drivers/atm.c
+++ b/src/mess/drivers/atm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************************
 
 MicroART ATM (clone of Spectrum)
diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c
index e09142a305b..499e1587840 100644
--- a/src/mess/drivers/atom.c
+++ b/src/mess/drivers/atom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Acorn Atom:
 
diff --git a/src/mess/drivers/b2m.c b/src/mess/drivers/b2m.c
index 0510f7f4171..1c4d9c66546 100644
--- a/src/mess/drivers/b2m.c
+++ b/src/mess/drivers/b2m.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Bashkiria-2M driver by Miodrag Milanovic
diff --git a/src/mess/drivers/babbage.c b/src/mess/drivers/babbage.c
index bd5531c7554..b20bbd574df 100644
--- a/src/mess/drivers/babbage.c
+++ b/src/mess/drivers/babbage.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/basic52.c b/src/mess/drivers/basic52.c
index f14e1254076..16af655f2b0 100644
--- a/src/mess/drivers/basic52.c
+++ b/src/mess/drivers/basic52.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c
index e77fb48c2f3..e8c63847602 100644
--- a/src/mess/drivers/bbc.c
+++ b/src/mess/drivers/bbc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     BBC Model A,B
 
diff --git a/src/mess/drivers/bbcbc.c b/src/mess/drivers/bbcbc.c
index a67db079108..93c76d83d79 100644
--- a/src/mess/drivers/bbcbc.c
+++ b/src/mess/drivers/bbcbc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Incog, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/bcs3.c b/src/mess/drivers/bcs3.c
index cf242b35c42..9f4d9bdd3f9 100644
--- a/src/mess/drivers/bcs3.c
+++ b/src/mess/drivers/bcs3.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c
index 85670758480..3d498c97963 100644
--- a/src/mess/drivers/bebox.c
+++ b/src/mess/drivers/bebox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/bebox.c
diff --git a/src/mess/drivers/beehive.c b/src/mess/drivers/beehive.c
index 518abb2e06b..0a0e1f82948 100644
--- a/src/mess/drivers/beehive.c
+++ b/src/mess/drivers/beehive.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/besta.c b/src/mess/drivers/besta.c
index 4f6174f7606..84e65152cec 100644
--- a/src/mess/drivers/besta.c
+++ b/src/mess/drivers/besta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Besta-88 and Besta-90 engineering workstations.
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index 6b5f4af27e4..7131483b3df 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c
index 1d050528887..bc8ff56202c 100644
--- a/src/mess/drivers/binbug.c
+++ b/src/mess/drivers/binbug.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/bitgraph.c b/src/mess/drivers/bitgraph.c
index 684443f6bcd..d89e2d8044c 100644
--- a/src/mess/drivers/bitgraph.c
+++ b/src/mess/drivers/bitgraph.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     BBN BitGraph -- monochrome, raster graphics (768x1024), serial terminal.
diff --git a/src/mess/drivers/bk.c b/src/mess/drivers/bk.c
index 9bfa1cc8426..10ab64a1273 100644
--- a/src/mess/drivers/bk.c
+++ b/src/mess/drivers/bk.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         BK driver by Miodrag Milanovic
diff --git a/src/mess/drivers/bob85.c b/src/mess/drivers/bob85.c
index 00151e27333..efa57ed3d4c 100644
--- a/src/mess/drivers/bob85.c
+++ b/src/mess/drivers/bob85.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         BOB85 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/br8641.c b/src/mess/drivers/br8641.c
index f9cdcbccb89..1dfdaf92307 100644
--- a/src/mess/drivers/br8641.c
+++ b/src/mess/drivers/br8641.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/busicom.c b/src/mess/drivers/busicom.c
index 4f9915f92c7..c0fb6ac2276 100644
--- a/src/mess/drivers/busicom.c
+++ b/src/mess/drivers/busicom.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Busicom 141-PF
diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c
index 6056c53fea0..fba812b36cc 100644
--- a/src/mess/drivers/bw12.c
+++ b/src/mess/drivers/bw12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Bondwell 12/14
diff --git a/src/mess/drivers/c10.c b/src/mess/drivers/c10.c
index 367d4fec48e..8f221b3f456 100644
--- a/src/mess/drivers/c10.c
+++ b/src/mess/drivers/c10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Cromemco C-10 Personal Computer
diff --git a/src/mess/drivers/c65_old.c b/src/mess/drivers/c65_old.c
index 9306d51880e..5a2462c669b 100644
--- a/src/mess/drivers/c65_old.c
+++ b/src/mess/drivers/c65_old.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Commodore C65 home computer
diff --git a/src/mess/drivers/c900.c b/src/mess/drivers/c900.c
index 68a6e3e9896..d90b181ab8a 100644
--- a/src/mess/drivers/c900.c
+++ b/src/mess/drivers/c900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************
 
     Commodore C900
diff --git a/src/mess/drivers/camplynx.c b/src/mess/drivers/camplynx.c
index cd5e9f32603..153cd3ae763 100644
--- a/src/mess/drivers/camplynx.c
+++ b/src/mess/drivers/camplynx.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index ae6f16fab92..08741c15956 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     Casio Loopy (c) 1995 Casio
diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c
index 27543b3f780..be512f11421 100644
--- a/src/mess/drivers/cat.c
+++ b/src/mess/drivers/cat.c
@@ -1,5 +1,5 @@
-// license:MAME|LGPL-2.1+
-// copyright-holders:Miodrag Milanovic,Jonathan Gevaryahu
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
     Canon Cat, Model V777
diff --git a/src/mess/drivers/ccs2810.c b/src/mess/drivers/ccs2810.c
index 0b0fa4c2a40..fda1decef49 100644
--- a/src/mess/drivers/ccs2810.c
+++ b/src/mess/drivers/ccs2810.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/ccs300.c b/src/mess/drivers/ccs300.c
index a24004ab3ff..10f11e975b5 100644
--- a/src/mess/drivers/ccs300.c
+++ b/src/mess/drivers/ccs300.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/cd2650.c b/src/mess/drivers/cd2650.c
index d6a621eecb9..2e2b8e0d895 100644
--- a/src/mess/drivers/cd2650.c
+++ b/src/mess/drivers/cd2650.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/cdc721.c b/src/mess/drivers/cdc721.c
index 4f758e8c4df..b40f95632cb 100644
--- a/src/mess/drivers/cdc721.c
+++ b/src/mess/drivers/cdc721.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
 Control Data Corporation CDC 721 Terminal (Viking)
diff --git a/src/mess/drivers/cfx9850.c b/src/mess/drivers/cfx9850.c
index 3b2593b8d9b..a12e52ef609 100644
--- a/src/mess/drivers/cfx9850.c
+++ b/src/mess/drivers/cfx9850.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Driver for Casio CFX-9850
diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c
index 4abb5f310f3..384d1d2e9e5 100644
--- a/src/mess/drivers/cgenie.c
+++ b/src/mess/drivers/cgenie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 HAD to change the PORT_ANALOG defs in this file...  please check ;-)
 
diff --git a/src/mess/drivers/channelf.c b/src/mess/drivers/channelf.c
index 360026065b6..65cff8a5a96 100644
--- a/src/mess/drivers/channelf.c
+++ b/src/mess/drivers/channelf.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle
 /******************************************************************
  *
  *  Fairchild Channel F driver
diff --git a/src/mess/drivers/chaos.c b/src/mess/drivers/chaos.c
index 2e234955cda..6d8676f9982 100644
--- a/src/mess/drivers/chaos.c
+++ b/src/mess/drivers/chaos.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/clcd.c b/src/mess/drivers/clcd.c
index e25c705685b..3715f27bf5a 100644
--- a/src/mess/drivers/clcd.c
+++ b/src/mess/drivers/clcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Commodore LCD prototype
diff --git a/src/mess/drivers/cm1800.c b/src/mess/drivers/cm1800.c
index 274395b117b..e7522a83de1 100644
--- a/src/mess/drivers/cm1800.c
+++ b/src/mess/drivers/cm1800.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c
index 186e1e61f56..511ca47e678 100644
--- a/src/mess/drivers/coco12.c
+++ b/src/mess/drivers/coco12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco12.c
diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c
index 2a09775ebe6..4aa848c3afe 100644
--- a/src/mess/drivers/coco3.c
+++ b/src/mess/drivers/coco3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco3.c
diff --git a/src/mess/drivers/codata.c b/src/mess/drivers/codata.c
index 557d0bf3042..8e5c8bebdc3 100644
--- a/src/mess/drivers/codata.c
+++ b/src/mess/drivers/codata.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/coleco.c b/src/mess/drivers/coleco.c
index 356e794b54f..9c33af8da20 100644
--- a/src/mess/drivers/coleco.c
+++ b/src/mess/drivers/coleco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************************************
 
   coleco.c
diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c
index fdef689d26d..43d53cf29d4 100644
--- a/src/mess/drivers/compis.c
+++ b/src/mess/drivers/compis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     drivers/compis.c
diff --git a/src/mess/drivers/comquest.c b/src/mess/drivers/comquest.c
index 6a2652344b3..c6f3219f5c8 100644
--- a/src/mess/drivers/comquest.c
+++ b/src/mess/drivers/comquest.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  Peter.Trauner@jk.uni-linz.ac.at September 2000
 
diff --git a/src/mess/drivers/concept.c b/src/mess/drivers/concept.c
index ade1949db95..5f43ca5049d 100644
--- a/src/mess/drivers/concept.c
+++ b/src/mess/drivers/concept.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Corvus Concept driver
 
diff --git a/src/mess/drivers/cortex.c b/src/mess/drivers/cortex.c
index c34f196b841..e1f29636182 100644
--- a/src/mess/drivers/cortex.c
+++ b/src/mess/drivers/cortex.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index f1d62f0ed2f..94911df4ef5 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     This 1980s computer was manufactured by Vtech of Hong Kong.
     known as: CreatiVision, Dick Smith Wizzard, Funvision, Rameses, VZ 2000 and possibly others.
diff --git a/src/mess/drivers/ct486.c b/src/mess/drivers/ct486.c
index 8b10c34dab5..e4e8ee28682 100644
--- a/src/mess/drivers/ct486.c
+++ b/src/mess/drivers/ct486.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     PC/AT 486 with Chips & Technologies CS4031 chipset
diff --git a/src/mess/drivers/cvicny.c b/src/mess/drivers/cvicny.c
index 7674ba3b8c9..9c97c06449e 100644
--- a/src/mess/drivers/cvicny.c
+++ b/src/mess/drivers/cvicny.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/cxhumax.c b/src/mess/drivers/cxhumax.c
index 13b34ac4542..d3d9afe9a9c 100644
--- a/src/mess/drivers/cxhumax.c
+++ b/src/mess/drivers/cxhumax.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     HUMAX HDCI-2000 ( Conexant CX2417x )
 
diff --git a/src/mess/drivers/cybiko.c b/src/mess/drivers/cybiko.c
index b2b6fc1b4ab..ac6dace7de2 100644
--- a/src/mess/drivers/cybiko.c
+++ b/src/mess/drivers/cybiko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
     Cybiko Wireless Inter-tainment System
diff --git a/src/mess/drivers/czk80.c b/src/mess/drivers/czk80.c
index d8356c247f8..90ce9688cb1 100644
--- a/src/mess/drivers/czk80.c
+++ b/src/mess/drivers/czk80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c
index 8ead0a93a28..f1ee98aecdb 100644
--- a/src/mess/drivers/d6800.c
+++ b/src/mess/drivers/d6800.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /*
 
diff --git a/src/mess/drivers/d6809.c b/src/mess/drivers/d6809.c
index 0fa3266c3fd..cda62e72c97 100644
--- a/src/mess/drivers/d6809.c
+++ b/src/mess/drivers/d6809.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /*******************************************************************************
 
diff --git a/src/mess/drivers/dai.c b/src/mess/drivers/dai.c
index ab9dbd5edd7..de76ec0b21a 100644
--- a/src/mess/drivers/dai.c
+++ b/src/mess/drivers/dai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 DAI driver by Krzysztof Strzecha and Nathan Woods
diff --git a/src/mess/drivers/dct11em.c b/src/mess/drivers/dct11em.c
index a1df16d0b61..0a0359338f1 100644
--- a/src/mess/drivers/dct11em.c
+++ b/src/mess/drivers/dct11em.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         DEC DCT11-EM
diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c
index d63dba2e303..b49c0db2443 100644
--- a/src/mess/drivers/dgn_beta.c
+++ b/src/mess/drivers/dgn_beta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/dgn_beta.c
diff --git a/src/mess/drivers/dim68k.c b/src/mess/drivers/dim68k.c
index 9c12fb1caff..eb7c5a68ccc 100644
--- a/src/mess/drivers/dim68k.c
+++ b/src/mess/drivers/dim68k.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/dm7000.c b/src/mess/drivers/dm7000.c
index a9af7336dfc..1c70c799d67 100644
--- a/src/mess/drivers/dm7000.c
+++ b/src/mess/drivers/dm7000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Dream Multimedia Dreambox 7000/5620/500
diff --git a/src/mess/drivers/dms5000.c b/src/mess/drivers/dms5000.c
index 11b310a536b..42213fa79f4 100644
--- a/src/mess/drivers/dms5000.c
+++ b/src/mess/drivers/dms5000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Digital Microsystems DMS-5000
diff --git a/src/mess/drivers/dms86.c b/src/mess/drivers/dms86.c
index 993b88fe5dd..66fe02f4646 100644
--- a/src/mess/drivers/dms86.c
+++ b/src/mess/drivers/dms86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Digital Microsystems DMS-86
diff --git a/src/mess/drivers/dolphunk.c b/src/mess/drivers/dolphunk.c
index 23e454ad5f4..8ee69d20042 100644
--- a/src/mess/drivers/dolphunk.c
+++ b/src/mess/drivers/dolphunk.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/dps1.c b/src/mess/drivers/dps1.c
index 41cd8171a47..da93d6cfc39 100644
--- a/src/mess/drivers/dps1.c
+++ b/src/mess/drivers/dps1.c
@@ -1,5 +1,6 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
+
 #include "emu.h"
 #include "cpu/z80/z80.h"
 
diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c
index 8efa666b4bb..f8b81fae7c0 100644
--- a/src/mess/drivers/dragon.c
+++ b/src/mess/drivers/dragon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dragon.c
diff --git a/src/mess/drivers/dsb46.c b/src/mess/drivers/dsb46.c
index 4c9242a1c4e..15dda5f28ee 100644
--- a/src/mess/drivers/dsb46.c
+++ b/src/mess/drivers/dsb46.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Curt Coder, Robbbert
 /********************************************************************************************************************
 
diff --git a/src/mess/drivers/dual68.c b/src/mess/drivers/dual68.c
index 7f76f9d2d7a..fc5538d8b15 100644
--- a/src/mess/drivers/dual68.c
+++ b/src/mess/drivers/dual68.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Dual Systems 68000
diff --git a/src/mess/drivers/dvk_ksm.c b/src/mess/drivers/dvk_ksm.c
index 73413043813..fa5327ad7d3 100644
--- a/src/mess/drivers/dvk_ksm.c
+++ b/src/mess/drivers/dvk_ksm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     KSM (Kontroller Simvolnogo Monitora = Character Display Controller),
diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c
index 3dd7320ac59..08b061939ab 100644
--- a/src/mess/drivers/eacc.c
+++ b/src/mess/drivers/eacc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /******************************************************************************
 *
diff --git a/src/mess/drivers/ec184x.c b/src/mess/drivers/ec184x.c
index a25bb42395c..b5995221831 100644
--- a/src/mess/drivers/ec184x.c
+++ b/src/mess/drivers/ec184x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/ec184x.c
diff --git a/src/mess/drivers/ec65.c b/src/mess/drivers/ec65.c
index 978ffb25a8f..0382893bf1b 100644
--- a/src/mess/drivers/ec65.c
+++ b/src/mess/drivers/ec65.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         EC-65
diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c
index ac8d50a1a6c..70ba8b3d3c9 100644
--- a/src/mess/drivers/einstein.c
+++ b/src/mess/drivers/einstein.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     Tatung Einstein
diff --git a/src/mess/drivers/electron.c b/src/mess/drivers/electron.c
index b42f5a94270..c7d969ae3bf 100644
--- a/src/mess/drivers/electron.c
+++ b/src/mess/drivers/electron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     Acorn Electron driver
 
diff --git a/src/mess/drivers/elekscmp.c b/src/mess/drivers/elekscmp.c
index 49ba075e49a..01ffefe6212 100644
--- a/src/mess/drivers/elekscmp.c
+++ b/src/mess/drivers/elekscmp.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c
index a381b867992..05868394377 100644
--- a/src/mess/drivers/elwro800.c
+++ b/src/mess/drivers/elwro800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Elwro 800 Junior
diff --git a/src/mess/drivers/ep64.c b/src/mess/drivers/ep64.c
index 708c5924860..a2608cd4ea5 100644
--- a/src/mess/drivers/ep64.c
+++ b/src/mess/drivers/ep64.c
@@ -4,9 +4,6 @@
 
     Enterprise Sixty Four / One Two Eight emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c
index 2b4f4df4a11..0be6f410d71 100644
--- a/src/mess/drivers/esq1.c
+++ b/src/mess/drivers/esq1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/esq1.c
diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c
index 207fbbbbacb..be7e54eaa9f 100644
--- a/src/mess/drivers/esq5505.c
+++ b/src/mess/drivers/esq5505.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esq5505.c - Ensoniq ES5505 + ES5510 based synthesizers and samplers
diff --git a/src/mess/drivers/esqasr.c b/src/mess/drivers/esqasr.c
index dafbd2296e7..192eb45774f 100644
--- a/src/mess/drivers/esqasr.c
+++ b/src/mess/drivers/esqasr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esqasr.c - Ensoniq ASR-10 and ASR-X
diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c
index 480569ad620..3053e254555 100644
--- a/src/mess/drivers/esqkt.c
+++ b/src/mess/drivers/esqkt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esqkt.c - Ensoniq KT-76, KT-88, and E-Prime
diff --git a/src/mess/drivers/esqmr.c b/src/mess/drivers/esqmr.c
index 425924fc23f..f1867ed522b 100644
--- a/src/mess/drivers/esqmr.c
+++ b/src/mess/drivers/esqmr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     esqmr.c - Ensoniq MR-61, MR-76, and MR-Rack
diff --git a/src/mess/drivers/et3400.c b/src/mess/drivers/et3400.c
index 93037ec6411..1f5500fd627 100644
--- a/src/mess/drivers/et3400.c
+++ b/src/mess/drivers/et3400.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         ET-3400
diff --git a/src/mess/drivers/europc.c b/src/mess/drivers/europc.c
index 4d5d8db43d8..0ad4311b592 100644
--- a/src/mess/drivers/europc.c
+++ b/src/mess/drivers/europc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "coreutil.h"
 #include "includes/genpc.h"
diff --git a/src/mess/drivers/evmbug.c b/src/mess/drivers/evmbug.c
index 966c8b2042f..148557c9e53 100644
--- a/src/mess/drivers/evmbug.c
+++ b/src/mess/drivers/evmbug.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/excali64.c b/src/mess/drivers/excali64.c
index 53650ce45a2..e34b55b01c5 100644
--- a/src/mess/drivers/excali64.c
+++ b/src/mess/drivers/excali64.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/exelv.c b/src/mess/drivers/exelv.c
index f59fda313a6..8c4d0a5ce66 100644
--- a/src/mess/drivers/exelv.c
+++ b/src/mess/drivers/exelv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Experimental exelvision driver
 
diff --git a/src/mess/drivers/fanucs15.c b/src/mess/drivers/fanucs15.c
index a2018291099..7f622dc9fcc 100644
--- a/src/mess/drivers/fanucs15.c
+++ b/src/mess/drivers/fanucs15.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // licenses: MAME, BSD
 // copyright-holders:R. Belmont
 /***************************************************************************
diff --git a/src/mess/drivers/fanucspmg.c b/src/mess/drivers/fanucspmg.c
index 0109deecb66..1442c60e2f2 100644
--- a/src/mess/drivers/fanucspmg.c
+++ b/src/mess/drivers/fanucspmg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // licenses: MAME, BSD
 // copyright-holders:R. Belmont
 /***************************************************************************
diff --git a/src/mess/drivers/fb01.c b/src/mess/drivers/fb01.c
index 155b4f53a20..9f558871334 100644
--- a/src/mess/drivers/fb01.c
+++ b/src/mess/drivers/fb01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Yamaha FB-01
diff --git a/src/mess/drivers/fc100.c b/src/mess/drivers/fc100.c
index d2dd95dd52d..eb892c7952a 100644
--- a/src/mess/drivers/fc100.c
+++ b/src/mess/drivers/fc100.c
@@ -1,4 +1,4 @@
-// license:BSD
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c
index e35a2b174b4..10eaf294b1f 100644
--- a/src/mess/drivers/fk1.c
+++ b/src/mess/drivers/fk1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         FK-1
diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c
index 544aa21c2d9..067afe6f427 100644
--- a/src/mess/drivers/fm7.c
+++ b/src/mess/drivers/fm7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************************************
 
     Fujitsu Micro 7 (FM-7)
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index 2b08cfd0f04..abcf010818b 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Fujitsu FM-Towns
diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c
index f1c813312ee..6b1f3ed1fec 100644
--- a/src/mess/drivers/fp1100.c
+++ b/src/mess/drivers/fp1100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Casio FP-1100
diff --git a/src/mess/drivers/ft68m.c b/src/mess/drivers/ft68m.c
index 0def60cc92f..7c950873ba9 100644
--- a/src/mess/drivers/ft68m.c
+++ b/src/mess/drivers/ft68m.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/galaxy.c b/src/mess/drivers/galaxy.c
index 42553a765cf..07d22bc30f3 100644
--- a/src/mess/drivers/galaxy.c
+++ b/src/mess/drivers/galaxy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Krzysztof Strzecha, Miodrag Milanovic
 /***************************************************************************
 Galaksija driver by Krzysztof Strzecha and Miodrag Milanovic
 
diff --git a/src/mess/drivers/galeb.c b/src/mess/drivers/galeb.c
index 3e753b84304..64d24d912e0 100644
--- a/src/mess/drivers/galeb.c
+++ b/src/mess/drivers/galeb.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Galeb driver by Miodrag Milanovic
diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c
index 67cf8c29d91..32b76b52710 100644
--- a/src/mess/drivers/gamate.c
+++ b/src/mess/drivers/gamate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT mess@utanet.at 2007, 2014
  Peter Wilhelmsen peter.wilhelmsen@gmail.com
diff --git a/src/mess/drivers/gameking.c b/src/mess/drivers/gameking.c
index 9a1092d83ae..f45c53968ef 100644
--- a/src/mess/drivers/gameking.c
+++ b/src/mess/drivers/gameking.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* TimeTop - GameKing */
 
 // these are meant to have a 3-in-1 internal ROM, not dumped
diff --git a/src/mess/drivers/gamepock.c b/src/mess/drivers/gamepock.c
index cb9816771dc..f5fe08a3cf9 100644
--- a/src/mess/drivers/gamepock.c
+++ b/src/mess/drivers/gamepock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "emu.h"
diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c
index ca2cdb613e2..78b00a7181d 100644
--- a/src/mess/drivers/gb.c
+++ b/src/mess/drivers/gb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   gb.c
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index da9f891ba8a..5cd099fd006 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   gba.c
diff --git a/src/mess/drivers/genpc.c b/src/mess/drivers/genpc.c
index 0f68f703fca..ff14bcec065 100644
--- a/src/mess/drivers/genpc.c
+++ b/src/mess/drivers/genpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/genpc.c
diff --git a/src/mess/drivers/gizmondo.c b/src/mess/drivers/gizmondo.c
index 2337154b7b7..39e1a78081c 100644
--- a/src/mess/drivers/gizmondo.c
+++ b/src/mess/drivers/gizmondo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Tiger Telematics Gizmondo
diff --git a/src/mess/drivers/glasgow.c b/src/mess/drivers/glasgow.c
index 6828f9ac9e6..f95043751e9 100644
--- a/src/mess/drivers/glasgow.c
+++ b/src/mess/drivers/glasgow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 Mephisto Glasgow 3 S chess computer
 Dirk V.
diff --git a/src/mess/drivers/gmaster.c b/src/mess/drivers/gmaster.c
index 8b5fe019f5c..c48d1979f7e 100644
--- a/src/mess/drivers/gmaster.c
+++ b/src/mess/drivers/gmaster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT mess@utanet.at march 2002
 ******************************************************************************/
diff --git a/src/mess/drivers/gp2x.c b/src/mess/drivers/gp2x.c
index 05302564471..3841d1cb9dd 100644
--- a/src/mess/drivers/gp2x.c
+++ b/src/mess/drivers/gp2x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * gp2x.c - Game Park Holdings GP2X
diff --git a/src/mess/drivers/gp32.c b/src/mess/drivers/gp32.c
index 6d0e00516af..6da87a4e160 100644
--- a/src/mess/drivers/gp32.c
+++ b/src/mess/drivers/gp32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
  *
  * gp32.c - Game Park GP32
diff --git a/src/mess/drivers/grfd2301.c b/src/mess/drivers/grfd2301.c
index d6e1af1613b..d7ec39534c1 100644
--- a/src/mess/drivers/grfd2301.c
+++ b/src/mess/drivers/grfd2301.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /************************************************************************************************************
 
diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c
index c902ffdd37b..c85212545cd 100644
--- a/src/mess/drivers/h19.c
+++ b/src/mess/drivers/h19.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Heathkit H19
diff --git a/src/mess/drivers/h8.c b/src/mess/drivers/h8.c
index 96ee2ef2797..cfe20e29774 100644
--- a/src/mess/drivers/h8.c
+++ b/src/mess/drivers/h8.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/harriet.c b/src/mess/drivers/harriet.c
index 46cfa4b246c..73de0465e1b 100644
--- a/src/mess/drivers/harriet.c
+++ b/src/mess/drivers/harriet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Harriet (c) 1990 Quantel
diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c
index a013f88b71d..ca8910f2c31 100644
--- a/src/mess/drivers/hec2hrp.c
+++ b/src/mess/drivers/hec2hrp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Hector 2HR+
diff --git a/src/mess/drivers/hh_hmcs40.c b/src/mess/drivers/hh_hmcs40.c
index bec7accfd93..dd3216e189e 100644
--- a/src/mess/drivers/hh_hmcs40.c
+++ b/src/mess/drivers/hh_hmcs40.c
@@ -12,7 +12,8 @@
  @07      HD38750A  1979, Bambino Knock-Em Out Boxing (ET-06B)
  @08      HD38750A  1979, Bambino Dribble Away Basketball (ET-05)
  @45      HD38750A  1981, VTech Invaders
- *58      HD38750A  1982, Ludotronic(Hanzawa) Grand Prix Turbo
+ *56      HD38750A  1981, Actronics(Hanzawa) Twinvader (small brown version)
+ *58      HD38750A  1981, Actronics(Hanzawa) Challenge Racer/Ludotronic(Hanzawa) Grand Prix Turbo
  *62      HD38750A  1982, Actronics(Hanzawa) Pack'n Maze
 
  @04      HD38800A  1980, Gakken Heiankyo Alien
@@ -20,7 +21,7 @@
  @27      HD38800A  1981, Bandai Packri Monster
  *31      HD38800A  1981, Entex Select-a-Game cartridge: Space Invader 2 (have dump)
  *41      HD38800A  1982, Gakken Puck Monster
- *51      HD38800A  1981, Actronics(Hanzawa) Twinvader
+ *51      HD38800A  1981, Actronics(Hanzawa) Twinvader (larger white version)
  @70      HD38800A  1982, Coleco Galaxian
  @73      HD38800A  1982, Bandai(Mattel) Star Hawk (PT-317B)
  @77      HD38800A  1982, Bandai Frisky Tom (PT-327A)
@@ -1968,7 +1969,7 @@ MACHINE_CONFIG_END
   NOTE!: MESS external artwork is recommended
 
 ***************************************************************************/
-
+#if 0
 class epacman2_state : public egalaxn2_state
 {
 public:
@@ -1976,7 +1977,7 @@ public:
 		: egalaxn2_state(mconfig, type, tag)
 	{ }
 };
-
+#endif
 // handlers are identical to Galaxian 2, so we can use those
 
 // config
diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c
index d51307deaa1..db75683def6 100644
--- a/src/mess/drivers/hh_tms1k.c
+++ b/src/mess/drivers/hh_tms1k.c
@@ -24,11 +24,13 @@
  *MP1296   TMS1100?  1982, Entex Black Knight
  *MP1312   TMS1100   198?, Tandy/RadioShack Science Fair Microcomputer Trainer
  @MP1525   TMS1170   1980, Coleco Head to Head Baseball
+ *MP1604   ?         1981, Hanzawa Twinvader III/Tandy Cosmic Fire Away 3000
  @MP2105   TMS1370   1979, Gakken Poker
  *MP2139   TMS1370?  1982, Gakken Galaxy Invader 1000
  *MP2788   ?         1980, Bandai Flight Time (? note: VFD-capable)
  *MP3208   TMS1000   1977, Milton Bradley Electronic Battleship (1977, model 4750A or B)
  @MP3226   TMS1000   1978, Milton Bradley Simon (model 4850)
+ *MP3232   TMS1000   1979, Fonas 2-Player Baseball (no "MP" on chip label)
  @MP3301A  TMS1000   1979, Milton Bradley Big Trak
  *MP3320A  TMS1000   1979, Coleco Head to Head Basketball
  *M32001   TMS1000   1981, Coleco Quiz Wiz Challenger (note: MP3398, MP3399, M3200x?)
@@ -897,7 +899,7 @@ MACHINE_CONFIG_END
 
   This is a head to head electronic tabletop LED-display sports console.
   One cartridge(Football) was included with the console, the other three were
-  sold separately. Gameplay has emphasis on strategy, read the official manual
+  sold in a pack. Gameplay has emphasis on strategy, read the official manual
   on how to play. Remember that you can rotate the view in MESS: rotate left
   for Home(P1) orientation, rotate right for Visitor(P2) orientation.
 
diff --git a/src/mess/drivers/hh_ucom4.c b/src/mess/drivers/hh_ucom4.c
index b8738fc8bba..27fc32a89e9 100644
--- a/src/mess/drivers/hh_ucom4.c
+++ b/src/mess/drivers/hh_ucom4.c
@@ -43,6 +43,7 @@
  @209     uPD553C  1982, Tomy Caveman (TN-12)
  @258     uPD553C  1984, Tomy Alien Chase (TN-16)
 
+ *060     uPD650C  1979, Mattel Computer Gin
  *085     uPD650C  1980, Roland TR-808
  *127     uPD650C  198?, Sony OA-S1100 Typecorder (subcpu, have dump)
  *128     uPD650C  1982, Roland TR-606
diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c
index b876678e63d..9733d9ff21a 100644
--- a/src/mess/drivers/homelab.c
+++ b/src/mess/drivers/homelab.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/homez80.c b/src/mess/drivers/homez80.c
index b68ee2b4694..f20a0b9c887 100644
--- a/src/mess/drivers/homez80.c
+++ b/src/mess/drivers/homez80.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Homebrew Z80 Computer by Kun-Szabo Marton
diff --git a/src/mess/drivers/horizon.c b/src/mess/drivers/horizon.c
index 3ccb0be3edd..03cc5fced34 100644
--- a/src/mess/drivers/horizon.c
+++ b/src/mess/drivers/horizon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         NorthStar Horizon
diff --git a/src/mess/drivers/hp16500.c b/src/mess/drivers/hp16500.c
index f5b2866b47d..43b85bada97 100644
--- a/src/mess/drivers/hp16500.c
+++ b/src/mess/drivers/hp16500.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Hewlett-Packard HP16500a/b/c Logic Analyzer
diff --git a/src/mess/drivers/hp48.c b/src/mess/drivers/hp48.c
index 79998f00891..b1234833378 100644
--- a/src/mess/drivers/hp48.c
+++ b/src/mess/drivers/hp48.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2008
diff --git a/src/mess/drivers/hp49gp.c b/src/mess/drivers/hp49gp.c
index 43f4cb15afe..8927a4f40e0 100644
--- a/src/mess/drivers/hp49gp.c
+++ b/src/mess/drivers/hp49gp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Hewlett Packard 49G+ Graphing Calculator
diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c
index 19f612d7513..68bb5b8e5f8 100644
--- a/src/mess/drivers/hp9k.c
+++ b/src/mess/drivers/hp9k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /***************************************************************************
 
diff --git a/src/mess/drivers/hpz80unk.c b/src/mess/drivers/hpz80unk.c
index 1fbd4de95e8..c3b4c9ecdba 100644
--- a/src/mess/drivers/hpz80unk.c
+++ b/src/mess/drivers/hpz80unk.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c
index 17f8916430e..e3b7314cf03 100644
--- a/src/mess/drivers/ht68k.c
+++ b/src/mess/drivers/ht68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Hawthorne Technology TinyGiant HT68k
diff --git a/src/mess/drivers/hunter2.c b/src/mess/drivers/hunter2.c
index 178e6030805..a3d96bf964e 100644
--- a/src/mess/drivers/hunter2.c
+++ b/src/mess/drivers/hunter2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Skeleton driver for Husky Hunter 2
diff --git a/src/mess/drivers/ibm6580.c b/src/mess/drivers/ibm6580.c
index 98d9f65c524..f2c404751e4 100644
--- a/src/mess/drivers/ibm6580.c
+++ b/src/mess/drivers/ibm6580.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/ibmpc.c b/src/mess/drivers/ibmpc.c
index c787bcbf51b..bb83e600e5a 100644
--- a/src/mess/drivers/ibmpc.c
+++ b/src/mess/drivers/ibmpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/pc.c
diff --git a/src/mess/drivers/ibmpcjr.c b/src/mess/drivers/ibmpcjr.c
index 7de1bf95ddf..ef515b2acd8 100644
--- a/src/mess/drivers/ibmpcjr.c
+++ b/src/mess/drivers/ibmpcjr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/i86/i86.h"
 #include "sound/sn76496.h"
diff --git a/src/mess/drivers/ie15.c b/src/mess/drivers/ie15.c
index 08038fd77d9..65386ad7d24 100644
--- a/src/mess/drivers/ie15.c
+++ b/src/mess/drivers/ie15.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     15IE-00-013 Terminal
diff --git a/src/mess/drivers/if800.c b/src/mess/drivers/if800.c
index b7ab25a00ff..0544d0d7d03 100644
--- a/src/mess/drivers/if800.c
+++ b/src/mess/drivers/if800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     if800
diff --git a/src/mess/drivers/imds.c b/src/mess/drivers/imds.c
index 65c4fa36365..0e44a6f6ae9 100644
--- a/src/mess/drivers/imds.c
+++ b/src/mess/drivers/imds.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/imsai.c b/src/mess/drivers/imsai.c
index 68a96c257f3..2fb469a363f 100644
--- a/src/mess/drivers/imsai.c
+++ b/src/mess/drivers/imsai.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c
index f94b78488cb..6229486007c 100644
--- a/src/mess/drivers/indiana.c
+++ b/src/mess/drivers/indiana.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Indiana University 68030 board
diff --git a/src/mess/drivers/instruct.c b/src/mess/drivers/instruct.c
index 92e49f900f9..ae806290293 100644
--- a/src/mess/drivers/instruct.c
+++ b/src/mess/drivers/instruct.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/interact.c b/src/mess/drivers/interact.c
index ce2c9e918da..06e761e8979 100644
--- a/src/mess/drivers/interact.c
+++ b/src/mess/drivers/interact.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Interact Family Computer
diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c
index 0ff310c509c..ba978401e75 100644
--- a/src/mess/drivers/intv.c
+++ b/src/mess/drivers/intv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
  *  Mattel Intellivision + Keyboard Component Drivers
  *
diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c
index d38ba109786..4f6483ae054 100644
--- a/src/mess/drivers/ip20.c
+++ b/src/mess/drivers/ip20.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************\
 *
 *   SGI IP20 IRIS Indigo workstation
diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c
index e418724dea7..923a6f33156 100644
--- a/src/mess/drivers/ip22.c
+++ b/src/mess/drivers/ip22.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************\
 *
 *   SGI IP22 Indigo2/Indy workstation
diff --git a/src/mess/drivers/ipc.c b/src/mess/drivers/ipc.c
index b39657ce4a7..6d4ff45c8c5 100644
--- a/src/mess/drivers/ipc.c
+++ b/src/mess/drivers/ipc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/ipds.c b/src/mess/drivers/ipds.c
index 105315cad95..56490cc442e 100644
--- a/src/mess/drivers/ipds.c
+++ b/src/mess/drivers/ipds.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Intel iPDS
diff --git a/src/mess/drivers/irisha.c b/src/mess/drivers/irisha.c
index 302cf56b87a..092d6b29a0f 100644
--- a/src/mess/drivers/irisha.c
+++ b/src/mess/drivers/irisha.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Irisha driver by Miodrag Milanovic
diff --git a/src/mess/drivers/isbc.c b/src/mess/drivers/isbc.c
index 08b54a8b941..756dd556737 100644
--- a/src/mess/drivers/isbc.c
+++ b/src/mess/drivers/isbc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/iskr103x.c b/src/mess/drivers/iskr103x.c
index 7777cc84f1f..983c568f76c 100644
--- a/src/mess/drivers/iskr103x.c
+++ b/src/mess/drivers/iskr103x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/iskr103x.c
diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c
index 5d9aa417b6c..740e95f1572 100644
--- a/src/mess/drivers/itt3030.c
+++ b/src/mess/drivers/itt3030.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     ITT 3030
diff --git a/src/mess/drivers/jade.c b/src/mess/drivers/jade.c
index e2403d4335a..cff387a77f3 100644
--- a/src/mess/drivers/jade.c
+++ b/src/mess/drivers/jade.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/jonos.c b/src/mess/drivers/jonos.c
index aceae2fcd88..a65b4667602 100644
--- a/src/mess/drivers/jonos.c
+++ b/src/mess/drivers/jonos.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c
index 9347346ac76..5483173223c 100644
--- a/src/mess/drivers/jr100.c
+++ b/src/mess/drivers/jr100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         JR-100 National / Panasonic
diff --git a/src/mess/drivers/jtc.c b/src/mess/drivers/jtc.c
index 6c30cf0d322..6d33438ea41 100644
--- a/src/mess/drivers/jtc.c
+++ b/src/mess/drivers/jtc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Jugend+Technik CompJU+TEr
diff --git a/src/mess/drivers/juicebox.c b/src/mess/drivers/juicebox.c
index fe30d5ef525..c73bd03dfdc 100644
--- a/src/mess/drivers/juicebox.c
+++ b/src/mess/drivers/juicebox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Mattel Juice Box
diff --git a/src/mess/drivers/junior.c b/src/mess/drivers/junior.c
index 81dcaad705a..e6c736adcde 100644
--- a/src/mess/drivers/junior.c
+++ b/src/mess/drivers/junior.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Elektor Junior
diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c
index 6ecaf58ec08..0d1cf806201 100644
--- a/src/mess/drivers/jupiter.c
+++ b/src/mess/drivers/jupiter.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
 Wave Mate Jupiter
diff --git a/src/mess/drivers/k1003.c b/src/mess/drivers/k1003.c
index 0cd35eaee84..55fd452239c 100644
--- a/src/mess/drivers/k1003.c
+++ b/src/mess/drivers/k1003.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Robotron K1003
diff --git a/src/mess/drivers/k8915.c b/src/mess/drivers/k8915.c
index d28d3c8ebc0..b630438d196 100644
--- a/src/mess/drivers/k8915.c
+++ b/src/mess/drivers/k8915.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c
index f334fb512b9..923fb65c0a7 100644
--- a/src/mess/drivers/kaypro.c
+++ b/src/mess/drivers/kaypro.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /*************************************************************************************************
 
diff --git a/src/mess/drivers/kim1.c b/src/mess/drivers/kim1.c
index 97ea902bdcd..16fd5658477 100644
--- a/src/mess/drivers/kim1.c
+++ b/src/mess/drivers/kim1.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
     KIM-1
 
diff --git a/src/mess/drivers/konin.c b/src/mess/drivers/konin.c
index 5bd942ada78..e6832b3b6bd 100644
--- a/src/mess/drivers/konin.c
+++ b/src/mess/drivers/konin.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/korgm1.c b/src/mess/drivers/korgm1.c
index daf21268230..cab3e9d6c2c 100644
--- a/src/mess/drivers/korgm1.c
+++ b/src/mess/drivers/korgm1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Korg M1 (c) 1988
diff --git a/src/mess/drivers/kramermc.c b/src/mess/drivers/kramermc.c
index 925b03a77ad..59d47d01ea3 100644
--- a/src/mess/drivers/kramermc.c
+++ b/src/mess/drivers/kramermc.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Kramer MC driver by Miodrag Milanovic
diff --git a/src/mess/drivers/laser3k.c b/src/mess/drivers/laser3k.c
index 819a52f276d..b681158d7ab 100644
--- a/src/mess/drivers/laser3k.c
+++ b/src/mess/drivers/laser3k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   laser3k.c
diff --git a/src/mess/drivers/leapster.c b/src/mess/drivers/leapster.c
index 5b71e821a6d..a50c71e6d58 100644
--- a/src/mess/drivers/leapster.c
+++ b/src/mess/drivers/leapster.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     LeapFrog - Leapster
 
diff --git a/src/mess/drivers/lft.c b/src/mess/drivers/lft.c
index f9638126007..9953f5635e5 100644
--- a/src/mess/drivers/lft.c
+++ b/src/mess/drivers/lft.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/lisa.c b/src/mess/drivers/lisa.c
index 3827d7406ca..ccddd5d802f 100644
--- a/src/mess/drivers/lisa.c
+++ b/src/mess/drivers/lisa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     drivers/lisa.c
diff --git a/src/mess/drivers/llc.c b/src/mess/drivers/llc.c
index 6396592e6d7..cc9a620cae7 100644
--- a/src/mess/drivers/llc.c
+++ b/src/mess/drivers/llc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /******************************************************************************
 
diff --git a/src/mess/drivers/lola8a.c b/src/mess/drivers/lola8a.c
index 80170fbf2ac..5c73d2ffac6 100644
--- a/src/mess/drivers/lola8a.c
+++ b/src/mess/drivers/lola8a.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/lviv.c b/src/mess/drivers/lviv.c
index 6f907c01be1..5e3218e4fff 100644
--- a/src/mess/drivers/lviv.c
+++ b/src/mess/drivers/lviv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 PK-01 Lviv driver by Krzysztof Strzecha
diff --git a/src/mess/drivers/lynx.c b/src/mess/drivers/lynx.c
index edca9626e0e..f1465e33121 100644
--- a/src/mess/drivers/lynx.c
+++ b/src/mess/drivers/lynx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT peter.trauner@utanet.at 2000,2001
 
diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c
index ba13f0f1802..8d0e2a01983 100644
--- a/src/mess/drivers/m20.c
+++ b/src/mess/drivers/m20.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
  Olivetti M20 skeleton driver, by incog (19/05/2009)
diff --git a/src/mess/drivers/m24.c b/src/mess/drivers/m24.c
index 5f7ac2572e5..42e7d4ff0ff 100644
--- a/src/mess/drivers/m24.c
+++ b/src/mess/drivers/m24.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "cpu/i86/i86.h"
diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c
index 43dae72ef96..5da25335e58 100644
--- a/src/mess/drivers/m5.c
+++ b/src/mess/drivers/m5.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sord m.5
diff --git a/src/mess/drivers/m6805evs.c b/src/mess/drivers/m6805evs.c
index 67f2f5fa3a5..20c9d4a72e7 100644
--- a/src/mess/drivers/m6805evs.c
+++ b/src/mess/drivers/m6805evs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************************************
 
 Motorola M68HC05EVS evaluation system
diff --git a/src/mess/drivers/m79152pc.c b/src/mess/drivers/m79152pc.c
index fb70bf986ef..c65846ba1ac 100644
--- a/src/mess/drivers/m79152pc.c
+++ b/src/mess/drivers/m79152pc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Mera-Elzab 79152pc
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 1c0c4ad0380..65cdb2711ca 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Nathan Woods, Raphael Nabet, R. Belmont
 /****************************************************************************
 
     drivers/mac.c
diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c
index 83799f85b06..e0f1971a439 100644
--- a/src/mess/drivers/mbc200.c
+++ b/src/mess/drivers/mbc200.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Sanyo MBC-200
diff --git a/src/mess/drivers/mbc55x.c b/src/mess/drivers/mbc55x.c
index 94b2c53538f..03272694df8 100644
--- a/src/mess/drivers/mbc55x.c
+++ b/src/mess/drivers/mbc55x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     drivers/mbc55x.c
 
diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c
index 0f5150c02d4..9d8c179a872 100644
--- a/src/mess/drivers/mbee.c
+++ b/src/mess/drivers/mbee.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:GPL-2.0+
 // copyright-holders:Juergen Buchmueller, Robbbert
 /***************************************************************************
     microbee.c
diff --git a/src/mess/drivers/mc10.c b/src/mess/drivers/mc10.c
index 97b7818822f..d635e1d0751 100644
--- a/src/mess/drivers/mc10.c
+++ b/src/mess/drivers/mc10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     TRS-80 Radio Shack MicroColor Computer
diff --git a/src/mess/drivers/mc1502.c b/src/mess/drivers/mc1502.c
index 7ee666e6270..a56b0cbc1f7 100644
--- a/src/mess/drivers/mc1502.c
+++ b/src/mess/drivers/mc1502.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/mc1502.c
diff --git a/src/mess/drivers/mc80.c b/src/mess/drivers/mc80.c
index dfff6e6ad58..2592bafda83 100644
--- a/src/mess/drivers/mc80.c
+++ b/src/mess/drivers/mc80.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         MC-80.xx driver by Miodrag Milanovic
diff --git a/src/mess/drivers/mcb216.c b/src/mess/drivers/mcb216.c
index 63c97c1bec7..931042455b6 100644
--- a/src/mess/drivers/mcb216.c
+++ b/src/mess/drivers/mcb216.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/mccpm.c b/src/mess/drivers/mccpm.c
index 62b91b565cb..e4fa13b6cea 100644
--- a/src/mess/drivers/mccpm.c
+++ b/src/mess/drivers/mccpm.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c
index 03b6fa38ded..85b95885adc 100644
--- a/src/mess/drivers/megadriv.c
+++ b/src/mess/drivers/megadriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "includes/md_cons.h"
diff --git a/src/mess/drivers/mekd2.c b/src/mess/drivers/mekd2.c
index 73237f523df..8bac598dea0 100644
--- a/src/mess/drivers/mekd2.c
+++ b/src/mess/drivers/mekd2.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:GPL-2.0+
 // copyright-holders:Juergen Buchmueller, Robbbert
 /******************************************************************************
     Motorola Evaluation Kit 6800 D2
diff --git a/src/mess/drivers/mephisto.c b/src/mess/drivers/mephisto.c
index 3f18be1ce77..f24fcea6039 100644
--- a/src/mess/drivers/mephisto.c
+++ b/src/mess/drivers/mephisto.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  Mephisto 4 + 5 Chess Computer
  2007 Dirk V.
diff --git a/src/mess/drivers/mes.c b/src/mess/drivers/mes.c
index 9674d45c1ec..54359486ac7 100644
--- a/src/mess/drivers/mes.c
+++ b/src/mess/drivers/mes.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/mice.c b/src/mess/drivers/mice.c
index 00b32eed9e4..492208fc0ee 100644
--- a/src/mess/drivers/mice.c
+++ b/src/mess/drivers/mice.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/microdec.c b/src/mess/drivers/microdec.c
index d9de20a4a91..b0d3809d2d8 100644
--- a/src/mess/drivers/microdec.c
+++ b/src/mess/drivers/microdec.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Morrow Designs Micro Decision
diff --git a/src/mess/drivers/microtan.c b/src/mess/drivers/microtan.c
index 327b6710b64..5503e3285e8 100644
--- a/src/mess/drivers/microtan.c
+++ b/src/mess/drivers/microtan.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
  *  Microtan 65
  *
diff --git a/src/mess/drivers/microvsn.c b/src/mess/drivers/microvsn.c
index d3264f4eac4..6b39b82845f 100644
--- a/src/mess/drivers/microvsn.c
+++ b/src/mess/drivers/microvsn.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Milton Bradley MicroVision
diff --git a/src/mess/drivers/mikro80.c b/src/mess/drivers/mikro80.c
index 9556fa33732..178be26ce25 100644
--- a/src/mess/drivers/mikro80.c
+++ b/src/mess/drivers/mikro80.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         MIKRO80 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/mikrosha.c b/src/mess/drivers/mikrosha.c
index 396400fd9f7..8320400b4de 100644
--- a/src/mess/drivers/mikrosha.c
+++ b/src/mess/drivers/mikrosha.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Mikrosha driver by Miodrag Milanovic
diff --git a/src/mess/drivers/mini2440.c b/src/mess/drivers/mini2440.c
index 851d5991a9c..607a831c023 100644
--- a/src/mess/drivers/mini2440.c
+++ b/src/mess/drivers/mini2440.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     FriendlyARM Mini2440
diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c
index b09a9ae217f..8f513098f33 100644
--- a/src/mess/drivers/mirage.c
+++ b/src/mess/drivers/mirage.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/mirage.c
diff --git a/src/mess/drivers/mits680b.c b/src/mess/drivers/mits680b.c
index 56c94bb9ae0..2d9119e109c 100644
--- a/src/mess/drivers/mits680b.c
+++ b/src/mess/drivers/mits680b.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/mk1.c b/src/mess/drivers/mk1.c
index 71cab247108..968db42574a 100644
--- a/src/mess/drivers/mk1.c
+++ b/src/mess/drivers/mk1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   mk1.c
diff --git a/src/mess/drivers/mk14.c b/src/mess/drivers/mk14.c
index 9927ef7e070..a62c66af03f 100644
--- a/src/mess/drivers/mk14.c
+++ b/src/mess/drivers/mk14.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Science of Cambridge MK-14
diff --git a/src/mess/drivers/mk2.c b/src/mess/drivers/mk2.c
index 878bb3fb4f9..d0b55b65ac2 100644
--- a/src/mess/drivers/mk2.c
+++ b/src/mess/drivers/mk2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT mess@utanet.at September 2000
 
diff --git a/src/mess/drivers/mk85.c b/src/mess/drivers/mk85.c
index 31c3c23d8e3..f2c3c092a34 100644
--- a/src/mess/drivers/mk85.c
+++ b/src/mess/drivers/mk85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Elektronika MK-85
diff --git a/src/mess/drivers/mk90.c b/src/mess/drivers/mk90.c
index c3309486fd2..d1f94c2a71b 100644
--- a/src/mess/drivers/mk90.c
+++ b/src/mess/drivers/mk90.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Elektronika MK-90
diff --git a/src/mess/drivers/mkit09.c b/src/mess/drivers/mkit09.c
index 67980f8a51b..1e39600ecd1 100644
--- a/src/mess/drivers/mkit09.c
+++ b/src/mess/drivers/mkit09.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/mmd1.c b/src/mess/drivers/mmd1.c
index 9ba8d15f758..345e34d4aa7 100644
--- a/src/mess/drivers/mmd1.c
+++ b/src/mess/drivers/mmd1.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index 84031b3589d..d8c294844ac 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  Mephisto Chess Computers using plugin modules
 
diff --git a/src/mess/drivers/mod8.c b/src/mess/drivers/mod8.c
index 4a4c47d7afe..7ebe6c03803 100644
--- a/src/mess/drivers/mod8.c
+++ b/src/mess/drivers/mod8.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
 Microsystems International Limited MOD-8
diff --git a/src/mess/drivers/modellot.c b/src/mess/drivers/modellot.c
index f3d8d2f9804..7a0c2cb38be 100644
--- a/src/mess/drivers/modellot.c
+++ b/src/mess/drivers/modellot.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /**********************************************************************************
 
diff --git a/src/mess/drivers/mpf1.c b/src/mess/drivers/mpf1.c
index 583eddf0e3f..63fd9c2ecc4 100644
--- a/src/mess/drivers/mpf1.c
+++ b/src/mess/drivers/mpf1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************\
 * Multitech Micro Professor 1                    *
 *                                                *
diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c
index 493b15a43fd..36dd324743f 100644
--- a/src/mess/drivers/ms0515.c
+++ b/src/mess/drivers/ms0515.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Elektronika MS-0515
diff --git a/src/mess/drivers/ms9540.c b/src/mess/drivers/ms9540.c
index b5fd4dca4a6..542de9941bb 100644
--- a/src/mess/drivers/ms9540.c
+++ b/src/mess/drivers/ms9540.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/msbc1.c b/src/mess/drivers/msbc1.c
index 137887c0b18..eae16c6fb19 100644
--- a/src/mess/drivers/msbc1.c
+++ b/src/mess/drivers/msbc1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Omnibyte MSBC-1
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index f5e7014d255..5c7b68ed745 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** msx.c : driver for MSX
 **
diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c
index 82ac5684e27..9e6b5b1049a 100644
--- a/src/mess/drivers/mtx.c
+++ b/src/mess/drivers/mtx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Memotech MTX 500, MTX 512 and RS 128
diff --git a/src/mess/drivers/multi16.c b/src/mess/drivers/multi16.c
index fb96621bf98..f94084494ff 100644
--- a/src/mess/drivers/multi16.c
+++ b/src/mess/drivers/multi16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Mitsubishi Multi 16
diff --git a/src/mess/drivers/mx2178.c b/src/mess/drivers/mx2178.c
index 18fb00807dc..43f87f90dfd 100644
--- a/src/mess/drivers/mx2178.c
+++ b/src/mess/drivers/mx2178.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************************
 
     Skeleton driver for Memorex 2178
diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c
index 7d1e135b62e..be5e44bff65 100644
--- a/src/mess/drivers/mycom.c
+++ b/src/mess/drivers/mycom.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Angelo Salese, Robbbert
 /******************************************************************************
 
diff --git a/src/mess/drivers/mz6500.c b/src/mess/drivers/mz6500.c
index 3657f59b2d7..6adcd8726ca 100644
--- a/src/mess/drivers/mz6500.c
+++ b/src/mess/drivers/mz6500.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sharp MZ-6500
diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c
index 335e595377f..94666bbf942 100644
--- a/src/mess/drivers/mz700.c
+++ b/src/mess/drivers/mz700.c
@@ -1,9 +1,8 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Dirk Best
 /******************************************************************************
  *  Sharp MZ700
  *
- *  license: MAME
- *  copyright-holders: Juergen Buchmueller, Dirk Best
- *
  *  Reference: http://sharpmz.computingmuseum.com
  *
  *  MZ700 memory map
diff --git a/src/mess/drivers/mz80.c b/src/mess/drivers/mz80.c
index 32ce5014b1a..3531471e896 100644
--- a/src/mess/drivers/mz80.c
+++ b/src/mess/drivers/mz80.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         MZ80 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c
index d7e799a13b3..4be93643247 100644
--- a/src/mess/drivers/nanos.c
+++ b/src/mess/drivers/nanos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Nanos
diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c
index 52d224cc664..9cfbd025208 100644
--- a/src/mess/drivers/nascom1.c
+++ b/src/mess/drivers/nascom1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 
     Nascom 1 and Nascom 2
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index 6e1e1d108a7..c035258decf 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
         nc.c
diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c
index 48904369ecf..e86be383d54 100644
--- a/src/mess/drivers/nes.c
+++ b/src/mess/drivers/nes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nes.c
diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c
index 0bc8d5031ee..f2a497b302b 100644
--- a/src/mess/drivers/next.c
+++ b/src/mess/drivers/next.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NeXT
diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c
index 3762c1189e8..3da773cd484 100644
--- a/src/mess/drivers/ng_aes.c
+++ b/src/mess/drivers/ng_aes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Neo-Geo AES hardware
diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c
index f89bb6366d9..3787bb4d8f8 100644
--- a/src/mess/drivers/ngen.c
+++ b/src/mess/drivers/ngen.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Convergent NGen series
diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c
index 13c0ef74b03..1335df835b2 100644
--- a/src/mess/drivers/ngp.c
+++ b/src/mess/drivers/ngp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 SNK NeoGeo Pocket driver
diff --git a/src/mess/drivers/octopus.c b/src/mess/drivers/octopus.c
index 8d82424ab46..53797e12add 100644
--- a/src/mess/drivers/octopus.c
+++ b/src/mess/drivers/octopus.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/odyssey2.c b/src/mess/drivers/odyssey2.c
index 3d1e22a28ec..e898a31f1dd 100644
--- a/src/mess/drivers/odyssey2.c
+++ b/src/mess/drivers/odyssey2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   /drivers/odyssey2.c
diff --git a/src/mess/drivers/okean240.c b/src/mess/drivers/okean240.c
index b05264faa8f..16a7ede8d3b 100644
--- a/src/mess/drivers/okean240.c
+++ b/src/mess/drivers/okean240.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/ondra.c b/src/mess/drivers/ondra.c
index 899e13514b6..7631a89b702 100644
--- a/src/mess/drivers/ondra.c
+++ b/src/mess/drivers/ondra.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Ondra driver by Miodrag Milanovic
diff --git a/src/mess/drivers/onyx.c b/src/mess/drivers/onyx.c
index 38547a88264..2dff610ef4d 100644
--- a/src/mess/drivers/onyx.c
+++ b/src/mess/drivers/onyx.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***********************************************************************************************
 
diff --git a/src/mess/drivers/orao.c b/src/mess/drivers/orao.c
index ca9bd1aeb8c..83fa8642b6a 100644
--- a/src/mess/drivers/orao.c
+++ b/src/mess/drivers/orao.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Orao driver by Miodrag Milanovic
diff --git a/src/mess/drivers/oric.c b/src/mess/drivers/oric.c
index ad58d6d8346..0f413befe13 100644
--- a/src/mess/drivers/oric.c
+++ b/src/mess/drivers/oric.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     drivers/oric.c
diff --git a/src/mess/drivers/orion.c b/src/mess/drivers/orion.c
index 69c2c5da82c..40752d62d3d 100644
--- a/src/mess/drivers/orion.c
+++ b/src/mess/drivers/orion.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Orion driver by Miodrag Milanovic
diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c
index 05a92102742..94884e6ce88 100644
--- a/src/mess/drivers/osbexec.c
+++ b/src/mess/drivers/osbexec.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Osborne Executive driver file
diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c
index 50c19ace0ff..316fd6386b1 100644
--- a/src/mess/drivers/osborne1.c
+++ b/src/mess/drivers/osborne1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Osborne-1 driver file
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index 588153d2322..80662d11b0c 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Ohio Scientific Superboard II Model 600
diff --git a/src/mess/drivers/p112.c b/src/mess/drivers/p112.c
index 03b8cae2baa..ada25de1983 100644
--- a/src/mess/drivers/p112.c
+++ b/src/mess/drivers/p112.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/p2000t.c b/src/mess/drivers/p2000t.c
index 92631f3240d..7b24b7971da 100644
--- a/src/mess/drivers/p2000t.c
+++ b/src/mess/drivers/p2000t.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************
 Philips P2000 1 Memory map
 
diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c
index a2775e691f3..eea7bddf769 100644
--- a/src/mess/drivers/p8k.c
+++ b/src/mess/drivers/p8k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     P8000
diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c
index 46d60af64cb..9233e96c623 100644
--- a/src/mess/drivers/palm.c
+++ b/src/mess/drivers/palm.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     drivers/palm.c
diff --git a/src/mess/drivers/palm_dbg.inc b/src/mess/drivers/palm_dbg.inc
index 6e78a5cc244..28a267fb6d0 100644
--- a/src/mess/drivers/palm_dbg.inc
+++ b/src/mess/drivers/palm_dbg.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 static const char *lookup_trap(UINT16 opcode)
 {
 	static const struct
diff --git a/src/mess/drivers/palmz22.c b/src/mess/drivers/palmz22.c
index a29a510811a..4a716f7a7d0 100644
--- a/src/mess/drivers/palmz22.c
+++ b/src/mess/drivers/palmz22.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     Palm Z22
diff --git a/src/mess/drivers/partner.c b/src/mess/drivers/partner.c
index 09507338f14..27ed71a4c43 100644
--- a/src/mess/drivers/partner.c
+++ b/src/mess/drivers/partner.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Partner driver by Miodrag Milanovic
diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c
index 3720c89acdf..370e92792bd 100644
--- a/src/mess/drivers/paso1600.c
+++ b/src/mess/drivers/paso1600.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba Pasopia 1600
diff --git a/src/mess/drivers/pasogo.c b/src/mess/drivers/pasogo.c
index 49b404d548f..f5379ae8165 100644
--- a/src/mess/drivers/pasogo.c
+++ b/src/mess/drivers/pasogo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
 Pasogo Handheld Console
diff --git a/src/mess/drivers/pasopia.c b/src/mess/drivers/pasopia.c
index e8a1a33123d..f74f421b450 100644
--- a/src/mess/drivers/pasopia.c
+++ b/src/mess/drivers/pasopia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Toshiba Pasopia
diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c
index 83b43a41abc..a133f511a15 100644
--- a/src/mess/drivers/pc.c
+++ b/src/mess/drivers/pc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/pc.c
diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c
index cc717e1e5ba..9b75bfd6a2e 100644
--- a/src/mess/drivers/pcd.c
+++ b/src/mess/drivers/pcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Siemens PC-D
diff --git a/src/mess/drivers/pcfx.c b/src/mess/drivers/pcfx.c
index 3853db4bb2a..9cb97a55d05 100644
--- a/src/mess/drivers/pcfx.c
+++ b/src/mess/drivers/pcfx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   pcfx.c
diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c
index 1f27cbb5136..ee4024b4b02 100644
--- a/src/mess/drivers/pcm.c
+++ b/src/mess/drivers/pcm.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c
index 42210a6efb8..0b897cf1bf9 100644
--- a/src/mess/drivers/pcw.c
+++ b/src/mess/drivers/pcw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     pcw.c
diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c
index bd65b589d94..5bc4704bca0 100644
--- a/src/mess/drivers/pcw16.c
+++ b/src/mess/drivers/pcw16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
     pcw16.c
diff --git a/src/mess/drivers/pdp1.c b/src/mess/drivers/pdp1.c
index 03f41c1c99d..59fbe85d8e0 100644
--- a/src/mess/drivers/pdp1.c
+++ b/src/mess/drivers/pdp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Driver for a PDP1 emulator.
diff --git a/src/mess/drivers/pdp11.c b/src/mess/drivers/pdp11.c
index 054befeace3..1a89a63220a 100644
--- a/src/mess/drivers/pdp11.c
+++ b/src/mess/drivers/pdp11.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         PDP-11
diff --git a/src/mess/drivers/pecom.c b/src/mess/drivers/pecom.c
index 8509dd03681..7bb5ad07aec 100644
--- a/src/mess/drivers/pecom.c
+++ b/src/mess/drivers/pecom.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c
index b39777f045c..d6d15b3fafd 100644
--- a/src/mess/drivers/pegasus.c
+++ b/src/mess/drivers/pegasus.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pencil2.c b/src/mess/drivers/pencil2.c
index 542dda2d50a..bde1c817f9c 100644
--- a/src/mess/drivers/pencil2.c
+++ b/src/mess/drivers/pencil2.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pentagon.c b/src/mess/drivers/pentagon.c
index d333e057c2f..3ecab8793c8 100644
--- a/src/mess/drivers/pentagon.c
+++ b/src/mess/drivers/pentagon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/spectrum.h"
 #include "imagedev/snapquik.h"
diff --git a/src/mess/drivers/phunsy.c b/src/mess/drivers/phunsy.c
index bdc7fe39949..eb19d3fa54c 100644
--- a/src/mess/drivers/phunsy.c
+++ b/src/mess/drivers/phunsy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     PHUNSY (Philipse Universal System)
diff --git a/src/mess/drivers/pimps.c b/src/mess/drivers/pimps.c
index 57fc45ea6b9..05728b6062b 100644
--- a/src/mess/drivers/pimps.c
+++ b/src/mess/drivers/pimps.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         P.I.M.P.S. (Personal Interactive MicroProcessor System)
diff --git a/src/mess/drivers/pipbug.c b/src/mess/drivers/pipbug.c
index aeee886d7c2..cb579256947 100644
--- a/src/mess/drivers/pipbug.c
+++ b/src/mess/drivers/pipbug.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pitagjr.c b/src/mess/drivers/pitagjr.c
index b372f1046d3..25ccd0e9e65 100644
--- a/src/mess/drivers/pitagjr.c
+++ b/src/mess/drivers/pitagjr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************************
 
     Product name:    Pitagorin Junior.
diff --git a/src/mess/drivers/pk8000.c b/src/mess/drivers/pk8000.c
index bd4512f9784..c567a0756af 100644
--- a/src/mess/drivers/pk8000.c
+++ b/src/mess/drivers/pk8000.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pk8020.c b/src/mess/drivers/pk8020.c
index bc34ea6d580..e238baf7b3c 100644
--- a/src/mess/drivers/pk8020.c
+++ b/src/mess/drivers/pk8020.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         PK-8020 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/plan80.c b/src/mess/drivers/plan80.c
index fcb206c2241..240e924f138 100644
--- a/src/mess/drivers/plan80.c
+++ b/src/mess/drivers/plan80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pm68k.c b/src/mess/drivers/pm68k.c
index 67acb11ebd0..e6175cc91af 100644
--- a/src/mess/drivers/pm68k.c
+++ b/src/mess/drivers/pm68k.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pmd85.c b/src/mess/drivers/pmd85.c
index a381fca21cf..2e9af245dcd 100644
--- a/src/mess/drivers/pmd85.c
+++ b/src/mess/drivers/pmd85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 PMD-85 driver by Krzysztof Strzecha
diff --git a/src/mess/drivers/pmi80.c b/src/mess/drivers/pmi80.c
index 3eda8d03c22..a90e258dcc9 100644
--- a/src/mess/drivers/pmi80.c
+++ b/src/mess/drivers/pmi80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pocketc.c b/src/mess/drivers/pocketc.c
index 01414be1f2b..fc93f48b539 100644
--- a/src/mess/drivers/pocketc.c
+++ b/src/mess/drivers/pocketc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  sharp pocket computers
  pc1401/pc1403
diff --git a/src/mess/drivers/pockstat.c b/src/mess/drivers/pockstat.c
index fe1cf24052e..7dd293c636e 100644
--- a/src/mess/drivers/pockstat.c
+++ b/src/mess/drivers/pockstat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Sony PocketStation
diff --git a/src/mess/drivers/poisk1.c b/src/mess/drivers/poisk1.c
index fee8029ddfa..7ccd7c99f2a 100644
--- a/src/mess/drivers/poisk1.c
+++ b/src/mess/drivers/poisk1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     drivers/poisk1.c
diff --git a/src/mess/drivers/pokemini.c b/src/mess/drivers/pokemini.c
index a12452db818..f0e05aba61d 100644
--- a/src/mess/drivers/pokemini.c
+++ b/src/mess/drivers/pokemini.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /********************************************************************
 
 Driver file to handle emulation of the Nintendo Pokemon Mini handheld
diff --git a/src/mess/drivers/poly.c b/src/mess/drivers/poly.c
index 5e97037f6d1..2dfa11de7ce 100644
--- a/src/mess/drivers/poly.c
+++ b/src/mess/drivers/poly.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/poly88.c b/src/mess/drivers/poly88.c
index bc1506fbaf4..10de186fd15 100644
--- a/src/mess/drivers/poly88.c
+++ b/src/mess/drivers/poly88.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/pp01.c b/src/mess/drivers/pp01.c
index 06f10ce7492..13f6bf63fa0 100644
--- a/src/mess/drivers/pp01.c
+++ b/src/mess/drivers/pp01.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/primo.c b/src/mess/drivers/primo.c
index dc692d29436..7d859919f45 100644
--- a/src/mess/drivers/primo.c
+++ b/src/mess/drivers/primo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
 Primo driver by Krzysztof Strzecha
diff --git a/src/mess/drivers/pro80.c b/src/mess/drivers/pro80.c
index 4e0cabd3121..9a0f4d19a62 100644
--- a/src/mess/drivers/pro80.c
+++ b/src/mess/drivers/pro80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Protec Pro-80
diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c
index 9d9948ed35e..1acbea932ea 100644
--- a/src/mess/drivers/psx.c
+++ b/src/mess/drivers/psx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Sony Playstaion
diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c
index ec567924bf1..34dcd687d47 100644
--- a/src/mess/drivers/pt68k4.c
+++ b/src/mess/drivers/pt68k4.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert, R. Belmont
 /***************************************************************************
 
diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c
index b6bb28d29e7..bf3afcb02fd 100644
--- a/src/mess/drivers/ptcsol.c
+++ b/src/mess/drivers/ptcsol.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pulsar.c b/src/mess/drivers/pulsar.c
index 3d61ef572b7..a8f5f17c9a8 100644
--- a/src/mess/drivers/pulsar.c
+++ b/src/mess/drivers/pulsar.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index ea9fdfe7343..bef1650ce69 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Driver for Casio PV-1000
diff --git a/src/mess/drivers/pv2000.c b/src/mess/drivers/pv2000.c
index 11719fdb074..e95651458c8 100644
--- a/src/mess/drivers/pv2000.c
+++ b/src/mess/drivers/pv2000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 CASIO PV-2000
diff --git a/src/mess/drivers/pv9234.c b/src/mess/drivers/pv9234.c
index fd20421e033..42f8f49f95e 100644
--- a/src/mess/drivers/pv9234.c
+++ b/src/mess/drivers/pv9234.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 PowerVu D9234 STB (c) 1997 Scientific Atlanta
diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c
index 46dd71d6e36..7e9b471cff7 100644
--- a/src/mess/drivers/px4.c
+++ b/src/mess/drivers/px4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Epson PX-4
diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c
index 662a1bfeba3..31ae8e2cc8c 100644
--- a/src/mess/drivers/px8.c
+++ b/src/mess/drivers/px8.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Epson PX-8
diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c
index b5c1e50812a..3073d635e20 100644
--- a/src/mess/drivers/pyl601.c
+++ b/src/mess/drivers/pyl601.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/qtsbc.c b/src/mess/drivers/qtsbc.c
index 7c653e211c0..b73201b765b 100644
--- a/src/mess/drivers/qtsbc.c
+++ b/src/mess/drivers/qtsbc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c
index 3448e7da5db..96a9332e422 100644
--- a/src/mess/drivers/qx10.c
+++ b/src/mess/drivers/qx10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     QX-10
diff --git a/src/mess/drivers/radio86.c b/src/mess/drivers/radio86.c
index b19c6b2a59f..c1b08bed357 100644
--- a/src/mess/drivers/radio86.c
+++ b/src/mess/drivers/radio86.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Radio-86RK driver by Miodrag Milanovic
diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c
index 4dc0661f2b2..af28ceddcc8 100644
--- a/src/mess/drivers/rainbow.c
+++ b/src/mess/drivers/rainbow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:Miodrag Milanovic,Karl-Ludwig Deisenhofer
 /***************************************************************************************************
 DEC Rainbow 100
 
diff --git a/src/mess/drivers/ravens.c b/src/mess/drivers/ravens.c
index 6ddc78ee326..995860708d5 100644
--- a/src/mess/drivers/ravens.c
+++ b/src/mess/drivers/ravens.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/rd110.c b/src/mess/drivers/rd110.c
index 0ad35df1eec..b736429b877 100644
--- a/src/mess/drivers/rd110.c
+++ b/src/mess/drivers/rd110.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************
 
     Roland D-110 driver
diff --git a/src/mess/drivers/rm380z.c b/src/mess/drivers/rm380z.c
index a82a4ddbcdb..f593f03cd5c 100644
--- a/src/mess/drivers/rm380z.c
+++ b/src/mess/drivers/rm380z.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
 Research Machines 380Z (aka "RML 380Z" or "RM 380Z")
diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c
index 3e7018ce246..81e6363016a 100644
--- a/src/mess/drivers/rmnimbus.c
+++ b/src/mess/drivers/rmnimbus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     drivers/rmnimbus.c
 
diff --git a/src/mess/drivers/rmt32.c b/src/mess/drivers/rmt32.c
index 3b553829b63..7f629df52d1 100644
--- a/src/mess/drivers/rmt32.c
+++ b/src/mess/drivers/rmt32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************
 
     Roland MT-32/CM32L driver
diff --git a/src/mess/drivers/rsc55.c b/src/mess/drivers/rsc55.c
index e10fccfc104..535ae236752 100644
--- a/src/mess/drivers/rsc55.c
+++ b/src/mess/drivers/rsc55.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************************
 
     Roland Sound Canvas SC-55
diff --git a/src/mess/drivers/rt1715.c b/src/mess/drivers/rt1715.c
index fdf27fac0a4..a27b65b16d1 100644
--- a/src/mess/drivers/rt1715.c
+++ b/src/mess/drivers/rt1715.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Robotron PC-1715
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index c12443405d6..be2f20e388b 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Angelo Salese, Robbbert
 /************************************************************************************************************
 
diff --git a/src/mess/drivers/sacstate.c b/src/mess/drivers/sacstate.c
index a0becf6755b..00c201ee0ae 100644
--- a/src/mess/drivers/sacstate.c
+++ b/src/mess/drivers/sacstate.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         SacState 8008
diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c
index 512ed86cd10..ba5cdfbf1ac 100644
--- a/src/mess/drivers/samcoupe.c
+++ b/src/mess/drivers/samcoupe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Miles Gordon Technology SAM Coupe
diff --git a/src/mess/drivers/sapi1.c b/src/mess/drivers/sapi1.c
index b41318516c4..9b300ce4500 100644
--- a/src/mess/drivers/sapi1.c
+++ b/src/mess/drivers/sapi1.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/savia84.c b/src/mess/drivers/savia84.c
index 295e2b64f8f..6e06c4fd377 100644
--- a/src/mess/drivers/savia84.c
+++ b/src/mess/drivers/savia84.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/sbc6510.c b/src/mess/drivers/sbc6510.c
index a7fb0cf335c..026c93f6ffb 100644
--- a/src/mess/drivers/sbc6510.c
+++ b/src/mess/drivers/sbc6510.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/sbrain.c b/src/mess/drivers/sbrain.c
index f0956d533aa..e3289de2868 100644
--- a/src/mess/drivers/sbrain.c
+++ b/src/mess/drivers/sbrain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************************************************************
 
 Intertec SuperBrain
diff --git a/src/mess/drivers/scorpion.c b/src/mess/drivers/scorpion.c
index 9db96b9b94d..9b853673188 100644
--- a/src/mess/drivers/scorpion.c
+++ b/src/mess/drivers/scorpion.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NOTE: ****** Specbusy: press N, R, or E to boot *************
diff --git a/src/mess/drivers/scv.c b/src/mess/drivers/scv.c
index f14e795a0cc..5018d844f6e 100644
--- a/src/mess/drivers/scv.c
+++ b/src/mess/drivers/scv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Driver for Epoch Super Cassette Vision
diff --git a/src/mess/drivers/sdk85.c b/src/mess/drivers/sdk85.c
index 0c03ae1423b..7eccae8bc42 100644
--- a/src/mess/drivers/sdk85.c
+++ b/src/mess/drivers/sdk85.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/sdk86.c b/src/mess/drivers/sdk86.c
index 5b8f2a6bcbb..72f144c2eae 100644
--- a/src/mess/drivers/sdk86.c
+++ b/src/mess/drivers/sdk86.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/seattle.c b/src/mess/drivers/seattle.c
index 59caa8ad893..12097b5a403 100644
--- a/src/mess/drivers/seattle.c
+++ b/src/mess/drivers/seattle.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/segapico.c b/src/mess/drivers/segapico.c
index 607f1ef2a22..a2e2e874da1 100644
--- a/src/mess/drivers/segapico.c
+++ b/src/mess/drivers/segapico.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /****************************************** PICO emulation ****************************************/
 
diff --git a/src/mess/drivers/selz80.c b/src/mess/drivers/selz80.c
index 10c88fb7ca7..8f0c4b0e93c 100644
--- a/src/mess/drivers/selz80.c
+++ b/src/mess/drivers/selz80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c
index 56c157ae86a..03f15078581 100644
--- a/src/mess/drivers/sgi_ip2.c
+++ b/src/mess/drivers/sgi_ip2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     drivers/sgi_ip2.c
diff --git a/src/mess/drivers/sgi_ip6.c b/src/mess/drivers/sgi_ip6.c
index 87346d5601d..084b115eb0f 100644
--- a/src/mess/drivers/sgi_ip6.c
+++ b/src/mess/drivers/sgi_ip6.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     drivers/sgi_ip6.c
diff --git a/src/mess/drivers/sh4robot.c b/src/mess/drivers/sh4robot.c
index bfbfa9c2d9b..d0b6e886543 100644
--- a/src/mess/drivers/sh4robot.c
+++ b/src/mess/drivers/sh4robot.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         SH4 Robot
diff --git a/src/mess/drivers/sitcom.c b/src/mess/drivers/sitcom.c
index 869e794bec2..dc0d2d9b57f 100644
--- a/src/mess/drivers/sitcom.c
+++ b/src/mess/drivers/sitcom.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/slc1.c b/src/mess/drivers/slc1.c
index db37d54cab6..14f3631cc8b 100644
--- a/src/mess/drivers/slc1.c
+++ b/src/mess/drivers/slc1.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/slicer.c b/src/mess/drivers/slicer.c
index 0201dbbea27..52bac48e300 100644
--- a/src/mess/drivers/slicer.c
+++ b/src/mess/drivers/slicer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Slicer Computers Slicer 80186 SBC
 // The bios makefile refers to a "exe3bin" utility, this can be substituted with FreeDOS exe2bin and the /l=0xf800 option
 // which will fixup the relocations
diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c
index 2f5f87b4070..2f7c1199a54 100644
--- a/src/mess/drivers/sm1800.c
+++ b/src/mess/drivers/sm1800.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         SM1800 (original name is CM1800 in cyrilic letters)
diff --git a/src/mess/drivers/sms.c b/src/mess/drivers/sms.c
index d6c029b5434..578066fd0b3 100644
--- a/src/mess/drivers/sms.c
+++ b/src/mess/drivers/sms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  Contributors:
 
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index 246a5f494bf..959e6e4e4a7 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/spec128.c b/src/mess/drivers/spec128.c
index 65fa65ecfd7..c356defa9a4 100644
--- a/src/mess/drivers/spec128.c
+++ b/src/mess/drivers/spec128.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NOTE: ****** Specbusy: press N, R, or E to boot *************
diff --git a/src/mess/drivers/special.c b/src/mess/drivers/special.c
index 6f290af3856..72263f3d18e 100644
--- a/src/mess/drivers/special.c
+++ b/src/mess/drivers/special.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
         Specialist driver by Miodrag Milanovic
diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c
index 41a50bb80b6..e52d8689df6 100644
--- a/src/mess/drivers/specpls3.c
+++ b/src/mess/drivers/specpls3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NOTE: ****** Specbusy: press N, R, or E to boot *************
diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c
index 163308645ff..2d4c1123389 100644
--- a/src/mess/drivers/spectrum.c
+++ b/src/mess/drivers/spectrum.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NOTE: ****** Specbusy: press N, R, or E to boot *************
@@ -645,10 +647,15 @@ static GFXDECODE_START( spectrum )
 	GFXDECODE_ENTRY( "maincpu", 0x3d00, spectrum_charlayout, 0, 8 )
 GFXDECODE_END
 
+void spectrum_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	m_maincpu->set_input_line(0, CLEAR_LINE);
+}
 
 INTERRUPT_GEN_MEMBER(spectrum_state::spec_interrupt)
 {
-	device.execute().set_input_line(0, HOLD_LINE);
+	m_maincpu->set_input_line(0, HOLD_LINE);
+	timer_set(attotime::from_ticks(32, m_maincpu->clock()), 0, 0);
 }
 
 DEVICE_IMAGE_LOAD_MEMBER(spectrum_state, spectrum_cart)
diff --git a/src/mess/drivers/ssem.c b/src/mess/drivers/ssem.c
index df858d1ad5b..46a532f373a 100644
--- a/src/mess/drivers/ssem.c
+++ b/src/mess/drivers/ssem.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Manchester Small-Scale Experimental Machine (SSEM)
 
diff --git a/src/mess/drivers/ssystem3.c b/src/mess/drivers/ssystem3.c
index ee4a97bc058..31d2842f55c 100644
--- a/src/mess/drivers/ssystem3.c
+++ b/src/mess/drivers/ssystem3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   ssystem3.c
diff --git a/src/mess/drivers/stratos.c b/src/mess/drivers/stratos.c
index 321584cb48c..d2e4ec13780 100644
--- a/src/mess/drivers/stratos.c
+++ b/src/mess/drivers/stratos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Saitek/Scisys Kasparov Stratos Chess Computer
diff --git a/src/mess/drivers/sun1.c b/src/mess/drivers/sun1.c
index 0da70027f62..d52b8f4e9b1 100644
--- a/src/mess/drivers/sun1.c
+++ b/src/mess/drivers/sun1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Sun-1 Models
diff --git a/src/mess/drivers/sun2.c b/src/mess/drivers/sun2.c
index 9eb5595e1cf..da0dc2842ea 100644
--- a/src/mess/drivers/sun2.c
+++ b/src/mess/drivers/sun2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Sun-2 Models
diff --git a/src/mess/drivers/sun3.c b/src/mess/drivers/sun3.c
index 28255a78e67..62994718cae 100644
--- a/src/mess/drivers/sun3.c
+++ b/src/mess/drivers/sun3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   sun3.c: preliminary driver for Sun 3 and Sun 3x models.
diff --git a/src/mess/drivers/sun4.c b/src/mess/drivers/sun4.c
index 9db1ecdc3fa..b477cffcd56 100644
--- a/src/mess/drivers/sun4.c
+++ b/src/mess/drivers/sun4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Sun-4 Models
diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c
index 8de4c417f13..74943211ce5 100644
--- a/src/mess/drivers/super80.c
+++ b/src/mess/drivers/super80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /*****************************************************************************
 
diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c
index 2849a889426..1d58b06fe65 100644
--- a/src/mess/drivers/supercon.c
+++ b/src/mess/drivers/supercon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  Novag SuperConstellation Chess Computer
  2010 R. Schaefer
diff --git a/src/mess/drivers/sv8000.c b/src/mess/drivers/sv8000.c
index 1f9925c7a91..95e5c09dfc5 100644
--- a/src/mess/drivers/sv8000.c
+++ b/src/mess/drivers/sv8000.c
@@ -1,4 +1,4 @@
-// license:BSD
+// license:BSD-3-Clause
 // copyright-holders:Wilbert Pol, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c
index cf3d933b7d5..7865a9f0338 100644
--- a/src/mess/drivers/svi318.c
+++ b/src/mess/drivers/svi318.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** svi318.c : driver for Spectravideo SVI-318 and SVI-328
 **
diff --git a/src/mess/drivers/svision.c b/src/mess/drivers/svision.c
index a8055bde218..793371f43b2 100644
--- a/src/mess/drivers/svision.c
+++ b/src/mess/drivers/svision.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  watara supervision handheld
 
diff --git a/src/mess/drivers/swtpc.c b/src/mess/drivers/swtpc.c
index 39998826b95..fca0da0adfb 100644
--- a/src/mess/drivers/swtpc.c
+++ b/src/mess/drivers/swtpc.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/swtpc09.c b/src/mess/drivers/swtpc09.c
index 6c02fe897ba..c0afa2575fc 100644
--- a/src/mess/drivers/swtpc09.c
+++ b/src/mess/drivers/swtpc09.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**************************************************************************
 
     SWTPC S/09 Mess driver
diff --git a/src/mess/drivers/sym1.c b/src/mess/drivers/sym1.c
index e3acc6337cd..1eec6df0610 100644
--- a/src/mess/drivers/sym1.c
+++ b/src/mess/drivers/sym1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Synertek Systems Corp. SYM-1
diff --git a/src/mess/drivers/sys2900.c b/src/mess/drivers/sys2900.c
index 00cbe8fbc86..6def79457d6 100644
--- a/src/mess/drivers/sys2900.c
+++ b/src/mess/drivers/sys2900.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     System 2900
diff --git a/src/mess/drivers/systec.c b/src/mess/drivers/systec.c
index 6825660bb75..6559cad254c 100644
--- a/src/mess/drivers/systec.c
+++ b/src/mess/drivers/systec.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders: Miodrag Milanovic, Robbbert
 /***************************************************************************
 
         Systec Z80
diff --git a/src/mess/drivers/tandy1t.c b/src/mess/drivers/tandy1t.c
index 62a13168a59..9433b36ca02 100644
--- a/src/mess/drivers/tandy1t.c
+++ b/src/mess/drivers/tandy1t.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 Tandy 1000
 ==========
diff --git a/src/mess/drivers/tavernie.c b/src/mess/drivers/tavernie.c
index 3b89144cdf3..beba6c63099 100644
--- a/src/mess/drivers/tavernie.c
+++ b/src/mess/drivers/tavernie.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders: Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/tec1.c b/src/mess/drivers/tec1.c
index 102a2a0602b..bfd701676f9 100644
--- a/src/mess/drivers/tec1.c
+++ b/src/mess/drivers/tec1.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/terak.c b/src/mess/drivers/terak.c
index 1015b3ec3bd..886855e2350 100644
--- a/src/mess/drivers/terak.c
+++ b/src/mess/drivers/terak.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Terak 8510A
diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c
index 73fb92f245b..8a22e02aba6 100644
--- a/src/mess/drivers/thomson.c
+++ b/src/mess/drivers/thomson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/drivers/ti85.c b/src/mess/drivers/ti85.c
index 2cc306788db..1f3824f4141 100644
--- a/src/mess/drivers/ti85.c
+++ b/src/mess/drivers/ti85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 TI-85 and TI-86 drivers by Krzysztof Strzecha
 TI-83 Plus, TI-84 Plus, and Siliver Edition support by Jon Sturm
diff --git a/src/mess/drivers/ti990_10.c b/src/mess/drivers/ti990_10.c
index 6f9b90afaa0..9dd61e3bfb2 100644
--- a/src/mess/drivers/ti990_10.c
+++ b/src/mess/drivers/ti990_10.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     TI990/10 driver
 
diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c
index 15042517b95..2ae3d297662 100644
--- a/src/mess/drivers/ti99_2.c
+++ b/src/mess/drivers/ti99_2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
   Experimental ti99/2 driver
 
diff --git a/src/mess/drivers/tim011.c b/src/mess/drivers/tim011.c
index 352e514bf32..63e5703141d 100644
--- a/src/mess/drivers/tim011.c
+++ b/src/mess/drivers/tim011.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         TIM-011
diff --git a/src/mess/drivers/tim100.c b/src/mess/drivers/tim100.c
index fa86af5d6c6..005577b3286 100644
--- a/src/mess/drivers/tim100.c
+++ b/src/mess/drivers/tim100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         TIM-100 Terminal
diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c
index 90f1f7b084f..c48b70d33a8 100644
--- a/src/mess/drivers/timex.c
+++ b/src/mess/drivers/timex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NOTE: ****** Specbusy: press N, R, or E to boot *************
diff --git a/src/mess/drivers/tk80.c b/src/mess/drivers/tk80.c
index c6a6a2b1035..ad088299e77 100644
--- a/src/mess/drivers/tk80.c
+++ b/src/mess/drivers/tk80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c
index df1a81c7713..1c7290b262c 100644
--- a/src/mess/drivers/tk80bs.c
+++ b/src/mess/drivers/tk80bs.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Angelo Salese, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/tricep.c b/src/mess/drivers/tricep.c
index f0e7b135605..62352ea6e5d 100644
--- a/src/mess/drivers/tricep.c
+++ b/src/mess/drivers/tricep.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Morrow Tricep
diff --git a/src/mess/drivers/ts802.c b/src/mess/drivers/ts802.c
index 881140745f3..2289a273f98 100644
--- a/src/mess/drivers/ts802.c
+++ b/src/mess/drivers/ts802.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Skeleton driver for Televideo TS802
diff --git a/src/mess/drivers/ts803.c b/src/mess/drivers/ts803.c
index 782d2180cd9..e9bb8cd0620 100644
--- a/src/mess/drivers/ts803.c
+++ b/src/mess/drivers/ts803.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Skeleton driver for Televideo TS803
diff --git a/src/mess/drivers/ts816.c b/src/mess/drivers/ts816.c
index 6959a44bd8d..e4efe68ad40 100644
--- a/src/mess/drivers/ts816.c
+++ b/src/mess/drivers/ts816.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/tutor.c b/src/mess/drivers/tutor.c
index 6433a4c4814..4826f022115 100644
--- a/src/mess/drivers/tutor.c
+++ b/src/mess/drivers/tutor.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Experimental Tomy Tutor driver
 
diff --git a/src/mess/drivers/tv950.c b/src/mess/drivers/tv950.c
index 5cd741ae60f..fe1cc3ad235 100644
--- a/src/mess/drivers/tv950.c
+++ b/src/mess/drivers/tv950.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/uknc.c b/src/mess/drivers/uknc.c
index 48de862ff86..02c59c044ce 100644
--- a/src/mess/drivers/uknc.c
+++ b/src/mess/drivers/uknc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         UKNC
diff --git a/src/mess/drivers/unior.c b/src/mess/drivers/unior.c
index 3481061c517..e3a612aa18c 100644
--- a/src/mess/drivers/unior.c
+++ b/src/mess/drivers/unior.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/unistar.c b/src/mess/drivers/unistar.c
index 4eac9465199..5df7207b356 100644
--- a/src/mess/drivers/unistar.c
+++ b/src/mess/drivers/unistar.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Callan Unistar Terminal
diff --git a/src/mess/drivers/univac.c b/src/mess/drivers/univac.c
index e714ba731a9..9e00fba122d 100644
--- a/src/mess/drivers/univac.c
+++ b/src/mess/drivers/univac.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c
index f395848f34e..2ae14300d0e 100644
--- a/src/mess/drivers/unixpc.c
+++ b/src/mess/drivers/unixpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     AT&T Unix PC series
diff --git a/src/mess/drivers/ut88.c b/src/mess/drivers/ut88.c
index 362edb04717..029f929febe 100644
--- a/src/mess/drivers/ut88.c
+++ b/src/mess/drivers/ut88.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/v6809.c b/src/mess/drivers/v6809.c
index 8b87c28688b..36ef0a7663e 100644
--- a/src/mess/drivers/v6809.c
+++ b/src/mess/drivers/v6809.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/vax11.c b/src/mess/drivers/vax11.c
index f1dcbb67b4f..7e9fdefabb6 100644
--- a/src/mess/drivers/vax11.c
+++ b/src/mess/drivers/vax11.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         VAX-11
diff --git a/src/mess/drivers/vcs80.c b/src/mess/drivers/vcs80.c
index c2c4adcab4b..e028b86735f 100644
--- a/src/mess/drivers/vcs80.c
+++ b/src/mess/drivers/vcs80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     VCS-80
diff --git a/src/mess/drivers/vector06.c b/src/mess/drivers/vector06.c
index 0dba67d923d..208a5feb15c 100644
--- a/src/mess/drivers/vector06.c
+++ b/src/mess/drivers/vector06.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
diff --git a/src/mess/drivers/vector4.c b/src/mess/drivers/vector4.c
index 28cc1ee6d7f..5733e0ede53 100644
--- a/src/mess/drivers/vector4.c
+++ b/src/mess/drivers/vector4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Vector 4
diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c
index 5cbce2fa289..677f5667741 100644
--- a/src/mess/drivers/victor9k.c
+++ b/src/mess/drivers/victor9k.c
@@ -4,9 +4,6 @@
 
     Victor 9000 / ACT Sirius 1 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c
index 1cc0c0c76a5..f169bfe0141 100644
--- a/src/mess/drivers/vk100.c
+++ b/src/mess/drivers/vk100.c
@@ -1,5 +1,5 @@
-//license:MAME|LGPL-2.1+
-//copyright-holders:Jonathan Gevaryahu
+// license:BSD-3-Clause
+// copyright-holders:Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VK100 'GIGI'
diff --git a/src/mess/drivers/votrpss.c b/src/mess/drivers/votrpss.c
index 99811f4a15d..4356b19a520 100644
--- a/src/mess/drivers/votrpss.c
+++ b/src/mess/drivers/votrpss.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Jonathan Gevaryahu, Robbbert
 /******************************************************************************
 *
diff --git a/src/mess/drivers/votrtnt.c b/src/mess/drivers/votrtnt.c
index 6d289338cd9..4cdb93b400c 100644
--- a/src/mess/drivers/votrtnt.c
+++ b/src/mess/drivers/votrtnt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 *
 *  Votrax Type 'N Talk Driver
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index f127b848683..7810423098d 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VT100 driver by Miodrag Milanovic
diff --git a/src/mess/drivers/vt220.c b/src/mess/drivers/vt220.c
index 57b1037e6c6..54788f85941 100644
--- a/src/mess/drivers/vt220.c
+++ b/src/mess/drivers/vt220.c
@@ -1,5 +1,5 @@
-// license:MAME
-// copyright-holders: Micko, Jonathan Gevaryahu
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VT220
diff --git a/src/mess/drivers/vt240.c b/src/mess/drivers/vt240.c
index df4d04d91dd..02e3345dfac 100644
--- a/src/mess/drivers/vt240.c
+++ b/src/mess/drivers/vt240.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VT240
@@ -275,16 +277,25 @@ ROM_START( vt240 )
 
 	ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
 	ROM_DEFAULT_BIOS( "vt240" )
-	ROM_SYSTEM_BIOS( 0, "vt240o", "VT240 older" ) // has "VV2211 STATUS" in rom, V2.1?
+	// according to the schematics an even older set exists, variation 'E1' with roms:
+	// e100/8085: 23-003e6
+	// e20: 23-001e6
+	// e22: 23-002e6
+	// e19: 23-048e5
+	// e21: 23-049e5
+	// but according to the Field Change Order below, the initial release is V2.1, so the above must be a prototype.
+	// DOL for v2.1 to v2.2 change: http://web.archive.org/web/20060905145200/http://cmcnabb.cc.vt.edu/dec94mds/vt240dol.txt
+	ROM_SYSTEM_BIOS( 0, "vt240v21", "VT240 V2.1" ) // initial factory release, FCO says this was 8 Feburary 1985
 	ROMX_LOAD( "23-006e6-00.e20", 0x00000, 0x8000, CRC(79C11D82) SHA1(5A6FE5B75B6504A161F2C9B148C0FE9F19770837), ROM_SKIP(1) | ROM_BIOS(1))
 	ROMX_LOAD( "23-004e6-00.e22", 0x00001, 0x8000, CRC(EBA10FEF) SHA1(C0EE4D8E4EEB70066F03F3D17A7E2F2BD0B5F8AD), ROM_SKIP(1) | ROM_BIOS(1))
 	ROMX_LOAD( "23-007e6-00.e19", 0x10000, 0x8000, CRC(D18A2AB8) SHA1(37F448A332FC50298007ED39C8BF1AB1EB6D4CAE), ROM_SKIP(1) | ROM_BIOS(1))
 	ROMX_LOAD( "23-005e6-00.e21", 0x10001, 0x8000, CRC(558D0285) SHA1(E96A49BF9D55D8AB879D9B39AA380368C5C9ADE0), ROM_SKIP(1) | ROM_BIOS(1))
-	ROM_SYSTEM_BIOS( 1, "vt240", "VT240 newer" ) // has "VV2222 UPDATE" in rom, V2.2?
+	ROM_SYSTEM_BIOS( 1, "vt240", "VT240 V2.2" ) // Revised version, December 1985
 	ROMX_LOAD( "23-058e6.e20", 0x00000, 0x8000, CRC(D2A56B90) SHA1(39CBB26134D7D8BA308DF3A93228918A5945B45F), ROM_SKIP(1) | ROM_BIOS(2))
 	ROMX_LOAD( "23-056e6.e22", 0x00001, 0x8000, CRC(C46E13C3) SHA1(0F2801FA7483D1F97708143CD81AE0816BF9A435), ROM_SKIP(1) | ROM_BIOS(2))
 	ROMX_LOAD( "23-059e6.e19", 0x10000, 0x8000, CRC(F8393346) SHA1(1E28DAF1B7F2BDABC47CE2F6FA99EF038B275A29), ROM_SKIP(1) | ROM_BIOS(2))
 	ROMX_LOAD( "23-057e6.e21", 0x10001, 0x8000, CRC(7CE9DCE9) SHA1(5A105E5BDCA13910B3B79CC23567CE2DC36B844D), ROM_SKIP(1) | ROM_BIOS(2))
+	// E39, E85, E131 are empty.
 
 	ROM_REGION( 0x1000, "proms", ROMREGION_ERASEFF )
 	ROM_LOAD( "23-351a1.e149", 0x0000, 0x0020, NO_DUMP) // 82s123; DRAM RAS/CAS Timing PROM
@@ -316,4 +327,5 @@ DRIVER_INIT_MEMBER(vt240_state,vt240)
 /*    YEAR  NAME    PARENT  COMPAT   MACHINE    INPUT          CLASS   INIT    COMPANY                      FULLNAME       FLAGS */
 COMP( 1983, vt240,  0,      0,       mc7105,    vt240, vt240_state,   vt240,  "Digital Equipment Corporation", "VT240", GAME_NOT_WORKING | GAME_NO_SOUND)
 //COMP( 1983, vt241,  0,      0,       vt220,     vt220, driver_device,   0,  "Digital Equipment Corporation", "VT241", GAME_NOT_WORKING | GAME_NO_SOUND)
+// NOTE: the only difference between VT240 and VT241 is the latter comes with a VR241 Color monitor, while the former comes with a mono display; the ROMs and operation are identical.
 COMP( 1983, mc7105, 0,      0,       mc7105,    vt240, vt240_state,   vt240,  "Elektronika",                  "MC7105", GAME_NOT_WORKING | GAME_NO_SOUND)
diff --git a/src/mess/drivers/vt320.c b/src/mess/drivers/vt320.c
index 838cde2875f..3cd2715cc1e 100644
--- a/src/mess/drivers/vt320.c
+++ b/src/mess/drivers/vt320.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VT320
@@ -106,9 +108,11 @@ MACHINE_CONFIG_END
 ROM_START( vt320 )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
 	ROM_DEFAULT_BIOS( "vt320" )
-	ROM_SYSTEM_BIOS( 0, "vt320o", "VT320 older version" )
-	ROMX_LOAD( "23-054e7.e9", 0x0000, 0x10000, CRC(be98f9a4) SHA1(b8044d42ffaadb734fbd047fbca9c8aadeb0bf6c), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS( 1, "vt320", "VT320 newer version" )
+	//DOL: http://web.archive.org/web/20060905115711/http://cmcnabb.cc.vt.edu/dec94mds/vt320dol.txt
+	ROM_SYSTEM_BIOS( 0, "vt320v11", "VT320 V1.1" )
+	// 23-054E7 below can also appear (same contents?) as 23-048E7 which is a mask rom
+	ROMX_LOAD( "23-054e7.e9", 0x0000, 0x10000, CRC(be98f9a4) SHA1(b8044d42ffaadb734fbd047fbca9c8aadeb0bf6c), ROM_BIOS(1)) // EPROM
+	ROM_SYSTEM_BIOS( 1, "vt320", "VT320 V1.2" )
 	ROMX_LOAD( "23-104e7.e9", 0x0000, 0x10000, CRC(5f419b5a) SHA1(dbc429b32d6baefd8a56862717d6e7fea1fb0c1c), ROM_BIOS(2))
 ROM_END
 
diff --git a/src/mess/drivers/vt520.c b/src/mess/drivers/vt520.c
index 6ba295538b6..8ee77e55248 100644
--- a/src/mess/drivers/vt520.c
+++ b/src/mess/drivers/vt520.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
         DEC VT520
diff --git a/src/mess/drivers/vta2000.c b/src/mess/drivers/vta2000.c
index cbc7cea9ac0..aee01072279 100644
--- a/src/mess/drivers/vta2000.c
+++ b/src/mess/drivers/vta2000.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c
index 79f9aa203f8..803bced5533 100644
--- a/src/mess/drivers/vtech1.c
+++ b/src/mess/drivers/vtech1.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Dirk Best
 /***************************************************************************
 
     Video Technology Laser 110
@@ -10,9 +12,6 @@
     Video Technology Laser 310
       Dick Smith Electronics VZ-300
 
-    license: MAME
-    copyright-holders: Juergen Buchmueller, Dirk Best
-
 Thanks go to:
 
     - Guy Thomason
diff --git a/src/mess/drivers/vtech2.c b/src/mess/drivers/vtech2.c
index 5518ddf9a8c..d5595320b72 100644
--- a/src/mess/drivers/vtech2.c
+++ b/src/mess/drivers/vtech2.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
     vtech2.c
 
diff --git a/src/mess/drivers/wicat.c b/src/mess/drivers/wicat.c
index 10f9aa9a023..b244e1a1ad0 100644
--- a/src/mess/drivers/wicat.c
+++ b/src/mess/drivers/wicat.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/wswan.c b/src/mess/drivers/wswan.c
index 23b113c7316..b325cdd74a0 100644
--- a/src/mess/drivers/wswan.c
+++ b/src/mess/drivers/wswan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   wswan.c
diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c
index c28c784281e..c9c41e3e4b1 100644
--- a/src/mess/drivers/x68k.c
+++ b/src/mess/drivers/x68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Preliminary X68000 driver for MESS
 // Started 18/11/2006
 // Written by Barry Rodewald
diff --git a/src/mess/drivers/ymmu100.c b/src/mess/drivers/ymmu100.c
index b775012d8c9..c9b40dc4119 100644
--- a/src/mess/drivers/ymmu100.c
+++ b/src/mess/drivers/ymmu100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************************
 
     Yamaha MU-100 : 32-voice polyphonic/multitimbral General MIDI/GS/XG tone module
diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c
index 0a66ae2020a..f02ae2b0ff5 100644
--- a/src/mess/drivers/z100.c
+++ b/src/mess/drivers/z100.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Zenith Z-100
diff --git a/src/mess/drivers/z1013.c b/src/mess/drivers/z1013.c
index 2c282d399c4..955f50b6158 100644
--- a/src/mess/drivers/z1013.c
+++ b/src/mess/drivers/z1013.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/z80dev.c b/src/mess/drivers/z80dev.c
index 76153575666..fa2afdb416e 100644
--- a/src/mess/drivers/z80dev.c
+++ b/src/mess/drivers/z80dev.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index b25c966fea5..2009f231784 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -1,5 +1,5 @@
-// license:MAME
-// copyright-holders:Micko? , Robbbert.
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic , Robbbert.
 /***************************************************************************
 
         Robotron Z9001 (KC85/1)
diff --git a/src/mess/drivers/zaurus.c b/src/mess/drivers/zaurus.c
index 90e4ddc5c67..6f17ccfcff7 100644
--- a/src/mess/drivers/zaurus.c
+++ b/src/mess/drivers/zaurus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************************************************************************
 
     Sharp Zaurus PDA skeleton driver (SL, ARM/Linux based, 4th generation)
diff --git a/src/mess/drivers/zexall.c b/src/mess/drivers/zexall.c
index f68f5c7aa7d..de961386f7f 100644
--- a/src/mess/drivers/zexall.c
+++ b/src/mess/drivers/zexall.c
@@ -1,36 +1,13 @@
-// license:MAME|LGPL-2.1+
-// copyright-holders:Jonathan Gevaryahu
-// Modernised by Robbbert. Portions of the code copyright Robbbert.
+// license:BSD-3-Clause
+// copyright-holders:Jonathan Gevaryahu, Robbbert
 /******************************************************************************
 *
 *  Self Contained zexall 'Z80 instruction exerciser' test driver
-*  Copyright (C) 2009 Jonathan Gevaryahu AKA Lord Nightmare
 *  Zexall originally written by Frank Cringle for ZX Spectrum
 *  Modularized Spectrum-independent Zexall binary supplied by Blargg
 *  Serial interface binary/preloader at 0x0000-0x00FF written by Kevin 'kevtris' Horton
 *
 *
-*  This source file is dual-licensed under the following licenses:
-*  1. The MAME license as of September 2013
-*  2. The GNU LGPLv2.1:
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License as published by the Free Software Foundation; either
-*  version 2.1 of the License, or (at your option) any later version.
-*
-*  This library is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-*  Lesser General Public License for more details.
-*
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; if not, write to the Free Software
-*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-*  Please contact the author if you require other licensing.
-*
-*
 * mem map:
 Ram 0000-FFFF (preloaded with binary)
 Special calls take place for three ram values (this interface was designed by kevtris):
diff --git a/src/mess/drivers/zorba.c b/src/mess/drivers/zorba.c
index 7b38d950fd4..149fa10004a 100644
--- a/src/mess/drivers/zorba.c
+++ b/src/mess/drivers/zorba.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /************************************************************************************************************
 
diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c
index a2f53116770..fa192a2050a 100644
--- a/src/mess/drivers/zrt80.c
+++ b/src/mess/drivers/zrt80.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/zsbc3.c b/src/mess/drivers/zsbc3.c
index 2ae43a579d9..ffff88472bc 100644
--- a/src/mess/drivers/zsbc3.c
+++ b/src/mess/drivers/zsbc3.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:BSD-3-Clause
 // copyright-holders:Robbbert
 /***************************************************************************
 
diff --git a/src/mess/drivers/zx.c b/src/mess/drivers/zx.c
index 48db70d4f2e..0cd8108c615 100644
--- a/src/mess/drivers/zx.c
+++ b/src/mess/drivers/zx.c
@@ -1,4 +1,4 @@
-// license:MAME
+// license:GPL-2.0+
 // copyright-holders:Juergen Buchmueller, Krzysztof Strzecha, Robbbert
 /***************************************************************************
     zx.c
diff --git a/src/mess/includes/ac1.h b/src/mess/includes/ac1.h
index 3d8b7b729bd..0df7b7b0e98 100644
--- a/src/mess/includes/ac1.h
+++ b/src/mess/includes/ac1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ac1.h
diff --git a/src/mess/includes/ace.h b/src/mess/includes/ace.h
index 1f8ee3271b1..52279b3226a 100644
--- a/src/mess/includes/ace.h
+++ b/src/mess/includes/ace.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ace.h
diff --git a/src/mess/includes/advision.h b/src/mess/includes/advision.h
index fc63c7f1c68..e46da759095 100644
--- a/src/mess/includes/advision.h
+++ b/src/mess/includes/advision.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/advision.h
diff --git a/src/mess/includes/aim65.h b/src/mess/includes/aim65.h
index 5a33c3cc488..f5a2b477f73 100644
--- a/src/mess/includes/aim65.h
+++ b/src/mess/includes/aim65.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/aim65.h
diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h
index f186158df8a..cefd4371290 100644
--- a/src/mess/includes/amstrad.h
+++ b/src/mess/includes/amstrad.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/amstrad.h
diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h
index 29feadad134..981a4468b11 100644
--- a/src/mess/includes/apollo.h
+++ b/src/mess/includes/apollo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * apollo.h - APOLLO DN3500/DN3000 driver includes
  *
diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h
index 57c6b23956d..62b1f28c505 100644
--- a/src/mess/includes/apple1.h
+++ b/src/mess/includes/apple1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/apple1.h
diff --git a/src/mess/includes/apple2.h b/src/mess/includes/apple2.h
index 02dd0b9296b..c7f3622ea3f 100644
--- a/src/mess/includes/apple2.h
+++ b/src/mess/includes/apple2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     includes/apple2.h
diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h
index ed0c5d722e0..eddb9c8facb 100644
--- a/src/mess/includes/apple2gs.h
+++ b/src/mess/includes/apple2gs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/apple2gs.h
diff --git a/src/mess/includes/apple3.h b/src/mess/includes/apple3.h
index 5e65643a6ac..10b1b74a404 100644
--- a/src/mess/includes/apple3.h
+++ b/src/mess/includes/apple3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/apple3.h
diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h
index 55ed2999a64..103794804bf 100644
--- a/src/mess/includes/apricotf.h
+++ b/src/mess/includes/apricotf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __APRICOTF__
diff --git a/src/mess/includes/apricotp.h b/src/mess/includes/apricotp.h
index 32d87b1964f..db450f80b2f 100644
--- a/src/mess/includes/apricotp.h
+++ b/src/mess/includes/apricotp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __APRICOTP__
diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h
index 4716a3ea370..f5cc4751a43 100644
--- a/src/mess/includes/aquarius.h
+++ b/src/mess/includes/aquarius.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/aquarius.h
diff --git a/src/mess/includes/arcadia.h b/src/mess/includes/arcadia.h
index 99e7e18168f..c56e076cfae 100644
--- a/src/mess/includes/arcadia.h
+++ b/src/mess/includes/arcadia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/arcadia.h
diff --git a/src/mess/includes/at.h b/src/mess/includes/at.h
index 9a98a1a5105..e05aea4b254 100644
--- a/src/mess/includes/at.h
+++ b/src/mess/includes/at.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/at.h
diff --git a/src/mess/includes/atom.h b/src/mess/includes/atom.h
index 93bc57485b9..7617d7b9359 100644
--- a/src/mess/includes/atom.h
+++ b/src/mess/includes/atom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ATOM__
diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h
index 4a4518bb852..4f59b1bf0f8 100644
--- a/src/mess/includes/b2m.h
+++ b/src/mess/includes/b2m.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/b2m.h
diff --git a/src/mess/includes/banctec.h b/src/mess/includes/banctec.h
index 6652d574d86..2c22608a1d8 100644
--- a/src/mess/includes/banctec.h
+++ b/src/mess/includes/banctec.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/banctec.h
diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h
index 892acee7f83..c6f35ab8a5b 100644
--- a/src/mess/includes/bbc.h
+++ b/src/mess/includes/bbc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/bbc.h
diff --git a/src/mess/includes/bebox.h b/src/mess/includes/bebox.h
index fc81a61cf42..f18c3d9c38b 100644
--- a/src/mess/includes/bebox.h
+++ b/src/mess/includes/bebox.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/bebox.h
diff --git a/src/mess/includes/bk.h b/src/mess/includes/bk.h
index 88ec472a54d..fb8d55c4d22 100644
--- a/src/mess/includes/bk.h
+++ b/src/mess/includes/bk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/bk.h
diff --git a/src/mess/includes/busicom.h b/src/mess/includes/busicom.h
index f182c044554..fb7f6d54151 100644
--- a/src/mess/includes/busicom.h
+++ b/src/mess/includes/busicom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/busicom.h
diff --git a/src/mess/includes/bw12.h b/src/mess/includes/bw12.h
index bbde95f7d5e..09b3c6ae9e5 100644
--- a/src/mess/includes/bw12.h
+++ b/src/mess/includes/bw12.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __BW12__
 #define __BW12__
 
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h
index 8b137891791..68ab8391f15 100644
--- a/src/mess/includes/c65.h
+++ b/src/mess/includes/c65.h
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 
diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h
index 0393c1c3c71..e119b112248 100644
--- a/src/mess/includes/cgenie.h
+++ b/src/mess/includes/cgenie.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/cgenie.h
diff --git a/src/mess/includes/channelf.h b/src/mess/includes/channelf.h
index 842db13ee4f..cd661cec96d 100644
--- a/src/mess/includes/channelf.h
+++ b/src/mess/includes/channelf.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/channelf.h
diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h
index ca456ebeb9b..483bf7ff8c6 100644
--- a/src/mess/includes/coco.h
+++ b/src/mess/includes/coco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco.h
diff --git a/src/mess/includes/coco12.h b/src/mess/includes/coco12.h
index d7c10d8ddb8..a230746ecc1 100644
--- a/src/mess/includes/coco12.h
+++ b/src/mess/includes/coco12.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco12.h
diff --git a/src/mess/includes/coco3.h b/src/mess/includes/coco3.h
index 31a32df9299..3c82be01199 100644
--- a/src/mess/includes/coco3.h
+++ b/src/mess/includes/coco3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco3.h
diff --git a/src/mess/includes/coleco.h b/src/mess/includes/coleco.h
index f3c65111341..654d2d7aa03 100644
--- a/src/mess/includes/coleco.h
+++ b/src/mess/includes/coleco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COLECO__
diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h
index 6906bcd566a..798cb0be5b0 100644
--- a/src/mess/includes/compis.h
+++ b/src/mess/includes/compis.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/compis.h
diff --git a/src/mess/includes/comquest.h b/src/mess/includes/comquest.h
index a8fa9b2d540..b7afc9d4633 100644
--- a/src/mess/includes/comquest.h
+++ b/src/mess/includes/comquest.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/comquest.h
diff --git a/src/mess/includes/concept.h b/src/mess/includes/concept.h
index f5deecc63f8..af3d7d2ccc1 100644
--- a/src/mess/includes/concept.h
+++ b/src/mess/includes/concept.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/concept.h
diff --git a/src/mess/includes/crvision.h b/src/mess/includes/crvision.h
index 89ee61b7f3f..cf04c24980d 100644
--- a/src/mess/includes/crvision.h
+++ b/src/mess/includes/crvision.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CRVISION__
diff --git a/src/mess/includes/cxhumax.h b/src/mess/includes/cxhumax.h
index 87786304f31..ba886aeec39 100644
--- a/src/mess/includes/cxhumax.h
+++ b/src/mess/includes/cxhumax.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef CXHUMAX_H_
 #define CXHUMAX_H_
 
diff --git a/src/mess/includes/cybiko.h b/src/mess/includes/cybiko.h
index 28a0ff596b7..868ee2d51b4 100644
--- a/src/mess/includes/cybiko.h
+++ b/src/mess/includes/cybiko.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/cybiko.h
diff --git a/src/mess/includes/dai.h b/src/mess/includes/dai.h
index 0898d1b2c9f..8922473259c 100644
--- a/src/mess/includes/dai.h
+++ b/src/mess/includes/dai.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/dai.h
diff --git a/src/mess/includes/dccons.h b/src/mess/includes/dccons.h
index 56d7b19a213..a4e156db064 100644
--- a/src/mess/includes/dccons.h
+++ b/src/mess/includes/dccons.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "imagedev/chd_cd.h"
 #include "machine/gdrom.h"
 #include "machine/ataintf.h"
diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h
index 5cf00d3cd38..55916e9de8a 100644
--- a/src/mess/includes/dgn_beta.h
+++ b/src/mess/includes/dgn_beta.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/dgn_beta.h
diff --git a/src/mess/includes/dgnalpha.h b/src/mess/includes/dgnalpha.h
index 30fd790b77a..51bca54532a 100644
--- a/src/mess/includes/dgnalpha.h
+++ b/src/mess/includes/dgnalpha.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dgnalpha.h
diff --git a/src/mess/includes/dm7000.h b/src/mess/includes/dm7000.h
index cb4ec4e96eb..73e07aae9b3 100644
--- a/src/mess/includes/dm7000.h
+++ b/src/mess/includes/dm7000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef DM7000_H_
 #define DM7000_H_
 
diff --git a/src/mess/includes/dragon.h b/src/mess/includes/dragon.h
index 00fe7b006a1..6f341591f3a 100644
--- a/src/mess/includes/dragon.h
+++ b/src/mess/includes/dragon.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dragon.h
diff --git a/src/mess/includes/ec184x.h b/src/mess/includes/ec184x.h
index 0f8854bdcdf..76fb7e003b7 100644
--- a/src/mess/includes/ec184x.h
+++ b/src/mess/includes/ec184x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ec184x.h
diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h
index 10de7d0b019..e460b963064 100644
--- a/src/mess/includes/einstein.h
+++ b/src/mess/includes/einstein.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatung Einstein
diff --git a/src/mess/includes/electron.h b/src/mess/includes/electron.h
index 2de2f6da6a1..c8365641121 100644
--- a/src/mess/includes/electron.h
+++ b/src/mess/includes/electron.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/electron.h
diff --git a/src/mess/includes/ep64.h b/src/mess/includes/ep64.h
index b687db5a090..42dd9115e35 100644
--- a/src/mess/includes/ep64.h
+++ b/src/mess/includes/ep64.h
@@ -4,9 +4,6 @@
 
     Enterprise Sixty Four / One Two Eight emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h
index 5b844c7638e..b7b4640e8a1 100644
--- a/src/mess/includes/fm7.h
+++ b/src/mess/includes/fm7.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/buffer.h"
 #include "bus/centronics/ctronics.h"
 #include "imagedev/cassette.h"
diff --git a/src/mess/includes/fmtowns.h b/src/mess/includes/fmtowns.h
index 6fe6d8892f7..19691d6cb56 100644
--- a/src/mess/includes/fmtowns.h
+++ b/src/mess/includes/fmtowns.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef FMTOWNS_H_
 #define FMTOWNS_H_
 
diff --git a/src/mess/includes/galaxy.h b/src/mess/includes/galaxy.h
index ac5480cab83..b58825c9635 100644
--- a/src/mess/includes/galaxy.h
+++ b/src/mess/includes/galaxy.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/galaxy.h
diff --git a/src/mess/includes/galeb.h b/src/mess/includes/galeb.h
index 900f7610f5a..59b1036ff98 100644
--- a/src/mess/includes/galeb.h
+++ b/src/mess/includes/galeb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/galeb.h
diff --git a/src/mess/includes/gamate.h b/src/mess/includes/gamate.h
index c230390648c..5981853ee5e 100644
--- a/src/mess/includes/gamate.h
+++ b/src/mess/includes/gamate.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/gamate.h
diff --git a/src/mess/includes/gamecom.h b/src/mess/includes/gamecom.h
index 28f769ea617..a556e26af30 100644
--- a/src/mess/includes/gamecom.h
+++ b/src/mess/includes/gamecom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/gamecom.h
diff --git a/src/mess/includes/gamepock.h b/src/mess/includes/gamepock.h
index 4fb420fb4dc..0a4e5c80c4b 100644
--- a/src/mess/includes/gamepock.h
+++ b/src/mess/includes/gamepock.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _GAMEPOCK_H_
 #define _GAMEPOCK_H_
 #include "sound/speaker.h"
diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h
index 7460f6d6bcb..0f4ab7bcc7b 100644
--- a/src/mess/includes/gb.h
+++ b/src/mess/includes/gb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/gb.h
diff --git a/src/mess/includes/gba.h b/src/mess/includes/gba.h
index 8b46427b45b..fc95234c35f 100644
--- a/src/mess/includes/gba.h
+++ b/src/mess/includes/gba.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _GBA_H_
 #define _GBA_H_
 
diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h
index 93ceb476acb..ca3a9e5a311 100644
--- a/src/mess/includes/genpc.h
+++ b/src/mess/includes/genpc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pc.h
diff --git a/src/mess/includes/gp32.h b/src/mess/includes/gp32.h
index aa71afce168..1bd8ad0acb4 100644
--- a/src/mess/includes/gp32.h
+++ b/src/mess/includes/gp32.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _GP32_H_
 #define _GP32_H_
 
diff --git a/src/mess/includes/hec2hrp.h b/src/mess/includes/hec2hrp.h
index 60b2ba218c9..097604cadc3 100644
--- a/src/mess/includes/hec2hrp.h
+++ b/src/mess/includes/hec2hrp.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /////////////////////////////////////////////////////////////////////
 //////   HECTOR HEADER FILE /////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////
diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h
index b4f1be7d673..7402e978e55 100644
--- a/src/mess/includes/hp48.h
+++ b/src/mess/includes/hp48.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2008
diff --git a/src/mess/includes/hx20.h b/src/mess/includes/hx20.h
index fa7b0d43791..48b6b1a53db 100644
--- a/src/mess/includes/hx20.h
+++ b/src/mess/includes/hx20.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __HX20__
diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h
index f6161894f7f..2390b40dff2 100644
--- a/src/mess/includes/intv.h
+++ b/src/mess/includes/intv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/intv.h
diff --git a/src/mess/includes/jupiter.h b/src/mess/includes/jupiter.h
index d529c3459b9..d910b9d134e 100644
--- a/src/mess/includes/jupiter.h
+++ b/src/mess/includes/jupiter.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __JUPITER__
diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h
index 0409ec782ed..43484f426b3 100644
--- a/src/mess/includes/kaypro.h
+++ b/src/mess/includes/kaypro.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
diff --git a/src/mess/includes/kramermc.h b/src/mess/includes/kramermc.h
index a3a460a7678..923a23d7067 100644
--- a/src/mess/includes/kramermc.h
+++ b/src/mess/includes/kramermc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/kramermc.h
diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h
index f7623994f47..190b6fb0b94 100644
--- a/src/mess/includes/lisa.h
+++ b/src/mess/includes/lisa.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/lisa.h
diff --git a/src/mess/includes/llc.h b/src/mess/includes/llc.h
index a7027da5310..c7346fca485 100644
--- a/src/mess/includes/llc.h
+++ b/src/mess/includes/llc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/llc.h
diff --git a/src/mess/includes/lviv.h b/src/mess/includes/lviv.h
index 298565446b3..d30550d6abf 100644
--- a/src/mess/includes/lviv.h
+++ b/src/mess/includes/lviv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/lviv.h
diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h
index f3586774147..bd156685643 100644
--- a/src/mess/includes/lynx.h
+++ b/src/mess/includes/lynx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/lynx.h
diff --git a/src/mess/includes/m5.h b/src/mess/includes/m5.h
index f2e2f67274b..d74361857af 100644
--- a/src/mess/includes/m5.h
+++ b/src/mess/includes/m5.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __M5__
 #define __M5__
 
diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h
index 9f4fbddaccc..5398cde542a 100644
--- a/src/mess/includes/mac.h
+++ b/src/mess/includes/mac.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mac.h
diff --git a/src/mess/includes/macpci.h b/src/mess/includes/macpci.h
index 95d1d92ee12..e0eadd2d34a 100644
--- a/src/mess/includes/macpci.h
+++ b/src/mess/includes/macpci.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/macpci.h
diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h
index 717d6a62d9d..23ae6b960e4 100644
--- a/src/mess/includes/mbc55x.h
+++ b/src/mess/includes/mbc55x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     mbc55x.h
     Includes for the Sanyo MBC-550, MBC-555.
diff --git a/src/mess/includes/mbee.h b/src/mess/includes/mbee.h
index f9b569064c0..d1de90ed580 100644
--- a/src/mess/includes/mbee.h
+++ b/src/mess/includes/mbee.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mbee.h
diff --git a/src/mess/includes/mboard.h b/src/mess/includes/mboard.h
index 553d7fe8782..08d40cd6953 100644
--- a/src/mess/includes/mboard.h
+++ b/src/mess/includes/mboard.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
      Mephisto Chess Computers
diff --git a/src/mess/includes/mc1502.h b/src/mess/includes/mc1502.h
index 8704b1ae884..755687cb679 100644
--- a/src/mess/includes/mc1502.h
+++ b/src/mess/includes/mc1502.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mc1502.h
diff --git a/src/mess/includes/mc80.h b/src/mess/includes/mc80.h
index 70af33622d2..4e7e055de9b 100644
--- a/src/mess/includes/mc80.h
+++ b/src/mess/includes/mc80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mc80.h
diff --git a/src/mess/includes/md_cons.h b/src/mess/includes/md_cons.h
index c1d735c5b21..b13286d2f5a 100644
--- a/src/mess/includes/md_cons.h
+++ b/src/mess/includes/md_cons.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/megadriv.h"
 #include "bus/megadrive/md_slot.h"
diff --git a/src/mess/includes/microtan.h b/src/mess/includes/microtan.h
index 151d5585c74..29640649763 100644
--- a/src/mess/includes/microtan.h
+++ b/src/mess/includes/microtan.h
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
  *  Microtan 65
  *
diff --git a/src/mess/includes/mikro80.h b/src/mess/includes/mikro80.h
index c93594b0874..ef0ae1e5ea1 100644
--- a/src/mess/includes/mikro80.h
+++ b/src/mess/includes/mikro80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mikro80.h
diff --git a/src/mess/includes/mpf1.h b/src/mess/includes/mpf1.h
index f6d16912519..b2444910c61 100644
--- a/src/mess/includes/mpf1.h
+++ b/src/mess/includes/mpf1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MPF1__
diff --git a/src/mess/includes/msbc1.h b/src/mess/includes/msbc1.h
index 9530fd6c3e2..2b7620f003c 100644
--- a/src/mess/includes/msbc1.h
+++ b/src/mess/includes/msbc1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MSBC1__
diff --git a/src/mess/includes/msx.h b/src/mess/includes/msx.h
index b2e73582297..bc94e3b2489 100644
--- a/src/mess/includes/msx.h
+++ b/src/mess/includes/msx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/msx.h
diff --git a/src/mess/includes/mtx.h b/src/mess/includes/mtx.h
index 3b1bad3d042..dcf00410063 100644
--- a/src/mess/includes/mtx.h
+++ b/src/mess/includes/mtx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Memotech MTX 500, MTX 512 and RS 128
diff --git a/src/mess/includes/mz700.h b/src/mess/includes/mz700.h
index be759e48023..6558180dbbd 100644
--- a/src/mess/includes/mz700.h
+++ b/src/mess/includes/mz700.h
@@ -1,9 +1,8 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Dirk Best
 /******************************************************************************
  *  Sharp MZ700
  *
- *  license: MAME
- *  copyright-holders: Juergen Buchmueller, Dirk Best
- *
  *  Reference: http://sharpmz.computingmuseum.com
  *
  ******************************************************************************/
diff --git a/src/mess/includes/mz80.h b/src/mess/includes/mz80.h
index 1d111bf9bef..1f650c2fc80 100644
--- a/src/mess/includes/mz80.h
+++ b/src/mess/includes/mz80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/mz80.h
diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h
index 302f0ed6958..dd9d2a8bb50 100644
--- a/src/mess/includes/nascom1.h
+++ b/src/mess/includes/nascom1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Nascom 1 and Nascom 2
diff --git a/src/mess/includes/nc.h b/src/mess/includes/nc.h
index a951d3c2370..e2c7a505071 100644
--- a/src/mess/includes/nc.h
+++ b/src/mess/includes/nc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/nc.h
diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h
index 7c34c693545..256fe17f828 100644
--- a/src/mess/includes/nes.h
+++ b/src/mess/includes/nes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     nes.h
diff --git a/src/mess/includes/next.h b/src/mess/includes/next.h
index ecc218dcadc..ed0ac2e15e9 100644
--- a/src/mess/includes/next.h
+++ b/src/mess/includes/next.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __NEXT__
diff --git a/src/mess/includes/ondra.h b/src/mess/includes/ondra.h
index c9090844ca9..9d2860c8167 100644
--- a/src/mess/includes/ondra.h
+++ b/src/mess/includes/ondra.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ondra.h
diff --git a/src/mess/includes/orao.h b/src/mess/includes/orao.h
index 20feaa4f6c5..9de48159215 100644
--- a/src/mess/includes/orao.h
+++ b/src/mess/includes/orao.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/orao.h
diff --git a/src/mess/includes/orion.h b/src/mess/includes/orion.h
index 6f40ab5de82..1393a086421 100644
--- a/src/mess/includes/orion.h
+++ b/src/mess/includes/orion.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/orion.h
diff --git a/src/mess/includes/osborne1.h b/src/mess/includes/osborne1.h
index def8c716c4e..0170ab45650 100644
--- a/src/mess/includes/osborne1.h
+++ b/src/mess/includes/osborne1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/osborne1.h
diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h
index e0cdae9b058..c828a43715a 100644
--- a/src/mess/includes/osi.h
+++ b/src/mess/includes/osi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __OSI__
diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h
index 903b5e28910..72aa604b5f4 100644
--- a/src/mess/includes/p2000t.h
+++ b/src/mess/includes/p2000t.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/p2000t.h
diff --git a/src/mess/includes/partner.h b/src/mess/includes/partner.h
index f4d9e845345..5d766288cbb 100644
--- a/src/mess/includes/partner.h
+++ b/src/mess/includes/partner.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/partner.h
diff --git a/src/mess/includes/pasopia.h b/src/mess/includes/pasopia.h
index c69d08061a9..879a9cd4396 100644
--- a/src/mess/includes/pasopia.h
+++ b/src/mess/includes/pasopia.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define PASOPIA_KEYBOARD \
 	PORT_START("KEY0") \
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2) \
diff --git a/src/mess/includes/pc1251.h b/src/mess/includes/pc1251.h
index ddb7ae73432..ca884a2dc6d 100644
--- a/src/mess/includes/pc1251.h
+++ b/src/mess/includes/pc1251.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pc1251.h
diff --git a/src/mess/includes/pc1350.h b/src/mess/includes/pc1350.h
index d48754f4950..c6ae7eadbc4 100644
--- a/src/mess/includes/pc1350.h
+++ b/src/mess/includes/pc1350.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pc1350.h
diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h
index 081f4daa5f4..53e90fb4b6c 100644
--- a/src/mess/includes/pc1401.h
+++ b/src/mess/includes/pc1401.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pc1401.h
diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h
index 063d31a3a28..f2502ea95be 100644
--- a/src/mess/includes/pc1403.h
+++ b/src/mess/includes/pc1403.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pc1403.h
diff --git a/src/mess/includes/pce.h b/src/mess/includes/pce.h
index 702c8e8fa99..5e332eb702d 100644
--- a/src/mess/includes/pce.h
+++ b/src/mess/includes/pce.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pce.h
diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h
index 780b41957f2..37a59f74578 100644
--- a/src/mess/includes/pcw.h
+++ b/src/mess/includes/pcw.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pcw.h
diff --git a/src/mess/includes/pcw16.h b/src/mess/includes/pcw16.h
index 0d60f73f47f..b127098e3c5 100644
--- a/src/mess/includes/pcw16.h
+++ b/src/mess/includes/pcw16.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pcw16.h
diff --git a/src/mess/includes/pdp1.h b/src/mess/includes/pdp1.h
index 0607de727bd..c1a68efe009 100644
--- a/src/mess/includes/pdp1.h
+++ b/src/mess/includes/pdp1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pdp1.h
diff --git a/src/mess/includes/pecom.h b/src/mess/includes/pecom.h
index 149c64c1534..8a93cf31f68 100644
--- a/src/mess/includes/pecom.h
+++ b/src/mess/includes/pecom.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PECOM__
 #define __PECOM__
 
diff --git a/src/mess/includes/pes.h b/src/mess/includes/pes.h
index f6d5dddd8fc..eb7e33bd3cb 100644
--- a/src/mess/includes/pes.h
+++ b/src/mess/includes/pes.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         pes.h
diff --git a/src/mess/includes/pk8020.h b/src/mess/includes/pk8020.h
index 62a536c6755..09a9621bacb 100644
--- a/src/mess/includes/pk8020.h
+++ b/src/mess/includes/pk8020.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pk8020.h
diff --git a/src/mess/includes/pmd85.h b/src/mess/includes/pmd85.h
index ee0c7a008c6..67ff2ae0f60 100644
--- a/src/mess/includes/pmd85.h
+++ b/src/mess/includes/pmd85.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pmd85.h
diff --git a/src/mess/includes/pocketc.h b/src/mess/includes/pocketc.h
index 442ad41939e..12af2a938d0 100644
--- a/src/mess/includes/pocketc.h
+++ b/src/mess/includes/pocketc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pocketc.h
diff --git a/src/mess/includes/poisk1.h b/src/mess/includes/poisk1.h
index 33632dc7d89..8cd477f66d0 100644
--- a/src/mess/includes/poisk1.h
+++ b/src/mess/includes/poisk1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/poisk1.h
diff --git a/src/mess/includes/poly88.h b/src/mess/includes/poly88.h
index d891fd1505e..ee096a9d56d 100644
--- a/src/mess/includes/poly88.h
+++ b/src/mess/includes/poly88.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/poly88.h
diff --git a/src/mess/includes/pp01.h b/src/mess/includes/pp01.h
index f1b0c28fcf1..b4a070cadcd 100644
--- a/src/mess/includes/pp01.h
+++ b/src/mess/includes/pp01.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/pp01.h
diff --git a/src/mess/includes/primo.h b/src/mess/includes/primo.h
index a887efb49ad..46cf472cc8b 100644
--- a/src/mess/includes/primo.h
+++ b/src/mess/includes/primo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/primo.h
diff --git a/src/mess/includes/px8.h b/src/mess/includes/px8.h
index a7e8b8fce0e..fd44ebdb7e7 100644
--- a/src/mess/includes/px8.h
+++ b/src/mess/includes/px8.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __PX8__
diff --git a/src/mess/includes/radio86.h b/src/mess/includes/radio86.h
index 584d69bc965..3acfcf037c3 100644
--- a/src/mess/includes/radio86.h
+++ b/src/mess/includes/radio86.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/radio86.h
diff --git a/src/mess/includes/rm380z.h b/src/mess/includes/rm380z.h
index c2deaf19402..792569790e2 100644
--- a/src/mess/includes/rm380z.h
+++ b/src/mess/includes/rm380z.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
 
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h
index 78096d628f5..4ba751fc461 100644
--- a/src/mess/includes/rmnimbus.h
+++ b/src/mess/includes/rmnimbus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     rmnimbus.c
     Machine driver for the Research Machines Nimbus.
diff --git a/src/mess/includes/samcoupe.h b/src/mess/includes/samcoupe.h
index a2b3446588d..d984769d9c0 100644
--- a/src/mess/includes/samcoupe.h
+++ b/src/mess/includes/samcoupe.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/coupe.h
diff --git a/src/mess/includes/sms.h b/src/mess/includes/sms.h
index aa7eb1b5d37..594d5f63b80 100644
--- a/src/mess/includes/sms.h
+++ b/src/mess/includes/sms.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/sms.h
diff --git a/src/mess/includes/sorcerer.h b/src/mess/includes/sorcerer.h
index 5479d504d17..4c5bbb12a48 100644
--- a/src/mess/includes/sorcerer.h
+++ b/src/mess/includes/sorcerer.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/sorcerer.h
diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h
index 990662b8891..20b128a2122 100644
--- a/src/mess/includes/special.h
+++ b/src/mess/includes/special.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/special.h
diff --git a/src/mess/includes/spectrum.h b/src/mess/includes/spectrum.h
index dd86e8f242b..edce8208eea 100644
--- a/src/mess/includes/spectrum.h
+++ b/src/mess/includes/spectrum.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/spectrum.h
@@ -242,6 +244,7 @@ protected:
 	void ts2068_hires_scanline(bitmap_ind16 &bitmap, int y, int borderlines);
 	void ts2068_64col_scanline(bitmap_ind16 &bitmap, int y, int borderlines, unsigned short inkcolor);
 	void ts2068_lores_scanline(bitmap_ind16 &bitmap, int y, int borderlines, int screen);
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
 };
 
 
diff --git a/src/mess/includes/ssystem3.h b/src/mess/includes/ssystem3.h
index f88835d2e26..9faccf94161 100644
--- a/src/mess/includes/ssystem3.h
+++ b/src/mess/includes/ssystem3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ssystem3.h
diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h
index 013d2efafd1..7fc2e75c54b 100644
--- a/src/mess/includes/super80.h
+++ b/src/mess/includes/super80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h
index 682fc400ed1..48d6d5fd74f 100644
--- a/src/mess/includes/svi318.h
+++ b/src/mess/includes/svi318.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/svi318.h
diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h
index 21d5ab39795..57a674c4df5 100644
--- a/src/mess/includes/svision.h
+++ b/src/mess/includes/svision.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/svision.h
diff --git a/src/mess/includes/swtpc09.h b/src/mess/includes/swtpc09.h
index ce3d56c0a4c..9ac562f102e 100644
--- a/src/mess/includes/swtpc09.h
+++ b/src/mess/includes/swtpc09.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     swtpc09 include file
     Robert Justice ,2009-2014
diff --git a/src/mess/includes/tdv2324.h b/src/mess/includes/tdv2324.h
index f7e605da2af..702e05d38b9 100644
--- a/src/mess/includes/tdv2324.h
+++ b/src/mess/includes/tdv2324.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __TDV2324__
diff --git a/src/mess/includes/thomson.h b/src/mess/includes/thomson.h
index 75254b3961d..48abe8151c8 100644
--- a/src/mess/includes/thomson.h
+++ b/src/mess/includes/thomson.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/includes/ti85.h b/src/mess/includes/ti85.h
index 88cc93f3cd7..a9f8c07a389 100644
--- a/src/mess/includes/ti85.h
+++ b/src/mess/includes/ti85.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ti85.h
diff --git a/src/mess/includes/trs80.h b/src/mess/includes/trs80.h
index 9dac7b89fa4..69d4bccbb31 100644
--- a/src/mess/includes/trs80.h
+++ b/src/mess/includes/trs80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/trs80.h
diff --git a/src/mess/includes/tsispch.h b/src/mess/includes/tsispch.h
index 740d5867263..d10d053446d 100644
--- a/src/mess/includes/tsispch.h
+++ b/src/mess/includes/tsispch.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         tsispch.h
diff --git a/src/mess/includes/tx0.h b/src/mess/includes/tx0.h
index 9c526fef33d..10f61b6e297 100644
--- a/src/mess/includes/tx0.h
+++ b/src/mess/includes/tx0.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/tx0.h
diff --git a/src/mess/includes/ut88.h b/src/mess/includes/ut88.h
index d7d9a5751a0..613234b4cc5 100644
--- a/src/mess/includes/ut88.h
+++ b/src/mess/includes/ut88.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/ut88.h
diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h
index 82c59b38809..3dfec8c1bbd 100644
--- a/src/mess/includes/vc4000.h
+++ b/src/mess/includes/vc4000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/vc4000.h
diff --git a/src/mess/includes/vcs80.h b/src/mess/includes/vcs80.h
index 706f3b95f4f..6185b516cac 100644
--- a/src/mess/includes/vcs80.h
+++ b/src/mess/includes/vcs80.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __VCS80__
diff --git a/src/mess/includes/vector06.h b/src/mess/includes/vector06.h
index 4a8ad06fe64..0e617e2514e 100644
--- a/src/mess/includes/vector06.h
+++ b/src/mess/includes/vector06.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/vector06.h
diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h
index a010d424d37..dcc921b6729 100644
--- a/src/mess/includes/victor9k.h
+++ b/src/mess/includes/victor9k.h
@@ -4,9 +4,6 @@
 
     Victor 9000 / ACT Sirius 1 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/includes/vixen.h b/src/mess/includes/vixen.h
index 24867f80d52..1cfb550be70 100644
--- a/src/mess/includes/vixen.h
+++ b/src/mess/includes/vixen.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __VIXEN__
diff --git a/src/mess/includes/vtech2.h b/src/mess/includes/vtech2.h
index b579854d716..9af8a2e5540 100644
--- a/src/mess/includes/vtech2.h
+++ b/src/mess/includes/vtech2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/vtech2.h
diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h
index 391dd901b98..4aaeb854197 100644
--- a/src/mess/includes/wswan.h
+++ b/src/mess/includes/wswan.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/wswan.h
diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h
index f47bca4df61..c75f27f9c12 100644
--- a/src/mess/includes/x1.h
+++ b/src/mess/includes/x1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/x1.h
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index e1f1f433a88..905e26b5819 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/x68k.h
diff --git a/src/mess/includes/z80ne.h b/src/mess/includes/z80ne.h
index 64fb262e1ff..45b2d3c3151 100644
--- a/src/mess/includes/z80ne.h
+++ b/src/mess/includes/z80ne.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/z80ne.h
diff --git a/src/mess/includes/zx.h b/src/mess/includes/zx.h
index 874386a853d..b1b95c82c84 100644
--- a/src/mess/includes/zx.h
+++ b/src/mess/includes/zx.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/zx.h
diff --git a/src/mess/machine/6883sam.c b/src/mess/machine/6883sam.c
index 89bc062910f..2a17991c089 100644
--- a/src/mess/machine/6883sam.c
+++ b/src/mess/machine/6883sam.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     6883sam.c
diff --git a/src/mess/machine/6883sam.h b/src/mess/machine/6883sam.h
index 4d0b4def1ca..625ec275923 100644
--- a/src/mess/machine/6883sam.h
+++ b/src/mess/machine/6883sam.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     6883sam.h
diff --git a/src/mess/machine/abc1600mac.c b/src/mess/machine/abc1600mac.c
index 74e0f58213f..b22f55708c6 100644
--- a/src/mess/machine/abc1600mac.c
+++ b/src/mess/machine/abc1600mac.c
@@ -4,9 +4,6 @@
 
     Luxor ABC 1600 Memory Access Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/machine/abc1600mac.h b/src/mess/machine/abc1600mac.h
index 637a078fcae..c26c2dc9b09 100644
--- a/src/mess/machine/abc1600mac.h
+++ b/src/mess/machine/abc1600mac.h
@@ -4,9 +4,6 @@
 
     Luxor ABC 1600 Memory Access Controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/abc80kb.c b/src/mess/machine/abc80kb.c
index 7fa5f747b14..dd9471f5ee4 100644
--- a/src/mess/machine/abc80kb.c
+++ b/src/mess/machine/abc80kb.c
@@ -4,9 +4,6 @@
 
     Luxor ABC-80 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/machine/abc80kb.h b/src/mess/machine/abc80kb.h
index e1f422b18e6..d4d9a7fc08b 100644
--- a/src/mess/machine/abc80kb.h
+++ b/src/mess/machine/abc80kb.h
@@ -4,9 +4,6 @@
 
     Luxor ABC-80 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/ac1.c b/src/mess/machine/ac1.c
index b3ced599c92..140e2a695e1 100644
--- a/src/mess/machine/ac1.c
+++ b/src/mess/machine/ac1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         AC1 video driver by Miodrag Milanovic
diff --git a/src/mess/machine/advision.c b/src/mess/machine/advision.c
index 4dd92ae27f9..408ac4fe08c 100644
--- a/src/mess/machine/advision.c
+++ b/src/mess/machine/advision.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   advision.c
diff --git a/src/mess/machine/aim65.c b/src/mess/machine/aim65.c
index a4b4d53d1ce..f742fe69185 100644
--- a/src/mess/machine/aim65.c
+++ b/src/mess/machine/aim65.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
  AIM65
diff --git a/src/mess/machine/amigakbd.c b/src/mess/machine/amigakbd.c
index 55f57cdcdfb..1fa06ea8d82 100644
--- a/src/mess/machine/amigakbd.c
+++ b/src/mess/machine/amigakbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Keyboard
diff --git a/src/mess/machine/amigakbd.h b/src/mess/machine/amigakbd.h
index acd44f84a19..120809f0f27 100644
--- a/src/mess/machine/amigakbd.h
+++ b/src/mess/machine/amigakbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Amiga Keyboard
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index aea285de11e..7da73cf3556 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 827f2a33c4a..5de5bf0c46d 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * apollo.c - Apollo DS3500 CPU Board
  *
diff --git a/src/mess/machine/apollo_dbg.c b/src/mess/machine/apollo_dbg.c
index 6f6dfec89c4..9d2f91b965d 100644
--- a/src/mess/machine/apollo_dbg.c
+++ b/src/mess/machine/apollo_dbg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * debug/apollo.c - APOLLO DN3500/DN3000 debug functions
  *
diff --git a/src/mess/machine/apollo_kbd.c b/src/mess/machine/apollo_kbd.c
index 4c6c7501b66..87d1c9c2b1f 100644
--- a/src/mess/machine/apollo_kbd.c
+++ b/src/mess/machine/apollo_kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * apollo_kbd.c - Apollo keyboard and mouse emulation
  *
diff --git a/src/mess/machine/apollo_kbd.h b/src/mess/machine/apollo_kbd.h
index b10dfcf8a49..ba415b26e51 100644
--- a/src/mess/machine/apollo_kbd.h
+++ b/src/mess/machine/apollo_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * apollo_kbd.h
  *
diff --git a/src/mess/machine/appldriv.c b/src/mess/machine/appldriv.c
index 38521c90bc2..a7240b28e7d 100644
--- a/src/mess/machine/appldriv.c
+++ b/src/mess/machine/appldriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     appldriv.c
diff --git a/src/mess/machine/appldriv.h b/src/mess/machine/appldriv.h
index 29cf2759aa0..c1caf355dd9 100644
--- a/src/mess/machine/appldriv.h
+++ b/src/mess/machine/appldriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     appldriv.h
diff --git a/src/mess/machine/apple1.c b/src/mess/machine/apple1.c
index 4ffd0f563ae..5f64f1d1639 100644
--- a/src/mess/machine/apple1.c
+++ b/src/mess/machine/apple1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c
index c0726897ddd..fb0af46079d 100644
--- a/src/mess/machine/apple2.c
+++ b/src/mess/machine/apple2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   apple2.c
diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c
index e67a0d4a32b..1e1b674ad0c 100644
--- a/src/mess/machine/apple2gs.c
+++ b/src/mess/machine/apple2gs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     apple2gs.c
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index b33594f5ce8..4dfe3fd852b 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/apple3.c
diff --git a/src/mess/machine/applefdc.c b/src/mess/machine/applefdc.c
index de20160698e..b85c6f65e77 100644
--- a/src/mess/machine/applefdc.c
+++ b/src/mess/machine/applefdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     applefdc.c
diff --git a/src/mess/machine/applefdc.h b/src/mess/machine/applefdc.h
index 195cd9eb76f..83a801c48e2 100644
--- a/src/mess/machine/applefdc.h
+++ b/src/mess/machine/applefdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     applefdc.h
diff --git a/src/mess/machine/apricotkb.c b/src/mess/machine/apricotkb.c
index 683a7ce3b53..b5ac7517ce6 100644
--- a/src/mess/machine/apricotkb.c
+++ b/src/mess/machine/apricotkb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Apricot keyboard emulation
diff --git a/src/mess/machine/apricotkb.h b/src/mess/machine/apricotkb.h
index 75c0e98c217..258c36c4a0b 100644
--- a/src/mess/machine/apricotkb.h
+++ b/src/mess/machine/apricotkb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Apricot keyboard emulation
diff --git a/src/mess/machine/at.c b/src/mess/machine/at.c
index f9bf630c72e..f30f0b9589e 100644
--- a/src/mess/machine/at.c
+++ b/src/mess/machine/at.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM AT Compatibles
diff --git a/src/mess/machine/atarifdc.c b/src/mess/machine/atarifdc.c
index 8aa73fce4b8..b9cb365e72a 100644
--- a/src/mess/machine/atarifdc.c
+++ b/src/mess/machine/atarifdc.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     Atari 400/800
diff --git a/src/mess/machine/atarifdc.h b/src/mess/machine/atarifdc.h
index 4d1f544a129..f962849fd64 100644
--- a/src/mess/machine/atarifdc.h
+++ b/src/mess/machine/atarifdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     ataridev.h
 
diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c
index 252bcec9c9a..e319f55a6e2 100644
--- a/src/mess/machine/b2m.c
+++ b/src/mess/machine/b2m.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Bashkiria-2M machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c
index 12923f19048..a2520d92781 100644
--- a/src/mess/machine/bbc.c
+++ b/src/mess/machine/bbc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     BBC Model B
 
diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c
index b1db591ae6e..22bb1bb4375 100644
--- a/src/mess/machine/bebox.c
+++ b/src/mess/machine/bebox.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/bebox.c
diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c
index 6fff0d7dba7..d130393a219 100644
--- a/src/mess/machine/beta.c
+++ b/src/mess/machine/beta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     beta.h
diff --git a/src/mess/machine/beta.h b/src/mess/machine/beta.h
index 8093b7fe6c8..5f5c5068241 100644
--- a/src/mess/machine/beta.h
+++ b/src/mess/machine/beta.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     beta.h
diff --git a/src/mess/machine/bk.c b/src/mess/machine/bk.c
index 79dee805c8b..46cd61d8713 100644
--- a/src/mess/machine/bk.c
+++ b/src/mess/machine/bk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         BK machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/c65_old.c b/src/mess/machine/c65_old.c
index 8060f05c54c..360ab4c7e16 100644
--- a/src/mess/machine/c65_old.c
+++ b/src/mess/machine/c65_old.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     commodore c65 home computer
     peter.trauner@jk.uni-linz.ac.at
diff --git a/src/mess/machine/cbm_snqk.c b/src/mess/machine/cbm_snqk.c
index 108e262496e..f21f44f6c1b 100644
--- a/src/mess/machine/cbm_snqk.c
+++ b/src/mess/machine/cbm_snqk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************
 
  CBM Quickloads
diff --git a/src/mess/machine/cbm_snqk.h b/src/mess/machine/cbm_snqk.h
index fbb6913b6cc..ecf53773f1d 100644
--- a/src/mess/machine/cbm_snqk.h
+++ b/src/mess/machine/cbm_snqk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************
 
     CBM Quickloads
diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c
index 84bacb9b077..0d182a56ea5 100644
--- a/src/mess/machine/cgenie.c
+++ b/src/mess/machine/cgenie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c
index 656785d5f16..a55204e1517 100644
--- a/src/mess/machine/coco.c
+++ b/src/mess/machine/coco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco.c
diff --git a/src/mess/machine/coco12.c b/src/mess/machine/coco12.c
index 4bdf46f538a..ea038911242 100644
--- a/src/mess/machine/coco12.c
+++ b/src/mess/machine/coco12.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco12.c
diff --git a/src/mess/machine/coco3.c b/src/mess/machine/coco3.c
index 36d2544399d..efccef2902c 100644
--- a/src/mess/machine/coco3.c
+++ b/src/mess/machine/coco3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco3.c
diff --git a/src/mess/machine/coco_vhd.c b/src/mess/machine/coco_vhd.c
index 4f0761e056c..9579bfe7ba6 100644
--- a/src/mess/machine/coco_vhd.c
+++ b/src/mess/machine/coco_vhd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_vhd.c
diff --git a/src/mess/machine/coco_vhd.h b/src/mess/machine/coco_vhd.h
index bb682b87915..e23eae855e7 100644
--- a/src/mess/machine/coco_vhd.h
+++ b/src/mess/machine/coco_vhd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     coco_vhd.h
diff --git a/src/mess/machine/coleco.c b/src/mess/machine/coleco.c
index 20d17672904..58639d2e4ea 100644
--- a/src/mess/machine/coleco.c
+++ b/src/mess/machine/coleco.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "machine/coleco.h"
 
diff --git a/src/mess/machine/coleco.h b/src/mess/machine/coleco.h
index d5d43335ddd..550e5dca05d 100644
--- a/src/mess/machine/coleco.h
+++ b/src/mess/machine/coleco.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __COLECO_CONTROLLERS__
diff --git a/src/mess/machine/compiskb.c b/src/mess/machine/compiskb.c
index 4a7ba9bc97c..1fe9e356ec8 100644
--- a/src/mess/machine/compiskb.c
+++ b/src/mess/machine/compiskb.c
@@ -4,9 +4,6 @@
 
     Telenova Compis keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "compiskb.h"
diff --git a/src/mess/machine/compiskb.h b/src/mess/machine/compiskb.h
index 66b6f76dcc5..1872c3506c2 100644
--- a/src/mess/machine/compiskb.h
+++ b/src/mess/machine/compiskb.h
@@ -4,9 +4,6 @@
 
     Telenova Compis keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/concept.c b/src/mess/machine/concept.c
index e071d92452c..6e150346fcc 100644
--- a/src/mess/machine/concept.c
+++ b/src/mess/machine/concept.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Corvus Concept driver
 
diff --git a/src/mess/machine/cuda.c b/src/mess/machine/cuda.c
index c7321554409..aa74ed2a3cb 100644
--- a/src/mess/machine/cuda.c
+++ b/src/mess/machine/cuda.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Apple "Cuda" ADB/system controller MCU
     Emulation by R. Belmont
diff --git a/src/mess/machine/cuda.h b/src/mess/machine/cuda.h
index ef03ef02bf5..35464046b01 100644
--- a/src/mess/machine/cuda.h
+++ b/src/mess/machine/cuda.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __CUDA_H__
diff --git a/src/mess/machine/cx4data.inc b/src/mess/machine/cx4data.inc
index c7308daa93c..17e2f39d6aa 100644
--- a/src/mess/machine/cx4data.inc
+++ b/src/mess/machine/cx4data.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cx4data.c
diff --git a/src/mess/machine/cx4fn.inc b/src/mess/machine/cx4fn.inc
index d6cc3b54213..1b51bceccfc 100644
--- a/src/mess/machine/cx4fn.inc
+++ b/src/mess/machine/cx4fn.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cx4fn.c
diff --git a/src/mess/machine/cx4oam.inc b/src/mess/machine/cx4oam.inc
index 983e573e828..0b58fd7d6ce 100644
--- a/src/mess/machine/cx4oam.inc
+++ b/src/mess/machine/cx4oam.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cx4oam.c
diff --git a/src/mess/machine/cx4ops.inc b/src/mess/machine/cx4ops.inc
index 06d9789c1eb..d624dc9535a 100644
--- a/src/mess/machine/cx4ops.inc
+++ b/src/mess/machine/cx4ops.inc
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     cx4ops.c
diff --git a/src/mess/machine/cybiko.c b/src/mess/machine/cybiko.c
index ee0fdb461d8..de123b67492 100644
--- a/src/mess/machine/cybiko.c
+++ b/src/mess/machine/cybiko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Cybiko Wireless Inter-tainment System
diff --git a/src/mess/machine/dai.c b/src/mess/machine/dai.c
index b1a0752f5dc..b525eb8318e 100644
--- a/src/mess/machine/dai.c
+++ b/src/mess/machine/dai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine/dai.c
diff --git a/src/mess/machine/dccons.c b/src/mess/machine/dccons.c
index d516fabda28..72e14416ca3 100644
--- a/src/mess/machine/dccons.c
+++ b/src/mess/machine/dccons.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     dc.c - Sega Dreamcast hardware
diff --git a/src/mess/machine/dec_lk201.c b/src/mess/machine/dec_lk201.c
index fa10169151d..37d5a46f6f5 100644
--- a/src/mess/machine/dec_lk201.c
+++ b/src/mess/machine/dec_lk201.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     DEC LK-201 keyboard
     Emulation by R. Belmont & M. Burke
diff --git a/src/mess/machine/dec_lk201.h b/src/mess/machine/dec_lk201.h
index e275d0955b4..db7903cbbcf 100644
--- a/src/mess/machine/dec_lk201.h
+++ b/src/mess/machine/dec_lk201.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __LK201_H__
diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c
index 288db7e759a..a1734f93254 100644
--- a/src/mess/machine/dgn_beta.c
+++ b/src/mess/machine/dgn_beta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine\dgn_beta.c (machine.c)
diff --git a/src/mess/machine/dgnalpha.c b/src/mess/machine/dgnalpha.c
index aa704f53c61..865906f0e0e 100644
--- a/src/mess/machine/dgnalpha.c
+++ b/src/mess/machine/dgnalpha.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dgnalpha.c
diff --git a/src/mess/machine/docg3.c b/src/mess/machine/docg3.c
index 8abc48343d4..afd5b4fab30 100644
--- a/src/mess/machine/docg3.c
+++ b/src/mess/machine/docg3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     M-Systems DiskOnChip G3 - Flash Disk with MLC NAND and M-Systems? x2 Technology
diff --git a/src/mess/machine/docg3.h b/src/mess/machine/docg3.h
index 6d773edd938..d7f0855c30b 100644
--- a/src/mess/machine/docg3.h
+++ b/src/mess/machine/docg3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     M-Systems DiskOnChip G3 - Flash Disk with MLC NAND and M-Systems? x2 Technology
diff --git a/src/mess/machine/dragon.c b/src/mess/machine/dragon.c
index 434003a9367..dbe471002e6 100644
--- a/src/mess/machine/dragon.c
+++ b/src/mess/machine/dragon.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     dragon.h
diff --git a/src/mess/machine/egret.c b/src/mess/machine/egret.c
index b0d760a635a..adfc381f229 100644
--- a/src/mess/machine/egret.c
+++ b/src/mess/machine/egret.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Apple "Egret" ADB/system controller MCU
     Emulation by R. Belmont
diff --git a/src/mess/machine/egret.h b/src/mess/machine/egret.h
index 2b3749a3482..c64bad537c2 100644
--- a/src/mess/machine/egret.h
+++ b/src/mess/machine/egret.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __EGRET_H__
diff --git a/src/mess/machine/einstein.c b/src/mess/machine/einstein.c
index 7e587c64a6e..aa9d461582e 100644
--- a/src/mess/machine/einstein.c
+++ b/src/mess/machine/einstein.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Tatung Einstein
diff --git a/src/mess/machine/electron.c b/src/mess/machine/electron.c
index e344624b444..d2572254eab 100644
--- a/src/mess/machine/electron.c
+++ b/src/mess/machine/electron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     Acorn Electron driver
 
diff --git a/src/mess/machine/esqpanel.c b/src/mess/machine/esqpanel.c
index 588f8bba3b7..20abc1e9282 100644
--- a/src/mess/machine/esqpanel.c
+++ b/src/mess/machine/esqpanel.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Ensoniq panel/display device
 */
diff --git a/src/mess/machine/esqpanel.h b/src/mess/machine/esqpanel.h
index 06715bac67f..250cbd0956c 100644
--- a/src/mess/machine/esqpanel.h
+++ b/src/mess/machine/esqpanel.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __ESQPANEL_H__
diff --git a/src/mess/machine/esqvfd.c b/src/mess/machine/esqvfd.c
index 02be3c6949a..0729a857718 100644
--- a/src/mess/machine/esqvfd.c
+++ b/src/mess/machine/esqvfd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Ensoniq Vacuum Fluorescent Displays (VFDs)
     Emulation by R. Belmont
diff --git a/src/mess/machine/esqvfd.h b/src/mess/machine/esqvfd.h
index 25ca6c503a9..e891c008e45 100644
--- a/src/mess/machine/esqvfd.h
+++ b/src/mess/machine/esqvfd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef ESQVFD_H
 #define ESQVFD_H
 
diff --git a/src/mess/machine/fm_scsi.c b/src/mess/machine/fm_scsi.c
index 187539f2097..b73aa83fa81 100644
--- a/src/mess/machine/fm_scsi.c
+++ b/src/mess/machine/fm_scsi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *
  *  Implementation of Fujitsu FMR-50, FMR-60 and FM-Towns SCSI hardware
diff --git a/src/mess/machine/fm_scsi.h b/src/mess/machine/fm_scsi.h
index 9adb609f21a..a71382d9bb1 100644
--- a/src/mess/machine/fm_scsi.h
+++ b/src/mess/machine/fm_scsi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * fm_scsi.h
  *
diff --git a/src/mess/machine/galaxy.c b/src/mess/machine/galaxy.c
index 8a870a4eec4..78f6c233bc8 100644
--- a/src/mess/machine/galaxy.c
+++ b/src/mess/machine/galaxy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/gamecom.c b/src/mess/machine/gamecom.c
index 2d2b9908c71..9d85670cc5d 100644
--- a/src/mess/machine/gamecom.c
+++ b/src/mess/machine/gamecom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/gamecom.h"
 
diff --git a/src/mess/machine/gamepock.c b/src/mess/machine/gamepock.c
index 8c43df24314..79c5a8457c7 100644
--- a/src/mess/machine/gamepock.c
+++ b/src/mess/machine/gamepock.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "sound/speaker.h"
 #include "cpu/upd7810/upd7810.h"
diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c
index d5e8e3292b7..d8ee00884ec 100644
--- a/src/mess/machine/gb.c
+++ b/src/mess/machine/gb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   gb.c
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c
index 366e3b69ed6..e524688a7c3 100644
--- a/src/mess/machine/genpc.c
+++ b/src/mess/machine/genpc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     machine/genpc.c
diff --git a/src/mess/machine/hec2hrp.c b/src/mess/machine/hec2hrp.c
index 48ad1016dcd..2f03c6c0a08 100644
--- a/src/mess/machine/hec2hrp.c
+++ b/src/mess/machine/hec2hrp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /////////////////////////////////////////////////////////////////////////
 // HEC2HRP.C  in machine
 /*      Hector 2HR+
diff --git a/src/mess/machine/hecdisk2.c b/src/mess/machine/hecdisk2.c
index e9650371d59..6db87e859ec 100644
--- a/src/mess/machine/hecdisk2.c
+++ b/src/mess/machine/hecdisk2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************/
 /************ HECDISK2.C  in machine  ******************/
 /*******************************************************/
diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c
index a40bb747bd9..ffc7b018c6a 100644
--- a/src/mess/machine/hp48.c
+++ b/src/mess/machine/hp48.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2008
diff --git a/src/mess/machine/ie15_kbd.c b/src/mess/machine/ie15_kbd.c
index 8a3438e0750..a679638c55f 100644
--- a/src/mess/machine/ie15_kbd.c
+++ b/src/mess/machine/ie15_kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     15WWW-97-006 keyboard, normally used with 15IE-00-013.
diff --git a/src/mess/machine/ie15_kbd.h b/src/mess/machine/ie15_kbd.h
index 3985bed7ecb..caaa9498dab 100644
--- a/src/mess/machine/ie15_kbd.h
+++ b/src/mess/machine/ie15_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __IE15_KEYBOARD_H__
 #define __IE15_KEYBOARD_H__
 
diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c
index 52c250d030f..1f4bb9634dd 100644
--- a/src/mess/machine/intv.c
+++ b/src/mess/machine/intv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "video/stic.h"
 #include "includes/intv.h"
diff --git a/src/mess/machine/isbc_215g.c b/src/mess/machine/isbc_215g.c
index 5b8b3c751de..07a477ae170 100644
--- a/src/mess/machine/isbc_215g.c
+++ b/src/mess/machine/isbc_215g.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // license:BSD-3-Clause
 
 // Currently only emulates Shugart SA1000 interface disks (aka ST506)
diff --git a/src/mess/machine/isbc_215g.h b/src/mess/machine/isbc_215g.h
index bbccafedcf6..116a61d694c 100644
--- a/src/mess/machine/isbc_215g.h
+++ b/src/mess/machine/isbc_215g.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // license:BSD-3-Clause
 
 #ifndef ISBC_215G_H_
diff --git a/src/mess/machine/k7659kb.c b/src/mess/machine/k7659kb.c
index 0ebff409994..4e55e33c7fa 100644
--- a/src/mess/machine/k7659kb.c
+++ b/src/mess/machine/k7659kb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     K7659 keyboard emulation
diff --git a/src/mess/machine/k7659kb.h b/src/mess/machine/k7659kb.h
index 2c56dfa11e4..b69c18c0c40 100644
--- a/src/mess/machine/k7659kb.h
+++ b/src/mess/machine/k7659kb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     K7659 keyboard emulation
diff --git a/src/mess/machine/kay_kbd.c b/src/mess/machine/kay_kbd.c
index f7a822f74be..2568bd8af9c 100644
--- a/src/mess/machine/kay_kbd.c
+++ b/src/mess/machine/kay_kbd.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
  *
  *  kay_kbd.c
diff --git a/src/mess/machine/kaypro.c b/src/mess/machine/kaypro.c
index 778757b7860..594c9dfebcb 100644
--- a/src/mess/machine/kaypro.c
+++ b/src/mess/machine/kaypro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 #include "includes/kaypro.h"
diff --git a/src/mess/machine/kb_7007_3.h b/src/mess/machine/kb_7007_3.h
index 35de2e98484..3456a9632aa 100644
--- a/src/mess/machine/kb_7007_3.h
+++ b/src/mess/machine/kb_7007_3.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * MC 7007 keyboard, variant 3, used by mc1502.
  *
diff --git a/src/mess/machine/kb_poisk1.h b/src/mess/machine/kb_poisk1.h
index 7449452ad3a..aae042ff399 100644
--- a/src/mess/machine/kb_poisk1.h
+++ b/src/mess/machine/kb_poisk1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Poisk-1 keyboard
  *
diff --git a/src/mess/machine/kramermc.c b/src/mess/machine/kramermc.c
index 9aeb2cfd8e8..5b37399a13f 100644
--- a/src/mess/machine/kramermc.c
+++ b/src/mess/machine/kramermc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Kramer MC machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c
index 486d4981f3c..97509e3cd4f 100644
--- a/src/mess/machine/lisa.c
+++ b/src/mess/machine/lisa.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     experimental LISA driver
 
diff --git a/src/mess/machine/llc.c b/src/mess/machine/llc.c
index 8860e79958c..a955ce97d81 100644
--- a/src/mess/machine/llc.c
+++ b/src/mess/machine/llc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         LLC driver by Miodrag Milanovic
diff --git a/src/mess/machine/lviv.c b/src/mess/machine/lviv.c
index 4e5ec0e5b63..c29cb41a4f4 100644
--- a/src/mess/machine/lviv.c
+++ b/src/mess/machine/lviv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/lynx.c b/src/mess/machine/lynx.c
index df70f47f6d3..590fd18fb68 100644
--- a/src/mess/machine/lynx.c
+++ b/src/mess/machine/lynx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT mess@utanet.at 2000,2001
 ******************************************************************************/
diff --git a/src/mess/machine/m24_kbd.c b/src/mess/machine/m24_kbd.c
index 5a60d22e555..f18f19273f3 100644
--- a/src/mess/machine/m24_kbd.c
+++ b/src/mess/machine/m24_kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "m24_kbd.h"
 
 const device_type M24_KEYBOARD = &device_creator<m24_keyboard_device>;
diff --git a/src/mess/machine/m24_kbd.h b/src/mess/machine/m24_kbd.h
index 6a5dac2c6f7..5fbc419b001 100644
--- a/src/mess/machine/m24_kbd.h
+++ b/src/mess/machine/m24_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef M24KBD_H_
 #define M24KBD_H_
 
diff --git a/src/mess/machine/m24_z8000.c b/src/mess/machine/m24_z8000.c
index 540d47ddfb1..95bf712e61c 100644
--- a/src/mess/machine/m24_z8000.c
+++ b/src/mess/machine/m24_z8000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "m24_z8000.h"
 
 const device_type M24_Z8000 = &device_creator<m24_z8000_device>;
diff --git a/src/mess/machine/m24_z8000.h b/src/mess/machine/m24_z8000.h
index 1d27f882dd6..ef75dfc8fe3 100644
--- a/src/mess/machine/m24_z8000.h
+++ b/src/mess/machine/m24_z8000.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef M24_Z8000_H_
 #define M24_Z8000_H_
 
diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c
index 77bc05f0f8c..160a133120c 100644
--- a/src/mess/machine/mac.c
+++ b/src/mess/machine/mac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     machine/mac.c
diff --git a/src/mess/machine/macadb.c b/src/mess/machine/macadb.c
index dd0dafa208f..d79e8da8b10 100644
--- a/src/mess/machine/macadb.c
+++ b/src/mess/machine/macadb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   macadb.c - handles various aspects of ADB on the Mac.
diff --git a/src/mess/machine/mackbd.c b/src/mess/machine/mackbd.c
index a1e6e225d25..eb223ebd2f6 100644
--- a/src/mess/machine/mackbd.c
+++ b/src/mess/machine/mackbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Apple Macintosh original/512/Plus keyboard
     Emulation by R. Belmont
diff --git a/src/mess/machine/mackbd.h b/src/mess/machine/mackbd.h
index b7a571499a6..83923e23836 100644
--- a/src/mess/machine/mackbd.h
+++ b/src/mess/machine/mackbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MACKBD_H__
diff --git a/src/mess/machine/macpci.c b/src/mess/machine/macpci.c
index d0ffe0f9916..2a15ad49eca 100644
--- a/src/mess/machine/macpci.c
+++ b/src/mess/machine/macpci.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     machine/pcimac.c
diff --git a/src/mess/machine/macrtc.c b/src/mess/machine/macrtc.c
index b8d3aca5e7d..bade33f44ba 100644
--- a/src/mess/machine/macrtc.c
+++ b/src/mess/machine/macrtc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   macrtc.c - the real-time clock & NVRAM chip used in early 680x0 Macs,
diff --git a/src/mess/machine/macrtc.h b/src/mess/machine/macrtc.h
index 76769653a0c..228fe9f3a0c 100644
--- a/src/mess/machine/macrtc.h
+++ b/src/mess/machine/macrtc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     macrtc.h - Apple 343-0042 real time clock and battery RAM
diff --git a/src/mess/machine/mbc55x.c b/src/mess/machine/mbc55x.c
index b0275f858a7..99652991834 100644
--- a/src/mess/machine/mbc55x.c
+++ b/src/mess/machine/mbc55x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     machine/mbc55x.c
 
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index cd9ba8d40f9..2d738a7221a 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
 
     microbee.c
diff --git a/src/mess/machine/mboard.c b/src/mess/machine/mboard.c
index a669df137e1..d7c2e583c9d 100644
--- a/src/mess/machine/mboard.c
+++ b/src/mess/machine/mboard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
  Mephisto Chess Computers
diff --git a/src/mess/machine/mc80.c b/src/mess/machine/mc80.c
index d154cc20dcd..a604ba6b323 100644
--- a/src/mess/machine/mc80.c
+++ b/src/mess/machine/mc80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         MC-80.xx by Miodrag Milanovic
diff --git a/src/mess/machine/mega32x.c b/src/mess/machine/mega32x.c
index 70c15fdea3e..c433a2b6fd1 100644
--- a/src/mess/machine/mega32x.c
+++ b/src/mess/machine/mega32x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Megadrive / Genesis 32X emulation */
 
 /*
diff --git a/src/mess/machine/mega32x.h b/src/mess/machine/mega32x.h
index b3c6dc8eaf9..a6e48103297 100644
--- a/src/mess/machine/mega32x.h
+++ b/src/mess/machine/mega32x.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* 32X */
 
 
diff --git a/src/mess/machine/megacd.c b/src/mess/machine/megacd.c
index 60b6af5e559..78766c3c59f 100644
--- a/src/mess/machine/megacd.c
+++ b/src/mess/machine/megacd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "machine/megacd.h"
 #include "machine/nvram.h"
diff --git a/src/mess/machine/megacd.h b/src/mess/machine/megacd.h
index a17811b9842..e7afd33f509 100644
--- a/src/mess/machine/megacd.h
+++ b/src/mess/machine/megacd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Sega CD / Mega CD */
 
 #include "cpu/m68000/m68000.h"
diff --git a/src/mess/machine/megacdcd.c b/src/mess/machine/megacdcd.c
index 8885e62e671..9536a339a54 100644
--- a/src/mess/machine/megacdcd.c
+++ b/src/mess/machine/megacdcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* CD controller code from megacd.c, used by Sega CD / Mega CD */
 
 /* todo: cleanup(!!), make more generic, unifiy implementation with NeoCD, turn into a device and move to the proper lc89510.c file
diff --git a/src/mess/machine/megacdcd.h b/src/mess/machine/megacdcd.h
index 12c3a7d4993..a1936407e65 100644
--- a/src/mess/machine/megacdcd.h
+++ b/src/mess/machine/megacdcd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/cdda.h"
 #include "imagedev/chd_cd.h"
diff --git a/src/mess/machine/microdrv.c b/src/mess/machine/microdrv.c
index 93923db937b..d6d39241f37 100644
--- a/src/mess/machine/microdrv.c
+++ b/src/mess/machine/microdrv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     microdrv.c
diff --git a/src/mess/machine/microdrv.h b/src/mess/machine/microdrv.h
index 51107e1c4b5..bbb01b8bc12 100644
--- a/src/mess/machine/microdrv.h
+++ b/src/mess/machine/microdrv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     microdrv.h
diff --git a/src/mess/machine/micropolis.c b/src/mess/machine/micropolis.c
index fec75de110b..9180f3158d5 100644
--- a/src/mess/machine/micropolis.c
+++ b/src/mess/machine/micropolis.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     micropolis.c
diff --git a/src/mess/machine/micropolis.h b/src/mess/machine/micropolis.h
index 3780232a2ea..4a94f1be34d 100644
--- a/src/mess/machine/micropolis.h
+++ b/src/mess/machine/micropolis.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     micropolis.h
diff --git a/src/mess/machine/microtan.c b/src/mess/machine/microtan.c
index 7681b89d140..4fca3fe18ca 100644
--- a/src/mess/machine/microtan.c
+++ b/src/mess/machine/microtan.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /******************************************************************************
  *  Microtan 65
  *
diff --git a/src/mess/machine/mikro80.c b/src/mess/machine/mikro80.c
index aae990f0de5..a77ba26f50f 100644
--- a/src/mess/machine/mikro80.c
+++ b/src/mess/machine/mikro80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Mikro-80 machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/mm1kb.c b/src/mess/machine/mm1kb.c
index 79efd3b9a15..3b74ca8650d 100644
--- a/src/mess/machine/mm1kb.c
+++ b/src/mess/machine/mm1kb.c
@@ -4,9 +4,6 @@
 
     Nokia MikroMikko 1 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "mm1kb.h"
diff --git a/src/mess/machine/mm1kb.h b/src/mess/machine/mm1kb.h
index a6a9b825f3e..00e8ddebf73 100644
--- a/src/mess/machine/mm1kb.h
+++ b/src/mess/machine/mm1kb.h
@@ -4,9 +4,6 @@
 
     Nokia MikroMikko 1 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/ms7004.c b/src/mess/machine/ms7004.c
index da8108bcad4..f3da65f5ae2 100644
--- a/src/mess/machine/ms7004.c
+++ b/src/mess/machine/ms7004.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Electronika MS 7004 keyboard (DEC LK-201 workalike with extra keys
     for Cyrillic characters).
diff --git a/src/mess/machine/ms7004.h b/src/mess/machine/ms7004.h
index 1602320d5ea..236983cc396 100644
--- a/src/mess/machine/ms7004.h
+++ b/src/mess/machine/ms7004.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #pragma once
 
 #ifndef __MS7004_H__
diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c
index 54bcd2f65c5..2fcbbd6dad5 100644
--- a/src/mess/machine/msx.c
+++ b/src/mess/machine/msx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * msx.c: MSX emulation
  *
diff --git a/src/mess/machine/msx_matsushita.c b/src/mess/machine/msx_matsushita.c
index 2bea7093d4f..b7adb425817 100644
--- a/src/mess/machine/msx_matsushita.c
+++ b/src/mess/machine/msx_matsushita.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msx_matsushita.h"
 
diff --git a/src/mess/machine/msx_matsushita.h b/src/mess/machine/msx_matsushita.h
index 123a5357423..c5d8b0a9c1c 100644
--- a/src/mess/machine/msx_matsushita.h
+++ b/src/mess/machine/msx_matsushita.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_MATSUSHITA_H
 #define __MSX_MATSUSHITA_H
 
diff --git a/src/mess/machine/msx_s1985.c b/src/mess/machine/msx_s1985.c
index aba2802922e..1939bdf840f 100644
--- a/src/mess/machine/msx_s1985.c
+++ b/src/mess/machine/msx_s1985.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msx_s1985.h"
 
diff --git a/src/mess/machine/msx_s1985.h b/src/mess/machine/msx_s1985.h
index 21c45c4aa55..3389546563a 100644
--- a/src/mess/machine/msx_s1985.h
+++ b/src/mess/machine/msx_s1985.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_S1985_H
 #define __MSX_S1985_H
 
diff --git a/src/mess/machine/msx_switched.c b/src/mess/machine/msx_switched.c
index cf81126f94b..78ba2d50240 100644
--- a/src/mess/machine/msx_switched.c
+++ b/src/mess/machine/msx_switched.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msx_switched.h"
 
diff --git a/src/mess/machine/msx_switched.h b/src/mess/machine/msx_switched.h
index 16848c1e3c7..0f858aa6a59 100644
--- a/src/mess/machine/msx_switched.h
+++ b/src/mess/machine/msx_switched.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SWITCHED_H
 #define __MSX_SWITCHED_H
 
diff --git a/src/mess/machine/msx_systemflags.c b/src/mess/machine/msx_systemflags.c
index 78b39a9335b..25cd3b3705d 100644
--- a/src/mess/machine/msx_systemflags.c
+++ b/src/mess/machine/msx_systemflags.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "msx_systemflags.h"
 
diff --git a/src/mess/machine/msx_systemflags.h b/src/mess/machine/msx_systemflags.h
index 28c5a060643..9650198df3c 100644
--- a/src/mess/machine/msx_systemflags.h
+++ b/src/mess/machine/msx_systemflags.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __MSX_SYSTEMFLAGS_H
 #define __MSX_SYSTEMFLAGS_H
 
diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c
index aff34257fd8..242a6343f2b 100644
--- a/src/mess/machine/mtx.c
+++ b/src/mess/machine/mtx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     Memotech MTX 500, MTX 512 and RS 128
diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c
index 910dde5d03f..a3a9f3514fa 100644
--- a/src/mess/machine/mz700.c
+++ b/src/mess/machine/mz700.c
@@ -1,9 +1,8 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller, Dirk Best
 /******************************************************************************
  *  Sharp MZ700
  *
- *  license: MAME
- *  copyright-holders: Juergen Buchmueller, Dirk Best
- *
  *  Reference: http://sharpmz.computingmuseum.com
  *
  *****************************************************************************/
diff --git a/src/mess/machine/mz80.c b/src/mess/machine/mz80.c
index 7a0fdfd5a25..ec5291d3a03 100644
--- a/src/mess/machine/mz80.c
+++ b/src/mess/machine/mz80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         MZ80 driver by Miodrag Milanovic
diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c
index e3cdbf0cccb..b8ad32c96f3 100644
--- a/src/mess/machine/nascom1.c
+++ b/src/mess/machine/nascom1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Nascom 1 and Nascom 2
diff --git a/src/mess/machine/nc.c b/src/mess/machine/nc.c
index 25246fbac18..4bdce4c4fe7 100644
--- a/src/mess/machine/nc.c
+++ b/src/mess/machine/nc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nc.c
diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c
index 8990fb6ae03..7fecc913388 100644
--- a/src/mess/machine/nes.c
+++ b/src/mess/machine/nes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
 
     nes.c
diff --git a/src/mess/machine/nextkbd.c b/src/mess/machine/nextkbd.c
index c451dfc3e7a..324ce61066d 100644
--- a/src/mess/machine/nextkbd.c
+++ b/src/mess/machine/nextkbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "nextkbd.h"
 
diff --git a/src/mess/machine/nextkbd.h b/src/mess/machine/nextkbd.h
index e3ac9107c70..485ad14364e 100644
--- a/src/mess/machine/nextkbd.h
+++ b/src/mess/machine/nextkbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __NEXTKBD_H__
 #define __NEXTKBD_H__
 
diff --git a/src/mess/machine/nextmo.c b/src/mess/machine/nextmo.c
index 0ab2a362830..1facf28eff7 100644
--- a/src/mess/machine/nextmo.c
+++ b/src/mess/machine/nextmo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "emu.h"
 #include "nextmo.h"
diff --git a/src/mess/machine/nextmo.h b/src/mess/machine/nextmo.h
index afea4f77a06..dc7112f0521 100644
--- a/src/mess/machine/nextmo.h
+++ b/src/mess/machine/nextmo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef NEXTMO_H
 #define NEXTMO_H
 
diff --git a/src/mess/machine/ngen_kb.c b/src/mess/machine/ngen_kb.c
index 0feb151a0f7..07d55aa3bf4 100644
--- a/src/mess/machine/ngen_kb.c
+++ b/src/mess/machine/ngen_kb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Convergent NGEN keyboard device
 
 #include "ngen_kb.h"
diff --git a/src/mess/machine/ngen_kb.h b/src/mess/machine/ngen_kb.h
index 2fdbfb36e36..5fd49adf83c 100644
--- a/src/mess/machine/ngen_kb.h
+++ b/src/mess/machine/ngen_kb.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // Convergent NGEN keyboard
 
 #ifndef NGEN_KB_H_
diff --git a/src/mess/machine/ondra.c b/src/mess/machine/ondra.c
index 83e75302fe3..21f96fc7081 100644
--- a/src/mess/machine/ondra.c
+++ b/src/mess/machine/ondra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Ondra driver by Miodrag Milanovic
diff --git a/src/mess/machine/orao.c b/src/mess/machine/orao.c
index 105c9cf5986..f0306c0da2f 100644
--- a/src/mess/machine/orao.c
+++ b/src/mess/machine/orao.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Orao machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/orion.c b/src/mess/machine/orion.c
index 015aa008767..fc8a74120cd 100644
--- a/src/mess/machine/orion.c
+++ b/src/mess/machine/orion.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Orion machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/osborne1.c b/src/mess/machine/osborne1.c
index 0e3a7282fb7..50a43b3cb98 100644
--- a/src/mess/machine/osborne1.c
+++ b/src/mess/machine/osborne1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 There are three IRQ sources:
diff --git a/src/mess/machine/p2000t.c b/src/mess/machine/p2000t.c
index d8d230a2350..cab5ee957e4 100644
--- a/src/mess/machine/p2000t.c
+++ b/src/mess/machine/p2000t.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   machine.c
diff --git a/src/mess/machine/partner.c b/src/mess/machine/partner.c
index d9f54e666a1..4baa4c44d51 100644
--- a/src/mess/machine/partner.c
+++ b/src/mess/machine/partner.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Partner driver by Miodrag Milanovic
diff --git a/src/mess/machine/pc1251.c b/src/mess/machine/pc1251.c
index 9930b89ac77..cfb99c3b863 100644
--- a/src/mess/machine/pc1251.c
+++ b/src/mess/machine/pc1251.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/sc61860/sc61860.h"
 
diff --git a/src/mess/machine/pc1350.c b/src/mess/machine/pc1350.c
index c664c8003ba..e9e6b50ebfe 100644
--- a/src/mess/machine/pc1350.c
+++ b/src/mess/machine/pc1350.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/sc61860/sc61860.h"
 
diff --git a/src/mess/machine/pc1401.c b/src/mess/machine/pc1401.c
index 12faf2f401a..3c4878f866c 100644
--- a/src/mess/machine/pc1401.c
+++ b/src/mess/machine/pc1401.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/sc61860/sc61860.h"
 
diff --git a/src/mess/machine/pc1403.c b/src/mess/machine/pc1403.c
index e77a47b771b..b3df57763ae 100644
--- a/src/mess/machine/pc1403.c
+++ b/src/mess/machine/pc1403.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "cpu/sc61860/sc61860.h"
 
diff --git a/src/mess/machine/pc1512kb.c b/src/mess/machine/pc1512kb.c
index bc3abd5bab8..6d4ef54e134 100644
--- a/src/mess/machine/pc1512kb.c
+++ b/src/mess/machine/pc1512kb.c
@@ -4,9 +4,6 @@
 
     Amstrad PC1512 Keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "pc1512kb.h"
diff --git a/src/mess/machine/pc1512kb.h b/src/mess/machine/pc1512kb.h
index e431977fe7e..a5012b69b8a 100644
--- a/src/mess/machine/pc1512kb.h
+++ b/src/mess/machine/pc1512kb.h
@@ -4,9 +4,6 @@
 
     Amstrad PC1512 Keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/pc9801_118.h b/src/mess/machine/pc9801_118.h
index 6c899ffff2b..454507018d5 100644
--- a/src/mess/machine/pc9801_118.h
+++ b/src/mess/machine/pc9801_118.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NEC PC-9801-118
diff --git a/src/mess/machine/pc9801_26.h b/src/mess/machine/pc9801_26.h
index e48a23d7ca3..185ad776acd 100644
--- a/src/mess/machine/pc9801_26.h
+++ b/src/mess/machine/pc9801_26.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
 Template for skeleton device
diff --git a/src/mess/machine/pc9801_86.h b/src/mess/machine/pc9801_86.h
index 6cf255b586f..1d44f612e11 100644
--- a/src/mess/machine/pc9801_86.h
+++ b/src/mess/machine/pc9801_86.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     NEC PC-9801-86
diff --git a/src/mess/machine/pc9801_cbus.h b/src/mess/machine/pc9801_cbus.h
index 0a15d5cbcfd..566d1901b5b 100644
--- a/src/mess/machine/pc9801_cbus.h
+++ b/src/mess/machine/pc9801_cbus.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
 
diff --git a/src/mess/machine/pc9801_kbd.h b/src/mess/machine/pc9801_kbd.h
index 3e220a9045d..3dad22a7db0 100644
--- a/src/mess/machine/pc9801_kbd.h
+++ b/src/mess/machine/pc9801_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     PC-9801 Keyboard simulation
diff --git a/src/mess/machine/pcd_kbd.c b/src/mess/machine/pcd_kbd.c
index 47d3c9847f5..2307c6bb261 100644
--- a/src/mess/machine/pcd_kbd.c
+++ b/src/mess/machine/pcd_kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "pcd_kbd.h"
 
 const device_type PCD_KEYBOARD = &device_creator<pcd_keyboard_device>;
diff --git a/src/mess/machine/pcd_kbd.h b/src/mess/machine/pcd_kbd.h
index 9e013017b12..6a4089ed2a4 100644
--- a/src/mess/machine/pcd_kbd.h
+++ b/src/mess/machine/pcd_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PCD_KBD_H_
 #define PCD_KBD_H_
 
diff --git a/src/mess/machine/pce.c b/src/mess/machine/pce.c
index daee087e3b5..591854c9da8 100644
--- a/src/mess/machine/pce.c
+++ b/src/mess/machine/pce.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************
 
 PC Engine CD HW notes:
diff --git a/src/mess/machine/pce_cd.c b/src/mess/machine/pce_cd.c
index ffec0a7e5b4..0bfbae7cbf2 100644
--- a/src/mess/machine/pce_cd.c
+++ b/src/mess/machine/pce_cd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /************************************************************
 
 PC Engine CD HW notes:
diff --git a/src/mess/machine/pce_cd.h b/src/mess/machine/pce_cd.h
index bf2b29423b9..a77765eeb2f 100644
--- a/src/mess/machine/pce_cd.h
+++ b/src/mess/machine/pce_cd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __PCE_CD_H
 #define __PCE_CD_H
 
diff --git a/src/mess/machine/pecom.c b/src/mess/machine/pecom.c
index e9333b15bc0..6669a3152d4 100644
--- a/src/mess/machine/pecom.c
+++ b/src/mess/machine/pecom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Pecom driver by Miodrag Milanovic
diff --git a/src/mess/machine/pk8020.c b/src/mess/machine/pk8020.c
index 2bcba99f230..79033f2b147 100644
--- a/src/mess/machine/pk8020.c
+++ b/src/mess/machine/pk8020.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         PK-8020 driver by Miodrag Milanovic
diff --git a/src/mess/machine/pmd85.c b/src/mess/machine/pmd85.c
index 92fead9f97d..b59a1f298aa 100644
--- a/src/mess/machine/pmd85.c
+++ b/src/mess/machine/pmd85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/poly88.c b/src/mess/machine/poly88.c
index ee08bf7ed72..16039d7d4a1 100644
--- a/src/mess/machine/poly88.c
+++ b/src/mess/machine/poly88.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Poly-88 machine by Miodrag Milanovic
diff --git a/src/mess/machine/pp01.c b/src/mess/machine/pp01.c
index 6a85659e7e9..a7b51c66590 100644
--- a/src/mess/machine/pp01.c
+++ b/src/mess/machine/pp01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         PP-01 driver by Miodrag Milanovic
diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c
index d82df83669d..948dc5b57fb 100644
--- a/src/mess/machine/primo.c
+++ b/src/mess/machine/primo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*******************************************************************************
 
     primo.c
diff --git a/src/mess/machine/prof80mmu.c b/src/mess/machine/prof80mmu.c
index 720fef9abd4..88756e75374 100644
--- a/src/mess/machine/prof80mmu.c
+++ b/src/mess/machine/prof80mmu.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Conitec PROF-80 Memory Management Unit emulation
diff --git a/src/mess/machine/prof80mmu.h b/src/mess/machine/prof80mmu.h
index f7407ddb208..c5500e660ee 100644
--- a/src/mess/machine/prof80mmu.h
+++ b/src/mess/machine/prof80mmu.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Conitec PROF-80 Memory Management Unit emulation
diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c
index 9216ec947dd..18828b0701d 100644
--- a/src/mess/machine/psxcd.c
+++ b/src/mess/machine/psxcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "psxcd.h"
 #include "debugger.h"
diff --git a/src/mess/machine/psxcd.h b/src/mess/machine/psxcd.h
index 79bbc988972..1a7165b35e2 100644
--- a/src/mess/machine/psxcd.h
+++ b/src/mess/machine/psxcd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _included_psxcdrom_
 #define _included_psxcdrom_
 
diff --git a/src/mess/machine/qimi.c b/src/mess/machine/qimi.c
index fd7288ae82f..e1a55134b69 100644
--- a/src/mess/machine/qimi.c
+++ b/src/mess/machine/qimi.c
@@ -4,9 +4,6 @@
 
     QJump/Quanta QL Internal Mouse Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "qimi.h"
diff --git a/src/mess/machine/qimi.h b/src/mess/machine/qimi.h
index 73aba4f87e7..bf513da9042 100644
--- a/src/mess/machine/qimi.h
+++ b/src/mess/machine/qimi.h
@@ -4,9 +4,6 @@
 
     QJump/Quanta QL Internal Mouse Interface emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/qx10kbd.c b/src/mess/machine/qx10kbd.c
index 3087a7835c1..af8676bfbc3 100644
--- a/src/mess/machine/qx10kbd.c
+++ b/src/mess/machine/qx10kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 // TODO: dump 8049 mcu; key repeat
 
 #include "machine/qx10kbd.h"
diff --git a/src/mess/machine/qx10kbd.h b/src/mess/machine/qx10kbd.h
index b548e6d2c53..c5036f677e8 100644
--- a/src/mess/machine/qx10kbd.h
+++ b/src/mess/machine/qx10kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef QX10KBD_H_
 #define QX10KBD_H_
 
diff --git a/src/mess/machine/radio86.c b/src/mess/machine/radio86.c
index 46ea0bf1d93..fcd0b9e7b73 100644
--- a/src/mess/machine/radio86.c
+++ b/src/mess/machine/radio86.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Radio-86RK machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/rm380z.c b/src/mess/machine/rm380z.c
index 548fb1749c6..fca323782ea 100644
--- a/src/mess/machine/rm380z.c
+++ b/src/mess/machine/rm380z.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
 
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index 788a94daf9b..36685614861 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     machine/rmnimbus.c
 
diff --git a/src/mess/machine/rmnkbd.c b/src/mess/machine/rmnkbd.c
index 743039b1abf..0694eacb798 100644
--- a/src/mess/machine/rmnkbd.c
+++ b/src/mess/machine/rmnkbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/rmnkbd.h"
 
 rmnimbus_keyboard_device::rmnimbus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
diff --git a/src/mess/machine/rmnkbd.h b/src/mess/machine/rmnkbd.h
index 2849b9c956e..5b04a3c7878 100644
--- a/src/mess/machine/rmnkbd.h
+++ b/src/mess/machine/rmnkbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef RMNKBD_H_
 #define RMNKBD_H_
 
diff --git a/src/mess/machine/rx01.c b/src/mess/machine/rx01.c
index 91d01694d27..e916be7a1fb 100644
--- a/src/mess/machine/rx01.c
+++ b/src/mess/machine/rx01.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /**********************************************************************
 
     DEC RX01 floppy drive controller
diff --git a/src/mess/machine/rx01.h b/src/mess/machine/rx01.h
index 9e556f6d732..577fb92b5f4 100644
--- a/src/mess/machine/rx01.h
+++ b/src/mess/machine/rx01.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 /**********************************************************************
 
     DEC RX01 floppy drive controller
diff --git a/src/mess/machine/samcoupe.c b/src/mess/machine/samcoupe.c
index 59439d093b2..6a913ede2cb 100644
--- a/src/mess/machine/samcoupe.c
+++ b/src/mess/machine/samcoupe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Miles Gordon Technology SAM Coupe
diff --git a/src/mess/machine/sgi.c b/src/mess/machine/sgi.c
index e45be40ecae..37a8f6bfc5f 100644
--- a/src/mess/machine/sgi.c
+++ b/src/mess/machine/sgi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sgi.c
diff --git a/src/mess/machine/sgi.h b/src/mess/machine/sgi.h
index d56c9ec5887..67bf8447bfc 100644
--- a/src/mess/machine/sgi.h
+++ b/src/mess/machine/sgi.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sgi.h
diff --git a/src/mess/machine/smartmed.c b/src/mess/machine/smartmed.c
index 4697959733c..d9827379772 100644
--- a/src/mess/machine/smartmed.c
+++ b/src/mess/machine/smartmed.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     smartmed.c: SmartMedia Flash ROM emulation
 
diff --git a/src/mess/machine/smartmed.h b/src/mess/machine/smartmed.h
index e913870bdca..1eb75624c13 100644
--- a/src/mess/machine/smartmed.h
+++ b/src/mess/machine/smartmed.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     smartmed.h: header file for smartmed.c
 */
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 402caedba67..17e76b0d05b 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "crsshair.h"
 #include "video/315_5124.h"
diff --git a/src/mess/machine/snescx4.c b/src/mess/machine/snescx4.c
index dc534df4531..1deed4c9f90 100644
--- a/src/mess/machine/snescx4.c
+++ b/src/mess/machine/snescx4.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     snescx4.c
diff --git a/src/mess/machine/snescx4.h b/src/mess/machine/snescx4.h
index 6743066b8cc..9ed058bdaad 100644
--- a/src/mess/machine/snescx4.h
+++ b/src/mess/machine/snescx4.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     snescx4.h
diff --git a/src/mess/machine/sonydriv.c b/src/mess/machine/sonydriv.c
index 05739d4ad0f..dd03359f6e8 100644
--- a/src/mess/machine/sonydriv.c
+++ b/src/mess/machine/sonydriv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sonydriv.c
diff --git a/src/mess/machine/sonydriv.h b/src/mess/machine/sonydriv.h
index 2a4e3bcac65..83edc10a19e 100644
--- a/src/mess/machine/sonydriv.h
+++ b/src/mess/machine/sonydriv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     sonydriv.h
diff --git a/src/mess/machine/sorcerer.c b/src/mess/machine/sorcerer.c
index d3bbaf5d3a5..73f4a68a431 100644
--- a/src/mess/machine/sorcerer.c
+++ b/src/mess/machine/sorcerer.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   Exidy Sorcerer machine functions
diff --git a/src/mess/machine/spec_snqk.c b/src/mess/machine/spec_snqk.c
index 480c6188e18..26a2abc031e 100644
--- a/src/mess/machine/spec_snqk.c
+++ b/src/mess/machine/spec_snqk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   mess/machine/spec_snqk.c
diff --git a/src/mess/machine/spec_snqk.h b/src/mess/machine/spec_snqk.h
index ad79d920203..adebbd65ae3 100644
--- a/src/mess/machine/spec_snqk.h
+++ b/src/mess/machine/spec_snqk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * machine/spec_snqk.h
diff --git a/src/mess/machine/special.c b/src/mess/machine/special.c
index 10fcad6a137..2c46afa8a83 100644
--- a/src/mess/machine/special.c
+++ b/src/mess/machine/special.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Specialist machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/super80.c b/src/mess/machine/super80.c
index 64e93c916de..650eb001d14 100644
--- a/src/mess/machine/super80.c
+++ b/src/mess/machine/super80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super80.c written by Robbbert, 2005-2009. See driver source for documentation. */
 
 #include "includes/super80.h"
diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c
index 7a2f558e493..2816d1db994 100644
--- a/src/mess/machine/svi318.c
+++ b/src/mess/machine/svi318.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 ** Spectravideo SVI-318 and SVI-328
 **
diff --git a/src/mess/machine/swim.c b/src/mess/machine/swim.c
index 92a3ea0ab70..632342c6dbf 100644
--- a/src/mess/machine/swim.c
+++ b/src/mess/machine/swim.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     swim.c
diff --git a/src/mess/machine/swim.h b/src/mess/machine/swim.h
index 96d0f05d667..e674fe49a4a 100644
--- a/src/mess/machine/swim.h
+++ b/src/mess/machine/swim.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     swim.h
diff --git a/src/mess/machine/swtpc09.c b/src/mess/machine/swtpc09.c
index 6027846f891..97f14ada5c6 100644
--- a/src/mess/machine/swtpc09.c
+++ b/src/mess/machine/swtpc09.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
     swtpc09 machine file
     Robert Justice ,2009-2014
diff --git a/src/mess/machine/tandy2kb.c b/src/mess/machine/tandy2kb.c
index 73f33295445..b6c7dd18db3 100644
--- a/src/mess/machine/tandy2kb.c
+++ b/src/mess/machine/tandy2kb.c
@@ -4,9 +4,6 @@
 
     Tandy 2000 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "tandy2kb.h"
diff --git a/src/mess/machine/tandy2kb.h b/src/mess/machine/tandy2kb.h
index 13756addc71..9a2d65d373f 100644
--- a/src/mess/machine/tandy2kb.h
+++ b/src/mess/machine/tandy2kb.h
@@ -4,9 +4,6 @@
 
     Tandy 2000 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/teleprinter.c b/src/mess/machine/teleprinter.c
index a6bb6db9328..1c72a536883 100644
--- a/src/mess/machine/teleprinter.c
+++ b/src/mess/machine/teleprinter.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 #include "teleprinter.h"
 
 #define KEYBOARD_TAG "keyboard"
diff --git a/src/mess/machine/teleprinter.h b/src/mess/machine/teleprinter.h
index bff767bf9d6..0f0cad4c924 100644
--- a/src/mess/machine/teleprinter.h
+++ b/src/mess/machine/teleprinter.h
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
 #ifndef __TELEPRINTER_H__
 #define __TELEPRINTER_H__
 
diff --git a/src/mess/machine/thomflop.c b/src/mess/machine/thomflop.c
index 10fd2af8e7e..436363e8e73 100644
--- a/src/mess/machine/thomflop.c
+++ b/src/mess/machine/thomflop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/machine/thomflop.h b/src/mess/machine/thomflop.h
index 542ddbac69c..16ca788db0f 100644
--- a/src/mess/machine/thomflop.h
+++ b/src/mess/machine/thomflop.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c
index 19be7a86354..c8048b085d9 100644
--- a/src/mess/machine/thomson.c
+++ b/src/mess/machine/thomson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c
index 347357f9540..2397019e90c 100644
--- a/src/mess/machine/ti85.c
+++ b/src/mess/machine/ti85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   TI-85 driver by Krzysztof Strzecha
   TI-83 Plus, TI-84 Plus, and Siliver Edition support by Jon Sturm
diff --git a/src/mess/machine/ti99/990_dk.c b/src/mess/machine/ti99/990_dk.c
index 85991f392a9..2254a9cbb69 100644
--- a/src/mess/machine/ti99/990_dk.c
+++ b/src/mess/machine/ti99/990_dk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_dk.c: emulation of a TI FD800 'Diablo' floppy disk controller
     controller, for use with any TI990 system (and possibly any system which
diff --git a/src/mess/machine/ti99/990_dk.h b/src/mess/machine/ti99/990_dk.h
index 329d524187e..31c0ca4f6ca 100644
--- a/src/mess/machine/ti99/990_dk.h
+++ b/src/mess/machine/ti99/990_dk.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_dk.h: include file for 990_dk.c
 */
diff --git a/src/mess/machine/ti99/990_hd.c b/src/mess/machine/ti99/990_hd.c
index b8dcf64e3d0..37f30b80e38 100644
--- a/src/mess/machine/ti99/990_hd.c
+++ b/src/mess/machine/ti99/990_hd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_hd.c: emulation of a generic ti990 hard disk controller, for use with
     TILINE-based TI990 systems (TI990/10, /12, /12LR, /10A, Business system 300
diff --git a/src/mess/machine/ti99/990_hd.h b/src/mess/machine/ti99/990_hd.h
index 7dc7f149eae..2a1f8121dc6 100644
--- a/src/mess/machine/ti99/990_hd.h
+++ b/src/mess/machine/ti99/990_hd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_hd.h: include file for 990_hd.c
 */
diff --git a/src/mess/machine/ti99/990_tap.c b/src/mess/machine/ti99/990_tap.c
index b551b066f16..849e55c6e86 100644
--- a/src/mess/machine/ti99/990_tap.c
+++ b/src/mess/machine/ti99/990_tap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_tap.c: emulation of a generic ti990 tape controller, for use with
     TILINE-based TI990 systems (TI990/10, /12, /12LR, /10A, Business system 300
diff --git a/src/mess/machine/ti99/990_tap.h b/src/mess/machine/ti99/990_tap.h
index d560a1ee1ec..417d675ca3c 100644
--- a/src/mess/machine/ti99/990_tap.h
+++ b/src/mess/machine/ti99/990_tap.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     990_tap.h: include file for 990_tap.c
 */
diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c
index d82c3b45c8d..170f5cbd246 100644
--- a/src/mess/machine/trs80.c
+++ b/src/mess/machine/trs80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   machine.c
diff --git a/src/mess/machine/trs80m2kb.c b/src/mess/machine/trs80m2kb.c
index 56b9f9ddee6..01f4dc7930a 100644
--- a/src/mess/machine/trs80m2kb.c
+++ b/src/mess/machine/trs80m2kb.c
@@ -4,9 +4,6 @@
 
     Tandy Radio Shack TRS-80 Model II keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "trs80m2kb.h"
diff --git a/src/mess/machine/trs80m2kb.h b/src/mess/machine/trs80m2kb.h
index ea5ea0d3550..be665372e2b 100644
--- a/src/mess/machine/trs80m2kb.h
+++ b/src/mess/machine/trs80m2kb.h
@@ -4,9 +4,6 @@
 
     Tandy Radio Shack TRS-80 Model II keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/upd65031.c b/src/mess/machine/upd65031.c
index 94b1430b178..be883f885eb 100644
--- a/src/mess/machine/upd65031.c
+++ b/src/mess/machine/upd65031.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NEC uPD65031 'BLINK' emulation
diff --git a/src/mess/machine/upd65031.h b/src/mess/machine/upd65031.h
index 1a7756a5e7f..38645446626 100644
--- a/src/mess/machine/upd65031.h
+++ b/src/mess/machine/upd65031.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     NEC uPD65031 'BLINK' emulation
diff --git a/src/mess/machine/ut88.c b/src/mess/machine/ut88.c
index ce5122b2089..7dce47bebc0 100644
--- a/src/mess/machine/ut88.c
+++ b/src/mess/machine/ut88.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         UT88 machine driver by Miodrag Milanovic
diff --git a/src/mess/machine/v1050kb.c b/src/mess/machine/v1050kb.c
index 45ffcf45fed..f3f7353e3a1 100644
--- a/src/mess/machine/v1050kb.c
+++ b/src/mess/machine/v1050kb.c
@@ -4,9 +4,6 @@
 
     Visual 1050 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #include "v1050kb.h"
diff --git a/src/mess/machine/v1050kb.h b/src/mess/machine/v1050kb.h
index 3a6bcffa788..94b4b5dafc4 100644
--- a/src/mess/machine/v1050kb.h
+++ b/src/mess/machine/v1050kb.h
@@ -4,9 +4,6 @@
 
     Visual 1050 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/vector06.c b/src/mess/machine/vector06.c
index 0e135b11d9d..c1451c701d5 100644
--- a/src/mess/machine/vector06.c
+++ b/src/mess/machine/vector06.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Vector06c driver by Miodrag Milanovic
diff --git a/src/mess/machine/victor9k_fdc.c b/src/mess/machine/victor9k_fdc.c
index 1ae238401ed..2fb6c617983 100644
--- a/src/mess/machine/victor9k_fdc.c
+++ b/src/mess/machine/victor9k_fdc.c
@@ -4,9 +4,6 @@
 
     Victor 9000 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/machine/victor9k_fdc.h b/src/mess/machine/victor9k_fdc.h
index f9005c4af16..21c88ebfabf 100644
--- a/src/mess/machine/victor9k_fdc.h
+++ b/src/mess/machine/victor9k_fdc.h
@@ -4,9 +4,6 @@
 
     Victor 9000 floppy disk controller emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/victor9kb.c b/src/mess/machine/victor9kb.c
index 56d2f484234..a0cf21bfe36 100644
--- a/src/mess/machine/victor9kb.c
+++ b/src/mess/machine/victor9kb.c
@@ -4,9 +4,6 @@
 
     Victor 9000 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/mess/machine/victor9kb.h b/src/mess/machine/victor9kb.h
index 787080095d5..c3834e1a7d8 100644
--- a/src/mess/machine/victor9kb.h
+++ b/src/mess/machine/victor9kb.h
@@ -4,9 +4,6 @@
 
     Victor 9000 keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/vtech2.c b/src/mess/machine/vtech2.c
index b7850bd9f8c..5929b4aab47 100644
--- a/src/mess/machine/vtech2.c
+++ b/src/mess/machine/vtech2.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
     vtech2.c
 
diff --git a/src/mess/machine/wangpckb.c b/src/mess/machine/wangpckb.c
index 0816659e9ee..7e38ec2f153 100644
--- a/src/mess/machine/wangpckb.c
+++ b/src/mess/machine/wangpckb.c
@@ -4,9 +4,6 @@
 
     Wang PC keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h
index 38a0dbe321c..3eb15fd04ad 100644
--- a/src/mess/machine/wangpckb.h
+++ b/src/mess/machine/wangpckb.h
@@ -1,12 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
-	/**********************************************************************
+/**********************************************************************
 
 	Wang PC keyboard emulation
 
-	Copyright MESS Team.
-	Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/wswan.c b/src/mess/machine/wswan.c
index e0e2a351f85..c78bcbb03ae 100644
--- a/src/mess/machine/wswan.c
+++ b/src/mess/machine/wswan.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   wswan.c
diff --git a/src/mess/machine/x1.c b/src/mess/machine/x1.c
index 50892eddeda..84f93d004b9 100644
--- a/src/mess/machine/x1.c
+++ b/src/mess/machine/x1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/x1.h"
 
diff --git a/src/mess/machine/x68k_hdc.c b/src/mess/machine/x68k_hdc.c
index b7bc1668433..8b5cd0b40ea 100644
--- a/src/mess/machine/x68k_hdc.c
+++ b/src/mess/machine/x68k_hdc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     X68000 custom SASI Hard Disk controller
diff --git a/src/mess/machine/x68k_hdc.h b/src/mess/machine/x68k_hdc.h
index c24874ba4c0..f17cb56a7c4 100644
--- a/src/mess/machine/x68k_hdc.h
+++ b/src/mess/machine/x68k_hdc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     X68000 Custom SASI HD controller
diff --git a/src/mess/machine/x68k_kbd.c b/src/mess/machine/x68k_kbd.c
index 775955743e7..92d7af76872 100644
--- a/src/mess/machine/x68k_kbd.c
+++ b/src/mess/machine/x68k_kbd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "machine/x68k_kbd.h"
 
 x68k_keyboard_device::x68k_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
diff --git a/src/mess/machine/x68k_kbd.h b/src/mess/machine/x68k_kbd.h
index fb47f920487..793f46b1dc5 100644
--- a/src/mess/machine/x68k_kbd.h
+++ b/src/mess/machine/x68k_kbd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef X68K_KBD_H_
 #define X68K_KBD_H_
 
diff --git a/src/mess/machine/x820kb.c b/src/mess/machine/x820kb.c
index 09ebd038dbc..115e8591e4a 100644
--- a/src/mess/machine/x820kb.c
+++ b/src/mess/machine/x820kb.c
@@ -4,9 +4,6 @@
 
     Xerox 820/820-II ASCII keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 /*
diff --git a/src/mess/machine/x820kb.h b/src/mess/machine/x820kb.h
index ccb025ef7e8..03a3054c486 100644
--- a/src/mess/machine/x820kb.h
+++ b/src/mess/machine/x820kb.h
@@ -4,9 +4,6 @@
 
     Xerox 820/820-II ASCII keyboard emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 *********************************************************************/
 
 #pragma once
diff --git a/src/mess/machine/z80bin.c b/src/mess/machine/z80bin.c
index 86325850999..146d2dc2332 100644
--- a/src/mess/machine/z80bin.c
+++ b/src/mess/machine/z80bin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "machine/z80bin.h"
 
diff --git a/src/mess/machine/z80bin.h b/src/mess/machine/z80bin.h
index 9547f2c1427..538cf7ac6ff 100644
--- a/src/mess/machine/z80bin.h
+++ b/src/mess/machine/z80bin.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     machine/z80bin.h
diff --git a/src/mess/machine/z80ne.c b/src/mess/machine/z80ne.c
index 16281bcce1b..0849b8f070c 100644
--- a/src/mess/machine/z80ne.c
+++ b/src/mess/machine/z80ne.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***********************************************************************
 
     machine/z80ne.c
diff --git a/src/mess/machine/zx.c b/src/mess/machine/zx.c
index 37b69eb0a77..cc7de508c30 100644
--- a/src/mess/machine/zx.c
+++ b/src/mess/machine/zx.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
     zx.c
 
diff --git a/src/mess/machine/zx8302.c b/src/mess/machine/zx8302.c
index a85f506581b..6866b61f290 100644
--- a/src/mess/machine/zx8302.c
+++ b/src/mess/machine/zx8302.c
@@ -4,9 +4,6 @@
 
     Sinclair ZX8302 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/machine/zx8302.h b/src/mess/machine/zx8302.h
index 8915d2c91dc..f05ebe2b702 100644
--- a/src/mess/machine/zx8302.h
+++ b/src/mess/machine/zx8302.h
@@ -4,9 +4,6 @@
 
     Sinclair ZX8302 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                  ERASE   1 |*    \_/     | 40  Vdd
diff --git a/src/mess/mess.c b/src/mess/mess.c
index a59e7a5201b..f60f27e0acf 100644
--- a/src/mess/mess.c
+++ b/src/mess/mess.c
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /***************************************************************************
 
     mess.c
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index 7f0831a93db..8eb65ef5dce 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     mess.lst
@@ -5,37 +7,6 @@
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.
 
-****************************************************************************
-
-    Copyright Aaron Giles
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in
-          the documentation and/or other materials provided with the
-          distribution.
-        * Neither the name 'MAME' nor the names of its contributors may be
-          used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
 ******************************************************************************/
 
 // 3DO
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index ec5d2c2dd92..f4a3dd74d02 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -4,9 +4,6 @@
 #
 #   Additional makefile for building MESS
 #
-#   Copyright (c) Nicola Salmoria and the MAME Team.
-#   Visit http://mamedev.org for licensing and usage restrictions.
-#
 ###########################################################################
 
 GEN_FOLDERS += $(GENDIR)/mame/layout/
diff --git a/src/mess/tiny.lst b/src/mess/tiny.lst
index 000c69f4ee3..df97e3f6b85 100644
--- a/src/mess/tiny.lst
+++ b/src/mess/tiny.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     tiny.lst
@@ -5,37 +7,6 @@
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.
 
-****************************************************************************
-
-    Copyright Aaron Giles
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in
-          the documentation and/or other materials provided with the
-          distribution.
-        * Neither the name 'MAME' nor the names of its contributors may be
-          used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
 ******************************************************************************/
 
 coleco      // NTSC ColecoVision
diff --git a/src/mess/tools/imgtool/charconv.c b/src/mess/tools/imgtool/charconv.c
index f484dad215d..01bcaecd7a8 100644
--- a/src/mess/tools/imgtool/charconv.c
+++ b/src/mess/tools/imgtool/charconv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     charconv.c
diff --git a/src/mess/tools/imgtool/charconv.h b/src/mess/tools/imgtool/charconv.h
index 1d811eef99a..11b57966396 100644
--- a/src/mess/tools/imgtool/charconv.h
+++ b/src/mess/tools/imgtool/charconv.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     charconv.h
diff --git a/src/mess/tools/imgtool/filtbas.c b/src/mess/tools/imgtool/filtbas.c
index 5ff2bc9feeb..8f477ba83ba 100644
--- a/src/mess/tools/imgtool/filtbas.c
+++ b/src/mess/tools/imgtool/filtbas.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     filtbas.c
diff --git a/src/mess/tools/imgtool/filteoln.c b/src/mess/tools/imgtool/filteoln.c
index 190514228e2..ae341e91f35 100644
--- a/src/mess/tools/imgtool/filteoln.c
+++ b/src/mess/tools/imgtool/filteoln.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     filteoln.c
diff --git a/src/mess/tools/imgtool/filter.c b/src/mess/tools/imgtool/filter.c
index 8bee2c94c2f..1d6ff37d295 100644
--- a/src/mess/tools/imgtool/filter.c
+++ b/src/mess/tools/imgtool/filter.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     filter.c
diff --git a/src/mess/tools/imgtool/filter.h b/src/mess/tools/imgtool/filter.h
index cbeef088830..d936b150891 100644
--- a/src/mess/tools/imgtool/filter.h
+++ b/src/mess/tools/imgtool/filter.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     filter.h
diff --git a/src/mess/tools/imgtool/iflopimg.c b/src/mess/tools/imgtool/iflopimg.c
index 4249c6120b4..5766d051d49 100644
--- a/src/mess/tools/imgtool/iflopimg.c
+++ b/src/mess/tools/imgtool/iflopimg.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     iflopimg.c
diff --git a/src/mess/tools/imgtool/iflopimg.h b/src/mess/tools/imgtool/iflopimg.h
index 7d0bd0958b3..1241d0999e2 100644
--- a/src/mess/tools/imgtool/iflopimg.h
+++ b/src/mess/tools/imgtool/iflopimg.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     iflopimg.h
diff --git a/src/mess/tools/imgtool/imghd.c b/src/mess/tools/imgtool/imghd.c
index f07334d68ef..f4977bca6b5 100644
--- a/src/mess/tools/imgtool/imghd.c
+++ b/src/mess/tools/imgtool/imghd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Code to interface the MESS image code with MAME's harddisk core.
 
diff --git a/src/mess/tools/imgtool/imghd.h b/src/mess/tools/imgtool/imghd.h
index ca7dfe09fea..381abe5373a 100644
--- a/src/mess/tools/imgtool/imghd.h
+++ b/src/mess/tools/imgtool/imghd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     imghd.h
diff --git a/src/mess/tools/imgtool/imgterrs.c b/src/mess/tools/imgtool/imgterrs.c
index 696aafdfa1a..23f6af9a5e7 100644
--- a/src/mess/tools/imgtool/imgterrs.c
+++ b/src/mess/tools/imgtool/imgterrs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     imgterrs.c
diff --git a/src/mess/tools/imgtool/imgterrs.h b/src/mess/tools/imgtool/imgterrs.h
index 918468cbccf..9757b5c1d40 100644
--- a/src/mess/tools/imgtool/imgterrs.h
+++ b/src/mess/tools/imgtool/imgterrs.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     imgterrs.h
diff --git a/src/mess/tools/imgtool/imgtool.c b/src/mess/tools/imgtool/imgtool.c
index ae4fb8696c9..67813b54c4c 100644
--- a/src/mess/tools/imgtool/imgtool.c
+++ b/src/mess/tools/imgtool/imgtool.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     imgtool.c
diff --git a/src/mess/tools/imgtool/imgtool.h b/src/mess/tools/imgtool/imgtool.h
index 459712fbed5..dd32da998df 100644
--- a/src/mess/tools/imgtool/imgtool.h
+++ b/src/mess/tools/imgtool/imgtool.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     imgtool.h
diff --git a/src/mess/tools/imgtool/library.c b/src/mess/tools/imgtool/library.c
index b17d837aa02..e3c84ab8b11 100644
--- a/src/mess/tools/imgtool/library.c
+++ b/src/mess/tools/imgtool/library.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     library.c
diff --git a/src/mess/tools/imgtool/library.h b/src/mess/tools/imgtool/library.h
index ff9113c748d..cddad8f91c4 100644
--- a/src/mess/tools/imgtool/library.h
+++ b/src/mess/tools/imgtool/library.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     library.h
diff --git a/src/mess/tools/imgtool/main.c b/src/mess/tools/imgtool/main.c
index c764db8fd79..33e3dca6001 100644
--- a/src/mess/tools/imgtool/main.c
+++ b/src/mess/tools/imgtool/main.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     main.c
diff --git a/src/mess/tools/imgtool/main.h b/src/mess/tools/imgtool/main.h
index 5b9b9694eed..e24f7ea650e 100644
--- a/src/mess/tools/imgtool/main.h
+++ b/src/mess/tools/imgtool/main.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "imgtool.h"
 
 struct command
diff --git a/src/mess/tools/imgtool/modules.c b/src/mess/tools/imgtool/modules.c
index eec6c564025..6e58b1e48a1 100644
--- a/src/mess/tools/imgtool/modules.c
+++ b/src/mess/tools/imgtool/modules.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     modules.c
diff --git a/src/mess/tools/imgtool/modules.h b/src/mess/tools/imgtool/modules.h
index d0cc489de60..ae4a800a2ad 100644
--- a/src/mess/tools/imgtool/modules.h
+++ b/src/mess/tools/imgtool/modules.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     modules.h
diff --git a/src/mess/tools/imgtool/modules/amiga.c b/src/mess/tools/imgtool/modules/amiga.c
index dc8a6750690..5b8d3d971e4 100644
--- a/src/mess/tools/imgtool/modules/amiga.c
+++ b/src/mess/tools/imgtool/modules/amiga.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     amiga.c
diff --git a/src/mess/tools/imgtool/modules/bml3.c b/src/mess/tools/imgtool/modules/bml3.c
index d7efba94f78..3f273322c5c 100644
--- a/src/mess/tools/imgtool/modules/bml3.c
+++ b/src/mess/tools/imgtool/modules/bml3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     bml3.c
diff --git a/src/mess/tools/imgtool/modules/concept.c b/src/mess/tools/imgtool/modules/concept.c
index 0da5f5027ee..27320fa03a3 100644
--- a/src/mess/tools/imgtool/modules/concept.c
+++ b/src/mess/tools/imgtool/modules/concept.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Handlers for concept floppy images
 
diff --git a/src/mess/tools/imgtool/modules/cybiko.c b/src/mess/tools/imgtool/modules/cybiko.c
index 8979c4fcd02..02055c01e4b 100644
--- a/src/mess/tools/imgtool/modules/cybiko.c
+++ b/src/mess/tools/imgtool/modules/cybiko.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Cybiko Classic File System
diff --git a/src/mess/tools/imgtool/modules/cybikoxt.c b/src/mess/tools/imgtool/modules/cybikoxt.c
index bf1dedfcc30..96829dfef3c 100644
--- a/src/mess/tools/imgtool/modules/cybikoxt.c
+++ b/src/mess/tools/imgtool/modules/cybikoxt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Cybiko Xtreme File System
diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c
index 660a5a890ae..f72d01df7de 100644
--- a/src/mess/tools/imgtool/modules/fat.c
+++ b/src/mess/tools/imgtool/modules/fat.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     fat.c
diff --git a/src/mess/tools/imgtool/modules/fat.h b/src/mess/tools/imgtool/modules/fat.h
index 6dd9be4272f..a2088f49b86 100644
--- a/src/mess/tools/imgtool/modules/fat.h
+++ b/src/mess/tools/imgtool/modules/fat.h
@@ -1 +1,3 @@
+// license:???
+// copyright-holders:???
 void fat_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinfo *info);
diff --git a/src/mess/tools/imgtool/modules/hp48.c b/src/mess/tools/imgtool/modules/hp48.c
index 2604ab91a26..272f8b86d19 100644
--- a/src/mess/tools/imgtool/modules/hp48.c
+++ b/src/mess/tools/imgtool/modules/hp48.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     hp48.c
diff --git a/src/mess/tools/imgtool/modules/mac.c b/src/mess/tools/imgtool/modules/mac.c
index 81af01761a4..679362bf5a4 100644
--- a/src/mess/tools/imgtool/modules/mac.c
+++ b/src/mess/tools/imgtool/modules/mac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     mac.c
diff --git a/src/mess/tools/imgtool/modules/macbin.c b/src/mess/tools/imgtool/modules/macbin.c
index e8035c1a480..2d4a7bb756f 100644
--- a/src/mess/tools/imgtool/modules/macbin.c
+++ b/src/mess/tools/imgtool/modules/macbin.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     macbin.c
diff --git a/src/mess/tools/imgtool/modules/macutil.c b/src/mess/tools/imgtool/modules/macutil.c
index a752b54c639..3fd0e4953c6 100644
--- a/src/mess/tools/imgtool/modules/macutil.c
+++ b/src/mess/tools/imgtool/modules/macutil.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     macutil.c
diff --git a/src/mess/tools/imgtool/modules/macutil.h b/src/mess/tools/imgtool/modules/macutil.h
index f40017b5c77..47de1139990 100644
--- a/src/mess/tools/imgtool/modules/macutil.h
+++ b/src/mess/tools/imgtool/modules/macutil.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     macutil.h
diff --git a/src/mess/tools/imgtool/modules/os9.c b/src/mess/tools/imgtool/modules/os9.c
index 1b8daa9bcc1..6cd7212be76 100644
--- a/src/mess/tools/imgtool/modules/os9.c
+++ b/src/mess/tools/imgtool/modules/os9.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     os9.c
diff --git a/src/mess/tools/imgtool/modules/pc_flop.c b/src/mess/tools/imgtool/modules/pc_flop.c
index 57602fd4452..9e85f912645 100644
--- a/src/mess/tools/imgtool/modules/pc_flop.c
+++ b/src/mess/tools/imgtool/modules/pc_flop.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     pc_flop.c
diff --git a/src/mess/tools/imgtool/modules/pc_hard.c b/src/mess/tools/imgtool/modules/pc_hard.c
index bab9b8e9bc2..5130163932d 100644
--- a/src/mess/tools/imgtool/modules/pc_hard.c
+++ b/src/mess/tools/imgtool/modules/pc_hard.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     pc_hard.c
diff --git a/src/mess/tools/imgtool/modules/prodos.c b/src/mess/tools/imgtool/modules/prodos.c
index 7f1244e4b8c..0105e0827e9 100644
--- a/src/mess/tools/imgtool/modules/prodos.c
+++ b/src/mess/tools/imgtool/modules/prodos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     prodos.c
diff --git a/src/mess/tools/imgtool/modules/rsdos.c b/src/mess/tools/imgtool/modules/rsdos.c
index 7e24bdf35e9..03f42cde70d 100644
--- a/src/mess/tools/imgtool/modules/rsdos.c
+++ b/src/mess/tools/imgtool/modules/rsdos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     rsdos.c
diff --git a/src/mess/tools/imgtool/modules/thomson.c b/src/mess/tools/imgtool/modules/thomson.c
index 2b27fa4a883..30fa5ea6c7d 100644
--- a/src/mess/tools/imgtool/modules/thomson.c
+++ b/src/mess/tools/imgtool/modules/thomson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/tools/imgtool/modules/ti99.c b/src/mess/tools/imgtool/modules/ti99.c
index 2a47e85da1b..3899ab746b2 100644
--- a/src/mess/tools/imgtool/modules/ti99.c
+++ b/src/mess/tools/imgtool/modules/ti99.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Handlers for ti99 disk images
 
diff --git a/src/mess/tools/imgtool/modules/ti990hd.c b/src/mess/tools/imgtool/modules/ti990hd.c
index 7c4fe302ea7..5a82fa2f880 100644
--- a/src/mess/tools/imgtool/modules/ti990hd.c
+++ b/src/mess/tools/imgtool/modules/ti990hd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     Handlers for ti990 disk images
 
diff --git a/src/mess/tools/imgtool/modules/vzdos.c b/src/mess/tools/imgtool/modules/vzdos.c
index ae9c259c90d..0ee53554957 100644
--- a/src/mess/tools/imgtool/modules/vzdos.c
+++ b/src/mess/tools/imgtool/modules/vzdos.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /****************************************************************************
 
     vzdos.c
diff --git a/src/mess/tools/imgtool/stream.c b/src/mess/tools/imgtool/stream.c
index e724cd4a3e4..126ec89fb5a 100644
--- a/src/mess/tools/imgtool/stream.c
+++ b/src/mess/tools/imgtool/stream.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     stream.c
diff --git a/src/mess/tools/imgtool/stream.h b/src/mess/tools/imgtool/stream.h
index 2ae1c2eeb68..8eca0dc4e12 100644
--- a/src/mess/tools/imgtool/stream.h
+++ b/src/mess/tools/imgtool/stream.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     stream.h
diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c
index 4cd913461aa..c0529456d3e 100644
--- a/src/mess/video/733_asr.c
+++ b/src/mess/video/733_asr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     733 ASR emulation
 
diff --git a/src/mess/video/733_asr.h b/src/mess/video/733_asr.h
index a5b6c1c7010..ee5c3fcbd85 100644
--- a/src/mess/video/733_asr.h
+++ b/src/mess/video/733_asr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #define asr733_chr_region ":gfx1"
 
diff --git a/src/mess/video/911_chr.h b/src/mess/video/911_chr.h
index d6fc642f4f5..f0ffa218c5e 100644
--- a/src/mess/video/911_chr.h
+++ b/src/mess/video/911_chr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     911_chr.h: character definitions for 911_vdt.c
 
diff --git a/src/mess/video/911_key.h b/src/mess/video/911_key.h
index 441db3d5b2c..2c0c3e44c17 100644
--- a/src/mess/video/911_key.h
+++ b/src/mess/video/911_key.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     key translation table for both US and UK terminals
 
diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c
index 0ba074def67..0a41c3450f1 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     TI 911 VDT core.  To be operated with the TI 990 line of computers (can be connected to
     any model, as communication uses the CRU bus).
diff --git a/src/mess/video/911_vdt.h b/src/mess/video/911_vdt.h
index 5492bcf3fc4..e3f7f1f3fb7 100644
--- a/src/mess/video/911_vdt.h
+++ b/src/mess/video/911_vdt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "sound/beep.h"
 
diff --git a/src/mess/video/abc1600.c b/src/mess/video/abc1600.c
index 312e0260425..2a312cb3ae7 100644
--- a/src/mess/video/abc1600.c
+++ b/src/mess/video/abc1600.c
@@ -4,9 +4,6 @@
 
     Luxor ABC 1600 Mover emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "includes/abc1600.h"
diff --git a/src/mess/video/abc1600.h b/src/mess/video/abc1600.h
index 72263333bea..172967c783d 100644
--- a/src/mess/video/abc1600.h
+++ b/src/mess/video/abc1600.h
@@ -4,9 +4,6 @@
 
     Luxor ABC 1600 Mover emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #pragma once
diff --git a/src/mess/video/ac1.c b/src/mess/video/ac1.c
index fdcf5c58de9..3dc0284fd2f 100644
--- a/src/mess/video/ac1.c
+++ b/src/mess/video/ac1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         AC1 video driver by Miodrag Milanovic
diff --git a/src/mess/video/advision.c b/src/mess/video/advision.c
index 9f24229b5dd..0ec8f79c5db 100644
--- a/src/mess/video/advision.c
+++ b/src/mess/video/advision.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video/advision.c
diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c
index 44f5dad8095..04aac9dbb03 100644
--- a/src/mess/video/apollo.c
+++ b/src/mess/video/apollo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * video/apollo.c
  *
diff --git a/src/mess/video/apple1.c b/src/mess/video/apple1.c
index 9cddcb7f60a..29871f21ee9 100644
--- a/src/mess/video/apple1.c
+++ b/src/mess/video/apple1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   apple1.c
diff --git a/src/mess/video/apple2.c b/src/mess/video/apple2.c
index 1e3c3311354..87335ff645e 100644
--- a/src/mess/video/apple2.c
+++ b/src/mess/video/apple2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video/apple2.c
diff --git a/src/mess/video/apple2.h b/src/mess/video/apple2.h
index 79ce9076777..b1bb5612f6f 100644
--- a/src/mess/video/apple2.h
+++ b/src/mess/video/apple2.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     video/apple2.h  - Video handling for 8-bit Apple IIs
diff --git a/src/mess/video/apple2gs.c b/src/mess/video/apple2gs.c
index b45446fe989..5d076a348e8 100644
--- a/src/mess/video/apple2gs.c
+++ b/src/mess/video/apple2gs.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     video/apple2gs.c
diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c
index 7230811ad30..56e01af8771 100644
--- a/src/mess/video/apple3.c
+++ b/src/mess/video/apple3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/apple3.c
diff --git a/src/mess/video/aquarius.c b/src/mess/video/aquarius.c
index f61f1ba0f5c..5205c53e085 100644
--- a/src/mess/video/aquarius.c
+++ b/src/mess/video/aquarius.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   aquarius.c
diff --git a/src/mess/video/arcadia.c b/src/mess/video/arcadia.c
index 3b8ab6bc29d..0bbdd088bad 100644
--- a/src/mess/video/arcadia.c
+++ b/src/mess/video/arcadia.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 Consolidation and enhancment of documentation by Manfred Schneider based on previous work from
  PeT mess@utanet.at and Paul Robson (autismuk@aol.com)
diff --git a/src/mess/video/b2m.c b/src/mess/video/b2m.c
index d01fbc9cceb..b9a0414d181 100644
--- a/src/mess/video/b2m.c
+++ b/src/mess/video/b2m.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Bashkiria-2M video driver by Miodrag Milanovic
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c
index 483cd04caba..3acd9c97ee4 100644
--- a/src/mess/video/bbc.c
+++ b/src/mess/video/bbc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     BBC Model B
 
diff --git a/src/mess/video/bk.c b/src/mess/video/bk.c
index 6c494184cfa..47e00d02775 100644
--- a/src/mess/video/bk.c
+++ b/src/mess/video/bk.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         BK video driver by Miodrag Milanovic
diff --git a/src/mess/video/busicom.c b/src/mess/video/busicom.c
index a4a3ff82e95..c744f542b51 100644
--- a/src/mess/video/busicom.c
+++ b/src/mess/video/busicom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Busicom 141-PF
diff --git a/src/mess/video/cgenie.c b/src/mess/video/cgenie.c
index 6a733bac327..7baba05d3c5 100644
--- a/src/mess/video/cgenie.c
+++ b/src/mess/video/cgenie.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   cgenie.c
diff --git a/src/mess/video/channelf.c b/src/mess/video/channelf.c
index 139f3e48124..16a77dec412 100644
--- a/src/mess/video/channelf.c
+++ b/src/mess/video/channelf.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/channelf.h"
 
 static const rgb_t channelf_palette[] =
diff --git a/src/mess/video/comquest.c b/src/mess/video/comquest.c
index 6160e845795..3cad7fbb417 100644
--- a/src/mess/video/comquest.c
+++ b/src/mess/video/comquest.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/comquest.h"
diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c
index 4ab7b609a5a..46089dbfdc4 100644
--- a/src/mess/video/crt.c
+++ b/src/mess/video/crt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     video/crt.c
 
diff --git a/src/mess/video/crt.h b/src/mess/video/crt.h
index d9bef19838b..e37e8f0bbba 100644
--- a/src/mess/video/crt.h
+++ b/src/mess/video/crt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*************************************************************************
 
     video/crt.h
diff --git a/src/mess/video/dai.c b/src/mess/video/dai.c
index a0e562d8c57..59710f4d652 100644
--- a/src/mess/video/dai.c
+++ b/src/mess/video/dai.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   dai.c
diff --git a/src/mess/video/dgn_beta.c b/src/mess/video/dgn_beta.c
index 84a90cc0592..e2c9ea076c8 100644
--- a/src/mess/video/dgn_beta.c
+++ b/src/mess/video/dgn_beta.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     video/dgn_beta.c
 
diff --git a/src/mess/video/electron.c b/src/mess/video/electron.c
index 9e26bfc5fa7..37b24dbf215 100644
--- a/src/mess/video/electron.c
+++ b/src/mess/video/electron.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
     Acorn Electron driver
 
diff --git a/src/mess/video/fm7.c b/src/mess/video/fm7.c
index 9d7c34604c7..2a940f0970d 100644
--- a/src/mess/video/fm7.c
+++ b/src/mess/video/fm7.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  *
  *  Fujitsu Micro 7 Video functions
diff --git a/src/mess/video/fmtowns.c b/src/mess/video/fmtowns.c
index a807773489b..7a0d259b5b9 100644
--- a/src/mess/video/fmtowns.c
+++ b/src/mess/video/fmtowns.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
  * FM Towns video hardware
diff --git a/src/mess/video/galaxy.c b/src/mess/video/galaxy.c
index 35dfec58d01..53982fe7a7e 100644
--- a/src/mess/video/galaxy.c
+++ b/src/mess/video/galaxy.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   galaxy.c
diff --git a/src/mess/video/galeb.c b/src/mess/video/galeb.c
index 576036491b4..a5290c2cdc5 100644
--- a/src/mess/video/galeb.c
+++ b/src/mess/video/galeb.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Galeb video driver by Miodrag Milanovic
diff --git a/src/mess/video/gamecom.c b/src/mess/video/gamecom.c
index 00106a480ab..9f148b65c19 100644
--- a/src/mess/video/gamecom.c
+++ b/src/mess/video/gamecom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/gamecom.h"
 
diff --git a/src/mess/video/gb_lcd.c b/src/mess/video/gb_lcd.c
index b77d60c3917..f741c2a3397 100644
--- a/src/mess/video/gb_lcd.c
+++ b/src/mess/video/gb_lcd.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   gb_lcd.c
diff --git a/src/mess/video/gb_lcd.h b/src/mess/video/gb_lcd.h
index 06ae4f03c1e..e02b8003d2c 100644
--- a/src/mess/video/gb_lcd.h
+++ b/src/mess/video/gb_lcd.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * video/gb_lcd.h
diff --git a/src/mess/video/gba.c b/src/mess/video/gba.c
index 40cb5d88977..81b0b62391b 100644
--- a/src/mess/video/gba.c
+++ b/src/mess/video/gba.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 	/***************************************************************************
 
 	gba.c
diff --git a/src/mess/video/gime.c b/src/mess/video/gime.c
index 2dee45caa48..402fb9c4008 100644
--- a/src/mess/video/gime.c
+++ b/src/mess/video/gime.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     gime.c
diff --git a/src/mess/video/gime.h b/src/mess/video/gime.h
index 08f8458e385..5eab3ac8571 100644
--- a/src/mess/video/gime.h
+++ b/src/mess/video/gime.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     gime.h
diff --git a/src/mess/video/hec2video.c b/src/mess/video/hec2video.c
index 4f7f8f3cae5..06f33311faf 100644
--- a/src/mess/video/hec2video.c
+++ b/src/mess/video/hec2video.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /////////////////////////////////////////////////////////////////////////////////
 ///// Hector video
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mess/video/hp48.c b/src/mess/video/hp48.c
index 7de581d8520..576d7714b0a 100644
--- a/src/mess/video/hp48.c
+++ b/src/mess/video/hp48.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2008
diff --git a/src/mess/video/intv.c b/src/mess/video/intv.c
index 12bede1db5a..7cca76ff3f5 100644
--- a/src/mess/video/intv.c
+++ b/src/mess/video/intv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/intv.h"
 
diff --git a/src/mess/video/k1ge.c b/src/mess/video/k1ge.c
index 8e1c50d483a..ccf043fa999 100644
--- a/src/mess/video/k1ge.c
+++ b/src/mess/video/k1ge.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   K1GE/K2GE graphics emulation
diff --git a/src/mess/video/k1ge.h b/src/mess/video/k1ge.h
index 937efe68323..a3eaa7fe753 100644
--- a/src/mess/video/k1ge.h
+++ b/src/mess/video/k1ge.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
 
   K1GE/K2GE graphics emulation
diff --git a/src/mess/video/kaypro.c b/src/mess/video/kaypro.c
index d4845b1b682..2117b60c624 100644
--- a/src/mess/video/kaypro.c
+++ b/src/mess/video/kaypro.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/kaypro.h"
 
diff --git a/src/mess/video/kramermc.c b/src/mess/video/kramermc.c
index dfedb9c59ba..e31e3378e85 100644
--- a/src/mess/video/kramermc.c
+++ b/src/mess/video/kramermc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Kramer MC video driver by Miodrag Milanovic
diff --git a/src/mess/video/llc.c b/src/mess/video/llc.c
index 2a226a57444..3ba049a6693 100644
--- a/src/mess/video/llc.c
+++ b/src/mess/video/llc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         LLC driver by Miodrag Milanovic
diff --git a/src/mess/video/lviv.c b/src/mess/video/lviv.c
index ed7a4b47067..40269a3ff5e 100644
--- a/src/mess/video/lviv.c
+++ b/src/mess/video/lviv.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   lviv.c
diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c
index 79c1b527c6b..a1f86032d98 100644
--- a/src/mess/video/mac.c
+++ b/src/mess/video/mac.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     video/mac.c
diff --git a/src/mess/video/maria.c b/src/mess/video/maria.c
index 6c0841b8cef..5deb21df5db 100644
--- a/src/mess/video/maria.c
+++ b/src/mess/video/maria.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   Atari MARIA video emulation
diff --git a/src/mess/video/maria.h b/src/mess/video/maria.h
index b776ee5ae26..64e2e986540 100644
--- a/src/mess/video/maria.h
+++ b/src/mess/video/maria.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __ATARI_MARIA__
 #define __ATARI_MARIA__
 
diff --git a/src/mess/video/mbc55x.c b/src/mess/video/mbc55x.c
index 5d9eb0bc3be..5d738a4ab3e 100644
--- a/src/mess/video/mbc55x.c
+++ b/src/mess/video/mbc55x.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     video/mbc55x.c
 
diff --git a/src/mess/video/mbee.c b/src/mess/video/mbee.c
index fdeb7e06f96..479f7175656 100644
--- a/src/mess/video/mbee.c
+++ b/src/mess/video/mbee.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller,Robbbert
 /***************************************************************************
     microbee.c
 
diff --git a/src/mess/video/mc80.c b/src/mess/video/mc80.c
index 92f996c8788..dc78f9432d6 100644
--- a/src/mess/video/mc80.c
+++ b/src/mess/video/mc80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         MC-80.xx video by Miodrag Milanovic
diff --git a/src/mess/video/microtan.c b/src/mess/video/microtan.c
index e7630844891..b6973e40fac 100644
--- a/src/mess/video/microtan.c
+++ b/src/mess/video/microtan.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
  *  Microtan 65
  *
diff --git a/src/mess/video/mikro80.c b/src/mess/video/mikro80.c
index 0f0deb96b06..46d2cafda7b 100644
--- a/src/mess/video/mikro80.c
+++ b/src/mess/video/mikro80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Mikro-80 video driver by Miodrag Milanovic
diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c
index 57518738997..632cddb37fb 100644
--- a/src/mess/video/mz700.c
+++ b/src/mess/video/mz700.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
  *  Sharp MZ700
  *
diff --git a/src/mess/video/mz80.c b/src/mess/video/mz80.c
index 08c7d04c22b..6108a31e1ab 100644
--- a/src/mess/video/mz80.c
+++ b/src/mess/video/mz80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         MZ80 driver by Miodrag Milanovic
diff --git a/src/mess/video/nascom1.c b/src/mess/video/nascom1.c
index 89a992f6062..605b5209d4a 100644
--- a/src/mess/video/nascom1.c
+++ b/src/mess/video/nascom1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nascom1.c
diff --git a/src/mess/video/nc.c b/src/mess/video/nc.c
index 644af80c854..529ec3298f0 100644
--- a/src/mess/video/nc.c
+++ b/src/mess/video/nc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   nc.c
diff --git a/src/mess/video/nes.c b/src/mess/video/nes.c
index 0105c740e2b..3a9230ad40d 100644
--- a/src/mess/video/nes.c
+++ b/src/mess/video/nes.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   video/nes.c
diff --git a/src/mess/video/newport.c b/src/mess/video/newport.c
index eb1b680e95c..867eaf00a73 100644
--- a/src/mess/video/newport.c
+++ b/src/mess/video/newport.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SGI "Newport" graphics board used in the Indy and some Indigo2s
 
diff --git a/src/mess/video/newport.h b/src/mess/video/newport.h
index 16364c3a145..5bc8679019a 100644
--- a/src/mess/video/newport.h
+++ b/src/mess/video/newport.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SGI "Newport" graphics board used in the Indy and some Indigo2s
 
diff --git a/src/mess/video/nick.c b/src/mess/video/nick.c
index b71d39999f2..e601a9b2b2e 100644
--- a/src/mess/video/nick.c
+++ b/src/mess/video/nick.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Intelligent Designs NICK emulation
diff --git a/src/mess/video/nick.h b/src/mess/video/nick.h
index 8080c528ae8..3959179967a 100644
--- a/src/mess/video/nick.h
+++ b/src/mess/video/nick.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     Intelligent Designs NICK emulation
diff --git a/src/mess/video/ondra.c b/src/mess/video/ondra.c
index f55385ebcdb..0895af94a02 100644
--- a/src/mess/video/ondra.c
+++ b/src/mess/video/ondra.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Ondra driver by Miodrag Milanovic
diff --git a/src/mess/video/orao.c b/src/mess/video/orao.c
index 48bfac04709..b6ab1cd9106 100644
--- a/src/mess/video/orao.c
+++ b/src/mess/video/orao.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Orao video driver by Miodrag Milanovic
diff --git a/src/mess/video/orion.c b/src/mess/video/orion.c
index 2b061ee0df8..7aeb105c49b 100644
--- a/src/mess/video/orion.c
+++ b/src/mess/video/orion.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Orion video driver by Miodrag Milanovic
diff --git a/src/mess/video/osi.c b/src/mess/video/osi.c
index 6c4ec0d96ce..34382f77e60 100644
--- a/src/mess/video/osi.c
+++ b/src/mess/video/osi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/osi.h"
 
 /* Palette Initialization */
diff --git a/src/mess/video/p2000m.c b/src/mess/video/p2000m.c
index 8b8ead9aab6..8abc69892a9 100644
--- a/src/mess/video/p2000m.c
+++ b/src/mess/video/p2000m.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
     p2000m.c
diff --git a/src/mess/video/pc1251.c b/src/mess/video/pc1251.c
index e10531dffc3..161276bd432 100644
--- a/src/mess/video/pc1251.c
+++ b/src/mess/video/pc1251.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1350.c b/src/mess/video/pc1350.c
index c6c8ff695fc..3e40fb0ece9 100644
--- a/src/mess/video/pc1350.c
+++ b/src/mess/video/pc1350.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1401.c b/src/mess/video/pc1401.c
index 3f908ead1ff..7a957c620f2 100644
--- a/src/mess/video/pc1401.c
+++ b/src/mess/video/pc1401.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1403.c b/src/mess/video/pc1403.c
index 999f6a76b17..79a41aea3de 100644
--- a/src/mess/video/pc1403.c
+++ b/src/mess/video/pc1403.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  *   pc1403.c
diff --git a/src/mess/video/pc8401a.c b/src/mess/video/pc8401a.c
index 835854d50f6..759e9bed52d 100644
--- a/src/mess/video/pc8401a.c
+++ b/src/mess/video/pc8401a.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "includes/pc8401a.h"
 #include "pc8500.lh"
 
diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c
index f9715358fac..8639917ccf2 100644
--- a/src/mess/video/pc_t1t.c
+++ b/src/mess/video/pc_t1t.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     IBM PC junior
diff --git a/src/mess/video/pc_t1t.h b/src/mess/video/pc_t1t.h
index 9d4f2ebb02f..23927d1553e 100644
--- a/src/mess/video/pc_t1t.h
+++ b/src/mess/video/pc_t1t.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef PC_T1T_H
 #define PC_T1T_H
 
diff --git a/src/mess/video/pcw.c b/src/mess/video/pcw.c
index 0bce5034d9e..d13a0fdfa35 100644
--- a/src/mess/video/pcw.c
+++ b/src/mess/video/pcw.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   pcw.c
diff --git a/src/mess/video/pcw16.c b/src/mess/video/pcw16.c
index ddd3fd6a608..9e30c32cee0 100644
--- a/src/mess/video/pcw16.c
+++ b/src/mess/video/pcw16.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pcw16.h"
 #include "machine/ram.h"
diff --git a/src/mess/video/pdp1.c b/src/mess/video/pdp1.c
index a32523b0fae..533fa4d4df4 100644
--- a/src/mess/video/pdp1.c
+++ b/src/mess/video/pdp1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     video/pdp1.c
 
diff --git a/src/mess/video/pecom.c b/src/mess/video/pecom.c
index f3ccae36b35..2f626601709 100644
--- a/src/mess/video/pecom.c
+++ b/src/mess/video/pecom.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Pecom driver by Miodrag Milanovic
diff --git a/src/mess/video/pk8020.c b/src/mess/video/pk8020.c
index 425524a2d5f..83ac355c9e9 100644
--- a/src/mess/video/pk8020.c
+++ b/src/mess/video/pk8020.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         PK-8020 driver by Miodrag Milanovic
diff --git a/src/mess/video/pmd85.c b/src/mess/video/pmd85.c
index b345cc3a552..d723692e690 100644
--- a/src/mess/video/pmd85.c
+++ b/src/mess/video/pmd85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   pmd85.c
diff --git a/src/mess/video/pocketc.c b/src/mess/video/pocketc.c
index f77441b9958..fe142c09737 100644
--- a/src/mess/video/pocketc.c
+++ b/src/mess/video/pocketc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "includes/pocketc.h"
 
diff --git a/src/mess/video/poisk1.c b/src/mess/video/poisk1.c
index 6f367c6eb2a..bc4aad146a3 100644
--- a/src/mess/video/poisk1.c
+++ b/src/mess/video/poisk1.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * Poisk-1 does not have a real mc6845 and always runs in graphics mode.
  * Text mode is emulated by BIOS.
diff --git a/src/mess/video/poisk1.h b/src/mess/video/poisk1.h
index 3d0e647bac2..27ce0039a26 100644
--- a/src/mess/video/poisk1.h
+++ b/src/mess/video/poisk1.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #define CGA_PALETTE_SETS 83
diff --git a/src/mess/video/poly88.c b/src/mess/video/poly88.c
index cdd18e7c59b..910930b4496 100644
--- a/src/mess/video/poly88.c
+++ b/src/mess/video/poly88.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Poly-88 video by Miodrag Milanovic
diff --git a/src/mess/video/pp01.c b/src/mess/video/pp01.c
index c2d0c85e3b8..9dbe91b51a7 100644
--- a/src/mess/video/pp01.c
+++ b/src/mess/video/pp01.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         PP-01 driver by Miodrag Milanovic
diff --git a/src/mess/video/primo.c b/src/mess/video/primo.c
index 4fa834f0c7a..29ecadc6703 100644
--- a/src/mess/video/primo.c
+++ b/src/mess/video/primo.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   primo.c
diff --git a/src/mess/video/rm380z.c b/src/mess/video/rm380z.c
index bc9e167c807..d28cdd48b99 100644
--- a/src/mess/video/rm380z.c
+++ b/src/mess/video/rm380z.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 /*
 
diff --git a/src/mess/video/rmnimbus.c b/src/mess/video/rmnimbus.c
index b99b7d7f8ae..37bd305f966 100644
--- a/src/mess/video/rmnimbus.c
+++ b/src/mess/video/rmnimbus.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     video/rmnimbus.c
 
diff --git a/src/mess/video/samcoupe.c b/src/mess/video/samcoupe.c
index 95961b4f7b9..55981b7495c 100644
--- a/src/mess/video/samcoupe.c
+++ b/src/mess/video/samcoupe.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     Miles Gordon Technology SAM Coupe
diff --git a/src/mess/video/special.c b/src/mess/video/special.c
index 76958b719ea..a2d81447e51 100644
--- a/src/mess/video/special.c
+++ b/src/mess/video/special.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Specialist video driver by Miodrag Milanovic
diff --git a/src/mess/video/spectrum.c b/src/mess/video/spectrum.c
index d3640db4ce6..91eb296766e 100644
--- a/src/mess/video/spectrum.c
+++ b/src/mess/video/spectrum.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   spectrum.c
@@ -21,7 +23,7 @@
 ***************************************************************************/
 VIDEO_START_MEMBER(spectrum_state,spectrum)
 {
-	m_frame_invert_count = 25;
+	m_frame_invert_count = 16;
 	m_frame_number = 0;
 	m_flash_invert = 0;
 
@@ -37,7 +39,7 @@ VIDEO_START_MEMBER(spectrum_state,spectrum)
 
 VIDEO_START_MEMBER(spectrum_state,spectrum_128)
 {
-	m_frame_invert_count = 25;
+	m_frame_invert_count = 16;
 	m_frame_number = 0;
 	m_flash_invert = 0;
 
diff --git a/src/mess/video/ssystem3.c b/src/mess/video/ssystem3.c
index f8ce8a14deb..82efc18bad4 100644
--- a/src/mess/video/ssystem3.c
+++ b/src/mess/video/ssystem3.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /******************************************************************************
  PeT mess@utanet.at
 ******************************************************************************/
diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c
index 1de7814f58e..c3138f3f31a 100644
--- a/src/mess/video/stic.c
+++ b/src/mess/video/stic.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
  General Instruments AY-3-8900-1 a.k.a. Standard Television Interface Chip
diff --git a/src/mess/video/stic.h b/src/mess/video/stic.h
index 49b7dddeee5..0d1b6009a6e 100644
--- a/src/mess/video/stic.h
+++ b/src/mess/video/stic.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*****************************************************************************
  *
  * includes/stic.h
diff --git a/src/mess/video/super80.c b/src/mess/video/super80.c
index d67ee220cf0..89c750e031b 100644
--- a/src/mess/video/super80.c
+++ b/src/mess/video/super80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /* Super80.c written by Robbbert, 2005-2010. See the driver source for documentation. */
 
 /* Notes on using MAME MC6845 Device (MMD).
diff --git a/src/mess/video/thomson.c b/src/mess/video/thomson.c
index 6b7bb72e221..5b88116b7c1 100644
--- a/src/mess/video/thomson.c
+++ b/src/mess/video/thomson.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
   Copyright (C) Antoine Mine' 2006
diff --git a/src/mess/video/ti85.c b/src/mess/video/ti85.c
index 2ee735b5e7d..eac2508b50c 100644
--- a/src/mess/video/ti85.c
+++ b/src/mess/video/ti85.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
   TI-85 driver by Krzysztof Strzecha
 
diff --git a/src/mess/video/timex.c b/src/mess/video/timex.c
index 1ce26f41eb3..6a3d4d32fd4 100644
--- a/src/mess/video/timex.c
+++ b/src/mess/video/timex.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   timex.c
diff --git a/src/mess/video/trs80.c b/src/mess/video/trs80.c
index 51b4215d2e5..13a9426affa 100644
--- a/src/mess/video/trs80.c
+++ b/src/mess/video/trs80.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
   trs80.c
diff --git a/src/mess/video/tx0.c b/src/mess/video/tx0.c
index 93d29e29378..300218bbc92 100644
--- a/src/mess/video/tx0.c
+++ b/src/mess/video/tx0.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     TX-0
 
diff --git a/src/mess/video/ut88.c b/src/mess/video/ut88.c
index 34f9b41c3a3..70f5e83dcc5 100644
--- a/src/mess/video/ut88.c
+++ b/src/mess/video/ut88.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         UT88 video driver by Miodrag Milanovic
diff --git a/src/mess/video/uv201.c b/src/mess/video/uv201.c
index 3f253647c67..ae18cee5d2d 100644
--- a/src/mess/video/uv201.c
+++ b/src/mess/video/uv201.c
@@ -4,9 +4,6 @@
 
     VideoBrain UV201/UV202 video chip emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 #include "uv201.h"
diff --git a/src/mess/video/uv201.h b/src/mess/video/uv201.h
index f1dc644c1ec..336dd8f4141 100644
--- a/src/mess/video/uv201.h
+++ b/src/mess/video/uv201.h
@@ -4,9 +4,6 @@
 
     VideoBrain UV201/UV202 video chip emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                    GND   1 |*    \_/     | 40  DMAREQ
diff --git a/src/mess/video/vc4000.c b/src/mess/video/vc4000.c
index 61fff17c44b..eb127d5bb8d 100644
--- a/src/mess/video/vc4000.c
+++ b/src/mess/video/vc4000.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #include "includes/vc4000.h"
 
diff --git a/src/mess/video/vector06.c b/src/mess/video/vector06.c
index aef168f6c10..149ffb27b4c 100644
--- a/src/mess/video/vector06.c
+++ b/src/mess/video/vector06.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
         Vector06c driver by Miodrag Milanovic
diff --git a/src/mess/video/vtech2.c b/src/mess/video/vtech2.c
index 2173973717d..dedbf31efc9 100644
--- a/src/mess/video/vtech2.c
+++ b/src/mess/video/vtech2.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
     vtech2.c
 
diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c
index 4dbf06f8483..5068d4ea8a3 100644
--- a/src/mess/video/vtvideo.c
+++ b/src/mess/video/vtvideo.c
@@ -1,10 +1,9 @@
+// license:???
+// copyright-holders:Miodrag Milanovic,Karl-Ludwig Deisenhofer
 /**********************************************************************
 DEC VT Terminal video emulation
 [ DC012 and DC011 emulation ]
 
-Copyright MESS Team.
-Visit http://mamedev.org for licensing and usage restrictions.
-
 01/05/2009 Initial implementation [Miodrag Milanovic]
 Enhancements (2013 - 2015) by Karl-Ludwig Deisenhofer.
 
diff --git a/src/mess/video/vtvideo.h b/src/mess/video/vtvideo.h
index 3dcb9c17963..767273313b4 100644
--- a/src/mess/video/vtvideo.h
+++ b/src/mess/video/vtvideo.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
 DEC VT Terminal video emulation
diff --git a/src/mess/video/wswan_video.c b/src/mess/video/wswan_video.c
index 68f62e4552d..63145bf6770 100644
--- a/src/mess/video/wswan_video.c
+++ b/src/mess/video/wswan_video.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
  wswan_video.c
diff --git a/src/mess/video/wswan_video.h b/src/mess/video/wswan_video.h
index 132f8c2fb54..8691a56bc81 100644
--- a/src/mess/video/wswan_video.h
+++ b/src/mess/video/wswan_video.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /**********************************************************************
 
  wswan.h
diff --git a/src/mess/video/x68k.c b/src/mess/video/x68k.c
index b3c6b9d7a66..20511018c6c 100644
--- a/src/mess/video/x68k.c
+++ b/src/mess/video/x68k.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
 
     Sharp X68000 video functions
diff --git a/src/mess/video/zx.c b/src/mess/video/zx.c
index edf8e4f3786..8aefc22020e 100644
--- a/src/mess/video/zx.c
+++ b/src/mess/video/zx.c
@@ -1,3 +1,5 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
 /***************************************************************************
     zx.c
 
diff --git a/src/mess/video/zx8301.c b/src/mess/video/zx8301.c
index 69785e230a8..a7c115e8237 100644
--- a/src/mess/video/zx8301.c
+++ b/src/mess/video/zx8301.c
@@ -4,9 +4,6 @@
 
     Sinclair ZX8301 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************/
 
 /*
diff --git a/src/mess/video/zx8301.h b/src/mess/video/zx8301.h
index 855ae91caec..c91b1c65bca 100644
--- a/src/mess/video/zx8301.h
+++ b/src/mess/video/zx8301.h
@@ -4,9 +4,6 @@
 
     Sinclair ZX8301 emulation
 
-    Copyright MESS Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 **********************************************************************
                             _____   _____
                 DTACKL   1 |*    \_/     | 40  WEL
diff --git a/src/osd/eigccppc.h b/src/osd/eigccppc.h
index 3965b50ab47..b1ba620aaee 100644
--- a/src/osd/eigccppc.h
+++ b/src/osd/eigccppc.h
@@ -7,9 +7,6 @@
     PowerPC (32 and 64-bit) inline implementations for GCC compilers. This
     code is automatically included if appropriate by eminline.h.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #ifndef __EIGCCPPC__
diff --git a/src/osd/eigccx86.h b/src/osd/eigccx86.h
index 1d663d2cbbe..6b2769b9ecf 100644
--- a/src/osd/eigccx86.h
+++ b/src/osd/eigccx86.h
@@ -7,9 +7,6 @@
     x86 (32 and 64-bit) inline implementations for GCC compilers. This
     code is automatically included if appropriate by eminline.h.
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ***************************************************************************/
 
 #ifndef __EIGCCX86__
diff --git a/src/osd/eminline.h b/src/osd/eminline.h
index 3fca94af079..35d532f5e8c 100644
--- a/src/osd/eminline.h
+++ b/src/osd/eminline.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     eminline.h
diff --git a/src/osd/modules/debugger/debug_module.h b/src/osd/modules/debugger/debug_module.h
index 78b15aa41ef..105d3242545 100644
--- a/src/osd/modules/debugger/debug_module.h
+++ b/src/osd/modules/debugger/debug_module.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * debug_module.h
  *
diff --git a/src/osd/modules/debugger/debugint.c b/src/osd/modules/debugger/debugint.c
index 1d25453f443..6add4deeec9 100644
--- a/src/osd/modules/debugger/debugint.c
+++ b/src/osd/modules/debugger/debugint.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*********************************************************************
 
     debugint.c
diff --git a/src/osd/modules/debugger/debugosx.m b/src/osd/modules/debugger/debugosx.m
index d93c4c47877..6c52459f719 100644
--- a/src/osd/modules/debugger/debugosx.m
+++ b/src/osd/modules/debugger/debugosx.m
@@ -4,9 +4,6 @@
 //
 //  debugosx.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 
diff --git a/src/osd/modules/debugger/debugqt.c b/src/osd/modules/debugger/debugqt.c
index 0c0c2ef89bb..93901e23966 100644
--- a/src/osd/modules/debugger/debugqt.c
+++ b/src/osd/modules/debugger/debugqt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  debugqt.c - SDL/QT debug window handling
diff --git a/src/osd/modules/debugger/none.c b/src/osd/modules/debugger/none.c
index 8c5cd05e6bc..94a07c920b3 100644
--- a/src/osd/modules/debugger/none.c
+++ b/src/osd/modules/debugger/none.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  none.c - stubs for linking when NO_DEBUGGER is defined
diff --git a/src/osd/modules/debugger/osx/breakpointsview.h b/src/osd/modules/debugger/osx/breakpointsview.h
index e31a63aebed..6e6bc9c8d1c 100644
--- a/src/osd/modules/debugger/osx/breakpointsview.h
+++ b/src/osd/modules/debugger/osx/breakpointsview.h
@@ -4,9 +4,6 @@
 //
 //  breakpointsview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/breakpointsview.m b/src/osd/modules/debugger/osx/breakpointsview.m
index 46f58eac29b..54fa2ba711b 100644
--- a/src/osd/modules/debugger/osx/breakpointsview.m
+++ b/src/osd/modules/debugger/osx/breakpointsview.m
@@ -4,9 +4,6 @@
 //
 //  breakpointsview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "breakpointsview.h"
diff --git a/src/osd/modules/debugger/osx/consoleview.h b/src/osd/modules/debugger/osx/consoleview.h
index 5538ea49f28..2a6fff78a8c 100644
--- a/src/osd/modules/debugger/osx/consoleview.h
+++ b/src/osd/modules/debugger/osx/consoleview.h
@@ -4,9 +4,6 @@
 //
 //  consoleview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/consoleview.m b/src/osd/modules/debugger/osx/consoleview.m
index afa6c826199..a669785f3ff 100644
--- a/src/osd/modules/debugger/osx/consoleview.m
+++ b/src/osd/modules/debugger/osx/consoleview.m
@@ -4,9 +4,6 @@
 //
 //  consoleview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "consoleview.h"
diff --git a/src/osd/modules/debugger/osx/debugcommandhistory.h b/src/osd/modules/debugger/osx/debugcommandhistory.h
index 02256690ea7..f99767cb4be 100644
--- a/src/osd/modules/debugger/osx/debugcommandhistory.h
+++ b/src/osd/modules/debugger/osx/debugcommandhistory.h
@@ -4,9 +4,6 @@
 //
 //  debugcommandhistory.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/debugcommandhistory.m b/src/osd/modules/debugger/osx/debugcommandhistory.m
index 882c313000e..74a34904ae7 100644
--- a/src/osd/modules/debugger/osx/debugcommandhistory.m
+++ b/src/osd/modules/debugger/osx/debugcommandhistory.m
@@ -4,9 +4,6 @@
 //
 //  debugcommandhistory.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 //============================================================
diff --git a/src/osd/modules/debugger/osx/debugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h
index 87554b4dd6a..f73945e7b2f 100644
--- a/src/osd/modules/debugger/osx/debugconsole.h
+++ b/src/osd/modules/debugger/osx/debugconsole.h
@@ -4,9 +4,6 @@
 //
 //  debugconsole.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/debugconsole.m b/src/osd/modules/debugger/osx/debugconsole.m
index d869355fd46..c61a82c3dd8 100644
--- a/src/osd/modules/debugger/osx/debugconsole.m
+++ b/src/osd/modules/debugger/osx/debugconsole.m
@@ -4,9 +4,6 @@
 //
 //  debugconsole.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugconsole.h"
diff --git a/src/osd/modules/debugger/osx/debugosx.h b/src/osd/modules/debugger/osx/debugosx.h
index 3fba83a277d..b07aa3a088d 100644
--- a/src/osd/modules/debugger/osx/debugosx.h
+++ b/src/osd/modules/debugger/osx/debugosx.h
@@ -4,9 +4,6 @@
 //
 //  debugosx.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #ifndef __SDL_DEBUGOSX__
diff --git a/src/osd/modules/debugger/osx/debugview.h b/src/osd/modules/debugger/osx/debugview.h
index 260bb580ac9..89438750b62 100644
--- a/src/osd/modules/debugger/osx/debugview.h
+++ b/src/osd/modules/debugger/osx/debugview.h
@@ -4,9 +4,6 @@
 //
 //  debugview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/debugview.m b/src/osd/modules/debugger/osx/debugview.m
index 7e53ee7d803..27f1fd35f22 100644
--- a/src/osd/modules/debugger/osx/debugview.m
+++ b/src/osd/modules/debugger/osx/debugview.m
@@ -4,9 +4,6 @@
 //
 //  debugview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugview.h"
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h
index f720da4f6ef..e8d2d6eb08d 100644
--- a/src/osd/modules/debugger/osx/debugwindowhandler.h
+++ b/src/osd/modules/debugger/osx/debugwindowhandler.h
@@ -4,9 +4,6 @@
 //
 //  debugwindowhandler.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.m b/src/osd/modules/debugger/osx/debugwindowhandler.m
index 9d1e6d5f949..5eb5060d462 100644
--- a/src/osd/modules/debugger/osx/debugwindowhandler.m
+++ b/src/osd/modules/debugger/osx/debugwindowhandler.m
@@ -4,9 +4,6 @@
 //
 //  debugwindowhandler.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugwindowhandler.h"
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.h b/src/osd/modules/debugger/osx/deviceinfoviewer.h
index 7b9975d0e73..5bf7838aa33 100644
--- a/src/osd/modules/debugger/osx/deviceinfoviewer.h
+++ b/src/osd/modules/debugger/osx/deviceinfoviewer.h
@@ -4,9 +4,6 @@
 //
 //  deviceinfoviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.m b/src/osd/modules/debugger/osx/deviceinfoviewer.m
index 23bd19f5a03..1f045870883 100644
--- a/src/osd/modules/debugger/osx/deviceinfoviewer.m
+++ b/src/osd/modules/debugger/osx/deviceinfoviewer.m
@@ -4,9 +4,6 @@
 //
 //  deviceinfoviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "deviceinfoviewer.h"
diff --git a/src/osd/modules/debugger/osx/devicesviewer.h b/src/osd/modules/debugger/osx/devicesviewer.h
index 11408b43b01..98b9130c564 100644
--- a/src/osd/modules/debugger/osx/devicesviewer.h
+++ b/src/osd/modules/debugger/osx/devicesviewer.h
@@ -4,9 +4,6 @@
 //
 //  devicesviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/devicesviewer.m b/src/osd/modules/debugger/osx/devicesviewer.m
index 5cf2d33eedd..01d49c14da6 100644
--- a/src/osd/modules/debugger/osx/devicesviewer.m
+++ b/src/osd/modules/debugger/osx/devicesviewer.m
@@ -4,9 +4,6 @@
 //
 //  devicesviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "devicesviewer.h"
diff --git a/src/osd/modules/debugger/osx/disassemblyview.h b/src/osd/modules/debugger/osx/disassemblyview.h
index 7b2a501bfc6..04d1870b498 100644
--- a/src/osd/modules/debugger/osx/disassemblyview.h
+++ b/src/osd/modules/debugger/osx/disassemblyview.h
@@ -4,9 +4,6 @@
 //
 //  disassemblyview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/disassemblyview.m b/src/osd/modules/debugger/osx/disassemblyview.m
index 55ecb5f50ac..f82eb917fae 100644
--- a/src/osd/modules/debugger/osx/disassemblyview.m
+++ b/src/osd/modules/debugger/osx/disassemblyview.m
@@ -4,9 +4,6 @@
 //
 //  disassemblyview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "disassemblyview.h"
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h
index d9899457abb..e698fb897d8 100644
--- a/src/osd/modules/debugger/osx/disassemblyviewer.h
+++ b/src/osd/modules/debugger/osx/disassemblyviewer.h
@@ -4,9 +4,6 @@
 //
 //  disassemblyviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.m b/src/osd/modules/debugger/osx/disassemblyviewer.m
index 61846d2e879..16650ba06d8 100644
--- a/src/osd/modules/debugger/osx/disassemblyviewer.m
+++ b/src/osd/modules/debugger/osx/disassemblyviewer.m
@@ -4,9 +4,6 @@
 //
 //  disassemblyviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "disassemblyviewer.h"
diff --git a/src/osd/modules/debugger/osx/errorlogview.h b/src/osd/modules/debugger/osx/errorlogview.h
index bcb6a541a8c..4830ac17a60 100644
--- a/src/osd/modules/debugger/osx/errorlogview.h
+++ b/src/osd/modules/debugger/osx/errorlogview.h
@@ -4,9 +4,6 @@
 //
 //  errorlogview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/errorlogview.m b/src/osd/modules/debugger/osx/errorlogview.m
index 102065009ea..40362db4d74 100644
--- a/src/osd/modules/debugger/osx/errorlogview.m
+++ b/src/osd/modules/debugger/osx/errorlogview.m
@@ -4,9 +4,6 @@
 //
 //  errorlogview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "errorlogview.h"
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h
index 610c4f609ae..5174f5b119b 100644
--- a/src/osd/modules/debugger/osx/errorlogviewer.h
+++ b/src/osd/modules/debugger/osx/errorlogviewer.h
@@ -4,9 +4,6 @@
 //
 //  errorlogviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.m b/src/osd/modules/debugger/osx/errorlogviewer.m
index b4e204d45f7..0548ff9351f 100644
--- a/src/osd/modules/debugger/osx/errorlogviewer.m
+++ b/src/osd/modules/debugger/osx/errorlogviewer.m
@@ -4,9 +4,6 @@
 //
 //  errorlogviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "errorlogviewer.h"
diff --git a/src/osd/modules/debugger/osx/memoryview.h b/src/osd/modules/debugger/osx/memoryview.h
index 1336426c896..e8a7a138f4d 100644
--- a/src/osd/modules/debugger/osx/memoryview.h
+++ b/src/osd/modules/debugger/osx/memoryview.h
@@ -4,9 +4,6 @@
 //
 //  memoryview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/memoryview.m b/src/osd/modules/debugger/osx/memoryview.m
index e90095292a4..ca9e6a2b99f 100644
--- a/src/osd/modules/debugger/osx/memoryview.m
+++ b/src/osd/modules/debugger/osx/memoryview.m
@@ -4,9 +4,6 @@
 //
 //  memoryview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "memoryview.h"
diff --git a/src/osd/modules/debugger/osx/memoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h
index 03fc65571cd..04c25e84c91 100644
--- a/src/osd/modules/debugger/osx/memoryviewer.h
+++ b/src/osd/modules/debugger/osx/memoryviewer.h
@@ -4,9 +4,6 @@
 //
 //  memoryviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/memoryviewer.m b/src/osd/modules/debugger/osx/memoryviewer.m
index 5812aec65b0..16cbec9fd16 100644
--- a/src/osd/modules/debugger/osx/memoryviewer.m
+++ b/src/osd/modules/debugger/osx/memoryviewer.m
@@ -4,9 +4,6 @@
 //
 //  memoryviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "memoryviewer.h"
diff --git a/src/osd/modules/debugger/osx/pointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h
index ad9ef0f62fd..a5e2384e6a1 100644
--- a/src/osd/modules/debugger/osx/pointsviewer.h
+++ b/src/osd/modules/debugger/osx/pointsviewer.h
@@ -4,9 +4,6 @@
 //
 //  pointsviewer.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/pointsviewer.m b/src/osd/modules/debugger/osx/pointsviewer.m
index 81cc4ee5f8e..2a2ceba674e 100644
--- a/src/osd/modules/debugger/osx/pointsviewer.m
+++ b/src/osd/modules/debugger/osx/pointsviewer.m
@@ -4,9 +4,6 @@
 //
 //  pointsviewer.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "pointsviewer.h"
diff --git a/src/osd/modules/debugger/osx/registersview.h b/src/osd/modules/debugger/osx/registersview.h
index 90e656104fc..eaf13c61ff9 100644
--- a/src/osd/modules/debugger/osx/registersview.h
+++ b/src/osd/modules/debugger/osx/registersview.h
@@ -4,9 +4,6 @@
 //
 //  registersview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/registersview.m b/src/osd/modules/debugger/osx/registersview.m
index e02bd9cd7a6..7e6cfd2dd7a 100644
--- a/src/osd/modules/debugger/osx/registersview.m
+++ b/src/osd/modules/debugger/osx/registersview.m
@@ -4,9 +4,6 @@
 //
 //  registersview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "registersview.h"
diff --git a/src/osd/modules/debugger/osx/watchpointsview.h b/src/osd/modules/debugger/osx/watchpointsview.h
index 0480c685d20..c03d71e992e 100644
--- a/src/osd/modules/debugger/osx/watchpointsview.h
+++ b/src/osd/modules/debugger/osx/watchpointsview.h
@@ -4,9 +4,6 @@
 //
 //  watchpointsview.h - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "debugosx.h"
diff --git a/src/osd/modules/debugger/osx/watchpointsview.m b/src/osd/modules/debugger/osx/watchpointsview.m
index ae726d0f0d0..cfaa3ee973f 100644
--- a/src/osd/modules/debugger/osx/watchpointsview.m
+++ b/src/osd/modules/debugger/osx/watchpointsview.m
@@ -4,9 +4,6 @@
 //
 //  watchpointsview.m - MacOS X Cocoa debug window handling
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #import "watchpointsview.h"
diff --git a/src/osd/modules/debugger/qt/breakpointswindow.c b/src/osd/modules/debugger/qt/breakpointswindow.c
index ff14fdfb67c..71a5e7100e3 100644
--- a/src/osd/modules/debugger/qt/breakpointswindow.c
+++ b/src/osd/modules/debugger/qt/breakpointswindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "breakpointswindow.h"
diff --git a/src/osd/modules/debugger/qt/breakpointswindow.h b/src/osd/modules/debugger/qt/breakpointswindow.h
index fedad23b84a..cb22b162c95 100644
--- a/src/osd/modules/debugger/qt/breakpointswindow.h
+++ b/src/osd/modules/debugger/qt/breakpointswindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_BREAK_POINTS_WINDOW_H__
 #define __DEBUG_QT_BREAK_POINTS_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/dasmwindow.c b/src/osd/modules/debugger/qt/dasmwindow.c
index 688ea6f9f87..7d8548791d6 100644
--- a/src/osd/modules/debugger/qt/dasmwindow.c
+++ b/src/osd/modules/debugger/qt/dasmwindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "dasmwindow.h"
diff --git a/src/osd/modules/debugger/qt/dasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h
index 3e7c4978918..f7463e89167 100644
--- a/src/osd/modules/debugger/qt/dasmwindow.h
+++ b/src/osd/modules/debugger/qt/dasmwindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_DASM_WINDOW_H__
 #define __DEBUG_QT_DASM_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/debuggerview.c b/src/osd/modules/debugger/qt/debuggerview.c
index eca5aae1ed3..b907fd5a5f8 100644
--- a/src/osd/modules/debugger/qt/debuggerview.c
+++ b/src/osd/modules/debugger/qt/debuggerview.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "debuggerview.h"
diff --git a/src/osd/modules/debugger/qt/debuggerview.h b/src/osd/modules/debugger/qt/debuggerview.h
index 2e0a91ac870..8125d8cd1e9 100644
--- a/src/osd/modules/debugger/qt/debuggerview.h
+++ b/src/osd/modules/debugger/qt/debuggerview.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_DEBUGGER_VIEW_H__
 #define __DEBUG_QT_DEBUGGER_VIEW_H__
 
diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.c b/src/osd/modules/debugger/qt/deviceinformationwindow.c
index ba0f06027a1..1697df53b2e 100644
--- a/src/osd/modules/debugger/qt/deviceinformationwindow.c
+++ b/src/osd/modules/debugger/qt/deviceinformationwindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "deviceinformationwindow.h"
diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.h b/src/osd/modules/debugger/qt/deviceinformationwindow.h
index 58fcb764cc8..9420499a01a 100644
--- a/src/osd/modules/debugger/qt/deviceinformationwindow.h
+++ b/src/osd/modules/debugger/qt/deviceinformationwindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_DEVICE_INFORMATION_WINDOW_H__
 #define __DEBUG_QT_DEVICE_INFORMATION_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/deviceswindow.c b/src/osd/modules/debugger/qt/deviceswindow.c
index ac1f46e347f..6cbccf961ba 100644
--- a/src/osd/modules/debugger/qt/deviceswindow.c
+++ b/src/osd/modules/debugger/qt/deviceswindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "deviceswindow.h"
diff --git a/src/osd/modules/debugger/qt/deviceswindow.h b/src/osd/modules/debugger/qt/deviceswindow.h
index bf647b27ec5..5b5dff38f0b 100644
--- a/src/osd/modules/debugger/qt/deviceswindow.h
+++ b/src/osd/modules/debugger/qt/deviceswindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_DEVICES_WINDOW_H__
 #define __DEBUG_QT_DEVICES_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/logwindow.c b/src/osd/modules/debugger/qt/logwindow.c
index ac6fbd6fc12..8e8b64bac1d 100644
--- a/src/osd/modules/debugger/qt/logwindow.c
+++ b/src/osd/modules/debugger/qt/logwindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "logwindow.h"
diff --git a/src/osd/modules/debugger/qt/logwindow.h b/src/osd/modules/debugger/qt/logwindow.h
index 4179132dc1e..a8c19e00fee 100644
--- a/src/osd/modules/debugger/qt/logwindow.h
+++ b/src/osd/modules/debugger/qt/logwindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_LOG_WINDOW_H__
 #define __DEBUG_QT_LOG_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/mainwindow.c b/src/osd/modules/debugger/qt/mainwindow.c
index 382370fc4c8..971e25005b9 100644
--- a/src/osd/modules/debugger/qt/mainwindow.c
+++ b/src/osd/modules/debugger/qt/mainwindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "mainwindow.h"
diff --git a/src/osd/modules/debugger/qt/mainwindow.h b/src/osd/modules/debugger/qt/mainwindow.h
index 810631b0f1a..1161409971b 100644
--- a/src/osd/modules/debugger/qt/mainwindow.h
+++ b/src/osd/modules/debugger/qt/mainwindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_MAIN_WINDOW_H__
 #define __DEBUG_QT_MAIN_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/memorywindow.c b/src/osd/modules/debugger/qt/memorywindow.c
index d04fa1071af..70965848521 100644
--- a/src/osd/modules/debugger/qt/memorywindow.c
+++ b/src/osd/modules/debugger/qt/memorywindow.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "memorywindow.h"
diff --git a/src/osd/modules/debugger/qt/memorywindow.h b/src/osd/modules/debugger/qt/memorywindow.h
index 2dc731f4006..ee464b6b8bb 100644
--- a/src/osd/modules/debugger/qt/memorywindow.h
+++ b/src/osd/modules/debugger/qt/memorywindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_MEMORY_WINDOW_H__
 #define __DEBUG_QT_MEMORY_WINDOW_H__
 
diff --git a/src/osd/modules/debugger/qt/windowqt.c b/src/osd/modules/debugger/qt/windowqt.c
index 851a73a359f..0bca9849df7 100644
--- a/src/osd/modules/debugger/qt/windowqt.c
+++ b/src/osd/modules/debugger/qt/windowqt.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define NO_MEM_TRACKING
 
 #include "windowqt.h"
diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h
index 6bb7f646522..03db0c6ff9e 100644
--- a/src/osd/modules/debugger/qt/windowqt.h
+++ b/src/osd/modules/debugger/qt/windowqt.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef __DEBUG_QT_WINDOW_QT_H__
 #define __DEBUG_QT_WINDOW_QT_H__
 
diff --git a/src/osd/modules/font/font_module.h b/src/osd/modules/font/font_module.h
index 816b6fc839b..495823c4180 100644
--- a/src/osd/modules/font/font_module.h
+++ b/src/osd/modules/font/font_module.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * font_module.h
  *
diff --git a/src/osd/modules/font/font_none.c b/src/osd/modules/font/font_none.c
index 83c920d41e1..c3be652adc0 100644
--- a/src/osd/modules/font/font_none.c
+++ b/src/osd/modules/font/font_none.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * font_sdl.c
  *
diff --git a/src/osd/modules/font/font_osx.c b/src/osd/modules/font/font_osx.c
index 3306b521f1d..09e706fed18 100644
--- a/src/osd/modules/font/font_osx.c
+++ b/src/osd/modules/font/font_osx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * font_sdl.c
  *
diff --git a/src/osd/modules/font/font_sdl.c b/src/osd/modules/font/font_sdl.c
index 3ef57aec3d2..f2b1e0ab15b 100644
--- a/src/osd/modules/font/font_sdl.c
+++ b/src/osd/modules/font/font_sdl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * font_sdl.c
  *
diff --git a/src/osd/modules/font/font_windows.c b/src/osd/modules/font/font_windows.c
index 5b0b57823ab..0e54d7956d5 100644
--- a/src/osd/modules/font/font_windows.c
+++ b/src/osd/modules/font/font_windows.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * font_sdl.c
  *
diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h
index 37f45797436..0080f50010c 100644
--- a/src/osd/modules/lib/osdlib.h
+++ b/src/osd/modules/lib/osdlib.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  osdlib.h
diff --git a/src/osd/modules/lib/osdlib_macosx.c b/src/osd/modules/lib/osdlib_macosx.c
index 088cbd969df..e568970bf51 100644
--- a/src/osd/modules/lib/osdlib_macosx.c
+++ b/src/osd/modules/lib/osdlib_macosx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/modules/lib/osdlib_os2.c b/src/osd/modules/lib/osdlib_os2.c
index 93f1ca97f44..717b3c30e58 100644
--- a/src/osd/modules/lib/osdlib_os2.c
+++ b/src/osd/modules/lib/osdlib_os2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/modules/lib/osdlib_unix.c b/src/osd/modules/lib/osdlib_unix.c
index 7fe3c37988d..b30a150e0d9 100644
--- a/src/osd/modules/lib/osdlib_unix.c
+++ b/src/osd/modules/lib/osdlib_unix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/modules/lib/osdlib_win32.c b/src/osd/modules/lib/osdlib_win32.c
index 3150cdafc97..bc03cb02ca5 100644
--- a/src/osd/modules/lib/osdlib_win32.c
+++ b/src/osd/modules/lib/osdlib_win32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/modules/midi/midi_module.h b/src/osd/modules/midi/midi_module.h
index 256d50c7aa7..1e71269a734 100644
--- a/src/osd/modules/midi/midi_module.h
+++ b/src/osd/modules/midi/midi_module.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * midi_module.h
  *
diff --git a/src/osd/modules/midi/none.c b/src/osd/modules/midi/none.c
index df78ac26950..141ac7d360d 100644
--- a/src/osd/modules/midi/none.c
+++ b/src/osd/modules/midi/none.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     none.c
diff --git a/src/osd/modules/midi/portmidi.c b/src/osd/modules/midi/portmidi.c
index 7d4315d08ac..6a114726502 100644
--- a/src/osd/modules/midi/portmidi.c
+++ b/src/osd/modules/midi/portmidi.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     portmap.c
diff --git a/src/osd/modules/netdev/netdev_module.h b/src/osd/modules/netdev/netdev_module.h
index 8bddab3b85b..96e32902689 100644
--- a/src/osd/modules/netdev/netdev_module.h
+++ b/src/osd/modules/netdev/netdev_module.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * netdev_module.h
  *
diff --git a/src/osd/modules/netdev/none.c b/src/osd/modules/netdev/none.c
index ed0d8832097..13f1078354d 100644
--- a/src/osd/modules/netdev/none.c
+++ b/src/osd/modules/netdev/none.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * none.c
  *
diff --git a/src/osd/modules/netdev/pcap.c b/src/osd/modules/netdev/pcap.c
index 3728f1aae9e..3b16f2ad83a 100644
--- a/src/osd/modules/netdev/pcap.c
+++ b/src/osd/modules/netdev/pcap.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #if defined(OSD_NET_USE_PCAP)
 
 #if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
diff --git a/src/osd/modules/netdev/taptun.c b/src/osd/modules/netdev/taptun.c
index 5c2e8579107..c0f304404c7 100644
--- a/src/osd/modules/netdev/taptun.c
+++ b/src/osd/modules/netdev/taptun.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #if defined(OSD_NET_USE_TAPTUN)
 
 #include <unistd.h>
diff --git a/src/osd/modules/opengl/SDL1211_opengl.h b/src/osd/modules/opengl/SDL1211_opengl.h
index 72aa20cf74d..3a7e2f818af 100644
--- a/src/osd/modules/opengl/SDL1211_opengl.h
+++ b/src/osd/modules/opengl/SDL1211_opengl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2006 Sam Lantinga
diff --git a/src/osd/modules/opengl/gl_shader_mgr.c b/src/osd/modules/opengl/gl_shader_mgr.c
index 46fbc825aa6..5c22b3a09c8 100644
--- a/src/osd/modules/opengl/gl_shader_mgr.c
+++ b/src/osd/modules/opengl/gl_shader_mgr.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include <stdio.h>   /* snprintf */
 #include <stdlib.h>  /* malloc */
 
diff --git a/src/osd/modules/opengl/gl_shader_mgr.h b/src/osd/modules/opengl/gl_shader_mgr.h
index 9c3aef19815..dcda40afa2d 100644
--- a/src/osd/modules/opengl/gl_shader_mgr.h
+++ b/src/osd/modules/opengl/gl_shader_mgr.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 #ifndef GL_SHADER_MGR_H
 #define GL_SHADER_MGR_H
diff --git a/src/osd/modules/opengl/gl_shader_tool.c b/src/osd/modules/opengl/gl_shader_tool.c
index a6929a6fe2d..b658c344d3f 100644
--- a/src/osd/modules/opengl/gl_shader_tool.c
+++ b/src/osd/modules/opengl/gl_shader_tool.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***
  *
  * GL Shader Tool - Convinient Basic Shader functionality
diff --git a/src/osd/modules/opengl/gl_shader_tool.h b/src/osd/modules/opengl/gl_shader_tool.h
index 9e53148d7ae..bc0980eed73 100644
--- a/src/osd/modules/opengl/gl_shader_tool.h
+++ b/src/osd/modules/opengl/gl_shader_tool.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***
  *
  * GL Shader Tool - Convinient Basic Shader functionality
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 0113694951d..453b8f88484 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef GET_GLFUNC
 #ifndef MANGLE
 
diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
index 62844692cbe..cc941c61bc1 100644
--- a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_bilinear_idx16_lut_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
index d6265b8905b..d7e43a9739c 100644
--- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_bilinear_rgb32_dir_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
index a5a67bdbf94..865a52ba7ce 100644
--- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_bilinear_rgb32_lut_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/opengl/shader/glsl_general.vsh.c b/src/osd/modules/opengl/shader/glsl_general.vsh.c
index d0bf6eb8a68..896a2571e7c 100644
--- a/src/osd/modules/opengl/shader/glsl_general.vsh.c
+++ b/src/osd/modules/opengl/shader/glsl_general.vsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_general_vsh_src[] =
 "\n"
 "void main()\n"
diff --git a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
index f9f18b615e6..373b3759299 100644
--- a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_plain_idx16_lut_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
index 1e206d671cd..a05f2999c1a 100644
--- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_plain_rgb32_dir_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
index d1263ea6864..2e60aeae1c2 100644
--- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
+++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 const char glsl_plain_rgb32_lut_fsh_src[] =
 "\n"
 "#pragma optimize (on)\n"
diff --git a/src/osd/modules/osdmodule.c b/src/osd/modules/osdmodule.c
index 403dea57e80..7d3e006df7e 100644
--- a/src/osd/modules/osdmodule.c
+++ b/src/osd/modules/osdmodule.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * osdmodule.c
  *
diff --git a/src/osd/modules/osdmodule.h b/src/osd/modules/osdmodule.h
index 64f0f3c99e6..13fdd5c59c6 100644
--- a/src/osd/modules/osdmodule.h
+++ b/src/osd/modules/osdmodule.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     osdmodule.h
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index edafeb303ca..23386f53408 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  osdwindow.h - SDL window handling
diff --git a/src/osd/modules/render/blit13.h b/src/osd/modules/render/blit13.h
index e394efc744a..bea77c8a630 100644
--- a/src/osd/modules/render/blit13.h
+++ b/src/osd/modules/render/blit13.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 
 
 
diff --git a/src/osd/modules/render/draw13.c b/src/osd/modules/render/draw13.c
index fb52a725562..5a494064ae3 100644
--- a/src/osd/modules/render/draw13.c
+++ b/src/osd/modules/render/draw13.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  draw13.c - SDL 2.0 drawing implementation
diff --git a/src/osd/modules/render/drawogl.c b/src/osd/modules/render/drawogl.c
index 007509846a1..ca7271e5c8a 100644
--- a/src/osd/modules/render/drawogl.c
+++ b/src/osd/modules/render/drawogl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  drawogl.c - SDL software and OpenGL implementation
diff --git a/src/osd/modules/render/drawsdl.c b/src/osd/modules/render/drawsdl.c
index 32753ef79b9..94eec862304 100644
--- a/src/osd/modules/render/drawsdl.c
+++ b/src/osd/modules/render/drawsdl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  drawsdl.c - SDL software and OpenGL implementation
diff --git a/src/osd/modules/sound/coreaudio_sound.c b/src/osd/modules/sound/coreaudio_sound.c
index e6039d0c233..04c179274dd 100644
--- a/src/osd/modules/sound/coreaudio_sound.c
+++ b/src/osd/modules/sound/coreaudio_sound.c
@@ -4,9 +4,6 @@
 //
 //  sound.c - CoreAudio implementation of MAME sound routines
 //
-//  Copyright (c) 1996-2015, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #include "sound_module.h"
diff --git a/src/osd/modules/sound/sdl_sound.c b/src/osd/modules/sound/sdl_sound.c
index 3f665242089..339218244a9 100644
--- a/src/osd/modules/sound/sdl_sound.c
+++ b/src/osd/modules/sound/sdl_sound.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sound.c - SDL implementation of MAME sound routines
diff --git a/src/osd/modules/sound/sound_module.h b/src/osd/modules/sound/sound_module.h
index 087ace0a714..2d487f32739 100644
--- a/src/osd/modules/sound/sound_module.h
+++ b/src/osd/modules/sound/sound_module.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /*
  * sound_module.h
  *
diff --git a/src/osd/modules/sync/osdsync.h b/src/osd/modules/sync/osdsync.h
index 4f2aed6d30e..cbaf2cc2afd 100644
--- a/src/osd/modules/sync/osdsync.h
+++ b/src/osd/modules/sync/osdsync.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  osdsync.h - Core synchronization functions
diff --git a/src/osd/modules/sync/sync_ntc.c b/src/osd/modules/sync/sync_ntc.c
index 025e5b37713..a1403ead18a 100644
--- a/src/osd/modules/sync/sync_ntc.c
+++ b/src/osd/modules/sync/sync_ntc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlsync.c - SDL core synchronization functions
diff --git a/src/osd/modules/sync/sync_os2.c b/src/osd/modules/sync/sync_os2.c
index 75164c517c5..3a6676af1aa 100644
--- a/src/osd/modules/sync/sync_os2.c
+++ b/src/osd/modules/sync/sync_os2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlsync.c - SDL core synchronization functions
diff --git a/src/osd/modules/sync/sync_sdl.c b/src/osd/modules/sync/sync_sdl.c
index 56e2ad15639..2d6239d6f5b 100644
--- a/src/osd/modules/sync/sync_sdl.c
+++ b/src/osd/modules/sync/sync_sdl.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlsync.c - SDL core synchronization functions
diff --git a/src/osd/modules/sync/sync_tc.c b/src/osd/modules/sync/sync_tc.c
index b3f63e7c05b..16d39b91609 100644
--- a/src/osd/modules/sync/sync_tc.c
+++ b/src/osd/modules/sync/sync_tc.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlsync.c - SDL core synchronization functions
diff --git a/src/osd/modules/sync/work_osd.c b/src/osd/modules/sync/work_osd.c
index 89dec09b122..34a3c6b5851 100644
--- a/src/osd/modules/sync/work_osd.c
+++ b/src/osd/modules/sync/work_osd.c
@@ -4,9 +4,6 @@
 //
 //  sdlwork.c - SDL OSD core work item functions
 //
-//  Copyright (c) 1996-2010, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #if defined(OSD_WINDOWS)
diff --git a/src/osd/osdcore.c b/src/osd/osdcore.c
index 251e3409a7a..5a64693c0c7 100644
--- a/src/osd/osdcore.c
+++ b/src/osd/osdcore.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "osdcore.h"
 
 bool g_print_verbose = false;
diff --git a/src/osd/osdnet.c b/src/osd/osdnet.c
index f62156b7149..7e66f3079c7 100644
--- a/src/osd/osdnet.c
+++ b/src/osd/osdnet.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 #include "osdnet.h"
 
diff --git a/src/osd/osdnet.h b/src/osd/osdnet.h
index 0ea37834f9d..d6aabed1722 100644
--- a/src/osd/osdnet.h
+++ b/src/osd/osdnet.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #include "emu.h"
 
 #ifndef __OSDNET_H__
diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c
index 42fc08a8ebd..2c05cd791a7 100644
--- a/src/osd/sdl/input.c
+++ b/src/osd/sdl/input.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  input.c - SDL implementation of MAME input routines
diff --git a/src/osd/sdl/input.h b/src/osd/sdl/input.h
index c76ac189f6d..3fe4e0c4752 100644
--- a/src/osd/sdl/input.h
+++ b/src/osd/sdl/input.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  input.h - SDL implementation of MAME input routines
diff --git a/src/osd/sdl/ledutil.sh b/src/osd/sdl/ledutil.sh
index 05694d6b9b7..ef9ac93d353 100644
--- a/src/osd/sdl/ledutil.sh
+++ b/src/osd/sdl/ledutil.sh
@@ -4,9 +4,6 @@
 # 
 #   ledutil.sh - Example script for output notifiers
 # 
-#   Copyright Nicola Salmoria and the MAME Team.
-#   Visit http://mamedev.org for licensing and usage restrictions.
-#
 #   This is a very basic implementation which
 #
 #   a) Sets kbd leds if led0, led1, led2 is received
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index f3a3241e065..466c0b34d3e 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _osdsdl_h_
 #define _osdsdl_h_
 
diff --git a/src/osd/sdl/osxutils.h b/src/osd/sdl/osxutils.h
index a41ff7eae46..61ec4527cf1 100644
--- a/src/osd/sdl/osxutils.h
+++ b/src/osd/sdl/osxutils.h
@@ -4,9 +4,6 @@
 //
 //  osxutils.h - Mac OS X utilities for SDLMAME
 //
-//  Copyright (c) 1996-2006, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //  SDLMAME by Olivier Galibert and R. Belmont
 //
 //============================================================
diff --git a/src/osd/sdl/osxutils.m b/src/osd/sdl/osxutils.m
index 4d87b32bf77..c71af922b59 100644
--- a/src/osd/sdl/osxutils.m
+++ b/src/osd/sdl/osxutils.m
@@ -4,9 +4,6 @@
 //
 //  osxutils.m - Mac OS X utilities for SDLMAME
 //
-//  Copyright (c) 1996-2006, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //  SDLMAME by Olivier Galibert and R. Belmont
 //
 //============================================================
diff --git a/src/osd/sdl/output.c b/src/osd/sdl/output.c
index 10151c6c6cb..f258ac75dba 100644
--- a/src/osd/sdl/output.c
+++ b/src/osd/sdl/output.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  output.c - Generic implementation of MAME output routines
diff --git a/src/osd/sdl/sdldir.c b/src/osd/sdl/sdldir.c
index ba1184adc20..0fd2de2c5cb 100644
--- a/src/osd/sdl/sdldir.c
+++ b/src/osd/sdl/sdldir.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdldir.c - SDL core directory access functions
diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c
index e7293342ede..db47df24804 100644
--- a/src/osd/sdl/sdlfile.c
+++ b/src/osd/sdl/sdlfile.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlfile.c - SDL file access functions
diff --git a/src/osd/sdl/sdlfile.h b/src/osd/sdl/sdlfile.h
index e3c5e4c9270..e7601ecb088 100644
--- a/src/osd/sdl/sdlfile.h
+++ b/src/osd/sdl/sdlfile.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlfile.h - SDL file access functions
diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h
index ca10b7956a1..910f35eb114 100644
--- a/src/osd/sdl/sdlinc.h
+++ b/src/osd/sdl/sdlinc.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _sdlinc_h_
 #define _sdlinc_h_
 
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index 04d622874f6..5b49bcaadac 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlmain.c - main file for SDLMAME.
diff --git a/src/osd/sdl/sdlos_macosx.c b/src/osd/sdl/sdlos_macosx.c
index 3585780f31e..f51c2fcfec5 100644
--- a/src/osd/sdl/sdlos_macosx.c
+++ b/src/osd/sdl/sdlos_macosx.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/sdl/sdlos_os2.c b/src/osd/sdl/sdlos_os2.c
index 4aa5450bcb7..83dff3ec4ef 100644
--- a/src/osd/sdl/sdlos_os2.c
+++ b/src/osd/sdl/sdlos_os2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c
index c5180bc13b7..c5dba2764d8 100644
--- a/src/osd/sdl/sdlos_unix.c
+++ b/src/osd/sdl/sdlos_unix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/sdl/sdlos_win32.c b/src/osd/sdl/sdlos_win32.c
index ab488b0d70b..f3230c8f93e 100644
--- a/src/osd/sdl/sdlos_win32.c
+++ b/src/osd/sdl/sdlos_win32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlos_*.c - OS specific low level code
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index f46bf2a22df..925c24bef63 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlprefix.h - prefix file, included by ALL files
diff --git a/src/osd/sdl/sdlptty_os2.c b/src/osd/sdl/sdlptty_os2.c
index edb0fbb2175..d46f476b7e3 100644
--- a/src/osd/sdl/sdlptty_os2.c
+++ b/src/osd/sdl/sdlptty_os2.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlptty_os2 - SDL psuedo tty access functions
diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c
index 60eac1436dd..e8e902ff3e6 100644
--- a/src/osd/sdl/sdlptty_unix.c
+++ b/src/osd/sdl/sdlptty_unix.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlptty_unix.c - SDL psuedo tty access functions
diff --git a/src/osd/sdl/sdlptty_win32.c b/src/osd/sdl/sdlptty_win32.c
index 42b10131c61..70f81f26e08 100644
--- a/src/osd/sdl/sdlptty_win32.c
+++ b/src/osd/sdl/sdlptty_win32.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlptty_win32 - SDL psuedo tty access functions
diff --git a/src/osd/sdl/sdlsocket.c b/src/osd/sdl/sdlsocket.c
index cc6682abcd1..6f8095896f6 100644
--- a/src/osd/sdl/sdlsocket.c
+++ b/src/osd/sdl/sdlsocket.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  sdlsocket.c - SDL socket (inet) access functions
diff --git a/src/osd/sdl/testkeys.c b/src/osd/sdl/testkeys.c
index 6282fa6b8eb..a004dfb7db6 100644
--- a/src/osd/sdl/testkeys.c
+++ b/src/osd/sdl/testkeys.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  testkey.c - A small utility to analyze SDL keycodes
diff --git a/src/osd/sdl/video.c b/src/osd/sdl/video.c
index 3d8f6c095bb..be1a9e056f6 100644
--- a/src/osd/sdl/video.c
+++ b/src/osd/sdl/video.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  video.c - SDL video handling
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index e79442bdd3c..86bf8ea4138 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  video.h - SDL implementation of MAME video routines
diff --git a/src/osd/sdl/watchdog.c b/src/osd/sdl/watchdog.c
index fa7ead22224..22e4124941b 100644
--- a/src/osd/sdl/watchdog.c
+++ b/src/osd/sdl/watchdog.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  watchdog.c - watchdog handling
diff --git a/src/osd/sdl/watchdog.h b/src/osd/sdl/watchdog.h
index fbb3410eb95..2a706f780ac 100644
--- a/src/osd/sdl/watchdog.h
+++ b/src/osd/sdl/watchdog.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #ifndef _watchdog_h_
 #define _watchdog_h_
 //============================================================
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index c73ded1690c..2eff0ad3d48 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  window.c - SDL window handling
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index da9f4d95fc1..e16fdea58b8 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  window.h - SDL window handling
diff --git a/src/osd/strconv.h b/src/osd/strconv.h
index 8e1bd08ae91..5de23d0b89b 100644
--- a/src/osd/strconv.h
+++ b/src/osd/strconv.h
@@ -4,9 +4,6 @@
 //
 //  strconv.h - String conversion
 //
-//  Copyright (c) 1996-2007, Nicola Salmoria and the MAME Team.
-//  Visit http://mamedev.org for licensing and usage restrictions.
-//
 //============================================================
 
 #ifndef __OSD_STRCONV__
diff --git a/src/osd/windows/winfile.h b/src/osd/windows/winfile.h
index a5afab43a58..674a7db6619 100644
--- a/src/osd/windows/winfile.h
+++ b/src/osd/windows/winfile.h
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  winfile.h - File access functions
diff --git a/src/osd/windows/winptty.c b/src/osd/windows/winptty.c
index ef9881d348e..7cba6c32791 100644
--- a/src/osd/windows/winptty.c
+++ b/src/osd/windows/winptty.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
diff --git a/src/osd/windows/winsocket.c b/src/osd/windows/winsocket.c
index 2121b16989e..18a029bdee8 100644
--- a/src/osd/windows/winsocket.c
+++ b/src/osd/windows/winsocket.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 //============================================================
 //
 //  winsocket.c - Windows socket (inet) access functions
diff --git a/src/tools/nltool.c b/src/tools/nltool.c
index b4fa261e0a7..7ec191bce47 100644
--- a/src/tools/nltool.c
+++ b/src/tools/nltool.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     nltool.c
diff --git a/src/tools/romcmp.c b/src/tools/romcmp.c
index 735b22d48c7..731b0dd3410 100644
--- a/src/tools/romcmp.c
+++ b/src/tools/romcmp.c
@@ -1,3 +1,5 @@
+// license:???
+// copyright-holders:???
 /***************************************************************************
 
     romcmp.c
diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c
index f4354a5d234..a6e516b239d 100644
--- a/src/tools/unidasm.c
+++ b/src/tools/unidasm.c
@@ -84,6 +84,7 @@ CPU_DISASSEMBLE( ds5002fp );
 CPU_DISASSEMBLE( dsp16a );
 CPU_DISASSEMBLE( dsp32c );
 CPU_DISASSEMBLE( dsp56k );
+CPU_DISASSEMBLE( e0c6200 );
 CPU_DISASSEMBLE( esrip );
 CPU_DISASSEMBLE( f8 );
 CPU_DISASSEMBLE( g65816_generic );
@@ -231,13 +232,14 @@ static const dasm_table_entry dasm_table[] =
 	{ "dsp16a",     _16le, -1, CPU_DISASSEMBLE_NAME(dsp16a) },
 	{ "dsp32c",     _32le,  0, CPU_DISASSEMBLE_NAME(dsp32c) },
 	{ "dsp56k",     _16le, -1, CPU_DISASSEMBLE_NAME(dsp56k) },
+	{ "e0c6200",    _16be, -1, CPU_DISASSEMBLE_NAME(e0c6200) },
 	{ "esrip",      _64be,  0, CPU_DISASSEMBLE_NAME(esrip) },
 	{ "f8",         _8bit,  0, CPU_DISASSEMBLE_NAME(f8) },
 	{ "g65816",     _8bit,  0, CPU_DISASSEMBLE_NAME(g65816_generic) },
 	{ "h6280",      _8bit,  0, CPU_DISASSEMBLE_NAME(h6280) },
-	//  { "h8",         _16be,  0, CPU_DISASSEMBLE_NAME(h8) },
-	//  { "h8_24",      _16be,  0, CPU_DISASSEMBLE_NAME(h8_24) },
-	//  { "h8_32",      _16be,  0, CPU_DISASSEMBLE_NAME(h8_32) },
+//  { "h8",         _16be,  0, CPU_DISASSEMBLE_NAME(h8) },
+//  { "h8_24",      _16be,  0, CPU_DISASSEMBLE_NAME(h8_24) },
+//  { "h8_32",      _16be,  0, CPU_DISASSEMBLE_NAME(h8_32) },
 	{ "hc11",       _8bit,  0, CPU_DISASSEMBLE_NAME(mb88) },
 	{ "hcd62121",   _16be,  0, CPU_DISASSEMBLE_NAME(hcd62121) },
 	{ "hd61700",    _8bit,  0, CPU_DISASSEMBLE_NAME(hd61700) },
diff --git a/src/ume/dummy.lst b/src/ume/dummy.lst
index a7f56072e22..2a366c9b4cd 100644
--- a/src/ume/dummy.lst
+++ b/src/ume/dummy.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     dummy.lst
diff --git a/src/ume/tiny.lst b/src/ume/tiny.lst
index a9c92b51f4b..7c4857d9cfd 100644
--- a/src/ume/tiny.lst
+++ b/src/ume/tiny.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     ume.lst
diff --git a/src/ume/ume.c b/src/ume/ume.c
index fa61657f7a6..0f79ebb39ab 100644
--- a/src/ume/ume.c
+++ b/src/ume/ume.c
@@ -1,12 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /***************************************************************************
 
     ume.c
 
     Specific (per target) constants
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************/
 #include "emu.h"
 
diff --git a/src/ume/ume.lst b/src/ume/ume.lst
index d641a29ffe9..5ab9d1bcab0 100644
--- a/src/ume/ume.lst
+++ b/src/ume/ume.lst
@@ -1,3 +1,5 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
 /******************************************************************************
 
     ume.lst
diff --git a/src/ume/ume.mak b/src/ume/ume.mak
index d319b666311..9a2cd01c0bd 100644
--- a/src/ume/ume.mak
+++ b/src/ume/ume.mak
@@ -4,9 +4,6 @@
 #
 #   Additional makefile for building UME
 #
-#   Copyright (c) Nicola Salmoria and the MAME Team.
-#   Visit http://mamedev.org for licensing and usage restrictions.
-#
 ###########################################################################
 
 GEN_FOLDERS += $(GENDIR)/mame/layout/ $(GENDIR)/mess/layout/