diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c
index c7f8b066ef5..4236521a9cc 100644
--- a/src/mess/drivers/rmnimbus.c
+++ b/src/mess/drivers/rmnimbus.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phill Harvey-Smith
+// copyright-holders:Phill Harvey-Smith, Carl
 /*
     drivers/rmnimbus.c
 
diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h
index 220200ade56..ad60c23ddf5 100644
--- a/src/mess/includes/apple1.h
+++ b/src/mess/includes/apple1.h
@@ -1,4 +1,4 @@
-// license:???
+// license:BSD-3-Clause
 // copyright-holders:Paul Daniels, Colin Howell, R. Belmont
 /*****************************************************************************
  *
diff --git a/src/mess/includes/apricotp.h b/src/mess/includes/apricotp.h
index 697319eb8bd..9014954305d 100644
--- a/src/mess/includes/apricotp.h
+++ b/src/mess/includes/apricotp.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:LGPL-2.1+
 // copyright-holders:Angelo Salese, Dirk Best
 #pragma once
 
diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h
index 85917aff2e8..952844a2022 100644
--- a/src/mess/includes/intv.h
+++ b/src/mess/includes/intv.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Nathan Woods
+// copyright-holders:Nathan Woods,Frank Palazzolo
 /*****************************************************************************
  *
  * includes/intv.h
diff --git a/src/mess/includes/phc25.h b/src/mess/includes/phc25.h
index 649bbf548ed..482a543b83b 100644
--- a/src/mess/includes/phc25.h
+++ b/src/mess/includes/phc25.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Curt Coder
+// copyright-holders:Curt Coder, Robbbert
 #pragma once
 
 #ifndef __PHC25__
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h
index 60d2bb5abfe..c857b808842 100644
--- a/src/mess/includes/rmnimbus.h
+++ b/src/mess/includes/rmnimbus.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phill Harvey-Smith,Carl
+// copyright-holders:Phill Harvey-Smith, Carl
 /*
     rmnimbus.c
     Machine driver for the Research Machines Nimbus.
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index dc44f6904cf..b9d34c61d91 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Barry Rodewald,Carl
 /*****************************************************************************
  *
  * includes/x68k.h
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index bff15fe8ccc..8df76e3de4a 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:R. Belmont, Nathan Woods
+// copyright-holders:Nathan Woods,R. Belmont
 /***************************************************************************
 
     machine/apple3.c
diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c
index fa8e0c0eb7b..391abbd4150 100644
--- a/src/mess/machine/intv.c
+++ b/src/mess/machine/intv.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Nathan Woods
+// copyright-holders:Nathan Woods,Frank Palazzolo
 #include "emu.h"
 #include "video/stic.h"
 #include "includes/intv.h"
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index 2d738a7221a..8e2bc8c02f3 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -1,5 +1,5 @@
 // license:GPL-2.0+
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, Robbbert
 /***************************************************************************
 
     microbee.c
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index fae0d92944a..a256bcea123 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phill Harvey-Smith,Carl
+// copyright-holders:Phill Harvey-Smith, Carl
 /*
     machine/rmnimbus.c
 
diff --git a/src/mess/machine/zx.c b/src/mess/machine/zx.c
index cc7de508c30..be1e1ed246c 100644
--- a/src/mess/machine/zx.c
+++ b/src/mess/machine/zx.c
@@ -1,5 +1,5 @@
 // license:GPL-2.0+
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, Krzysztof Strzecha, Robbbert
 /***************************************************************************
     zx.c
 
diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c
index dd9ed734b0b..e733199bd87 100644
--- a/src/mess/video/apple3.c
+++ b/src/mess/video/apple3.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:R. Belmont, Nathan Woods
+// copyright-holders:Nathan Woods,R. Belmont
 /***************************************************************************
 
     video/apple3.c
diff --git a/src/mess/video/intv.c b/src/mess/video/intv.c
index 968580089f4..42c12b743a8 100644
--- a/src/mess/video/intv.c
+++ b/src/mess/video/intv.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Nathan Woods
+// copyright-holders:Nathan Woods,Frank Palazzolo
 #include "emu.h"
 #include "includes/intv.h"
 
diff --git a/src/mess/video/mbee.c b/src/mess/video/mbee.c
index 479f7175656..0216858344d 100644
--- a/src/mess/video/mbee.c
+++ b/src/mess/video/mbee.c
@@ -1,5 +1,5 @@
 // license:GPL-2.0+
-// copyright-holders:Juergen Buchmueller,Robbbert
+// copyright-holders:Juergen Buchmueller, Robbbert
 /***************************************************************************
     microbee.c
 
diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c
index 632cddb37fb..b3f08dad1a3 100644
--- a/src/mess/video/mz700.c
+++ b/src/mess/video/mz700.c
@@ -1,5 +1,5 @@
 // license:GPL-2.0+
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, Dirk Best
 /***************************************************************************
  *  Sharp MZ700
  *
diff --git a/src/mess/video/zx.c b/src/mess/video/zx.c
index 8aefc22020e..8948a395246 100644
--- a/src/mess/video/zx.c
+++ b/src/mess/video/zx.c
@@ -1,5 +1,5 @@
 // license:GPL-2.0+
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, Krzysztof Strzecha, Robbbert
 /***************************************************************************
     zx.c