diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c
index 1c4520d62c1..bf3c2745016 100644
--- a/src/mess/audio/dave.c
+++ b/src/mess/audio/dave.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
 /**********************************************************************
 
     Intelligent Designs DAVE emulation
diff --git a/src/mess/audio/dave.h b/src/mess/audio/dave.h
index 8dfe910ea12..6c3dc24db4f 100644
--- a/src/mess/audio/dave.h
+++ b/src/mess/audio/dave.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
 /**********************************************************************
 
     Intelligent Designs DAVE emulation
diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c
index 85b95885adc..bf20a36202e 100644
--- a/src/mess/drivers/megadriv.c
+++ b/src/mess/drivers/megadriv.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
 
 #include "emu.h"
 #include "includes/md_cons.h"
diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h
index 483bf7ff8c6..b9d90b3dad5 100644
--- a/src/mess/includes/coco.h
+++ b/src/mess/includes/coco.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
 /***************************************************************************
 
     coco.h
diff --git a/src/mess/includes/dgnalpha.h b/src/mess/includes/dgnalpha.h
index 51bca54532a..50ed8a19885 100644
--- a/src/mess/includes/dgnalpha.h
+++ b/src/mess/includes/dgnalpha.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
 /***************************************************************************
 
     dgnalpha.h
diff --git a/src/mess/includes/mboard.h b/src/mess/includes/mboard.h
index 08d40cd6953..3238a231f98 100644
--- a/src/mess/includes/mboard.h
+++ b/src/mess/includes/mboard.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Ralf Schaefer
 /**********************************************************************
 
      Mephisto Chess Computers
diff --git a/src/mess/includes/md_cons.h b/src/mess/includes/md_cons.h
index b13286d2f5a..b2904a4134a 100644
--- a/src/mess/includes/md_cons.h
+++ b/src/mess/includes/md_cons.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
 
 #include "includes/megadriv.h"
 #include "bus/megadrive/md_slot.h"
diff --git a/src/mess/includes/pc1251.h b/src/mess/includes/pc1251.h
index ca884a2dc6d..d03a4524bf5 100644
--- a/src/mess/includes/pc1251.h
+++ b/src/mess/includes/pc1251.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 /*****************************************************************************
  *
  * includes/pc1251.h
diff --git a/src/mess/includes/pc1350.h b/src/mess/includes/pc1350.h
index c6ae7eadbc4..b50758c5917 100644
--- a/src/mess/includes/pc1350.h
+++ b/src/mess/includes/pc1350.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 /*****************************************************************************
  *
  * includes/pc1350.h
diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h
index 53e90fb4b6c..00797e2fe17 100644
--- a/src/mess/includes/pc1401.h
+++ b/src/mess/includes/pc1401.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 /*****************************************************************************
  *
  * includes/pc1401.h
diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h
index f2502ea95be..d40b2bb2bce 100644
--- a/src/mess/includes/pc1403.h
+++ b/src/mess/includes/pc1403.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 /*****************************************************************************
  *
  * includes/pc1403.h
diff --git a/src/mess/machine/upd65031.c b/src/mess/machine/upd65031.c
index be883f885eb..e0377d7d20d 100644
--- a/src/mess/machine/upd65031.c
+++ b/src/mess/machine/upd65031.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Sandro Ronco
 /**********************************************************************
 
     NEC uPD65031 'BLINK' emulation
diff --git a/src/mess/machine/upd65031.h b/src/mess/machine/upd65031.h
index 38645446626..75801beb0c4 100644
--- a/src/mess/machine/upd65031.h
+++ b/src/mess/machine/upd65031.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Sandro Ronco
 /**********************************************************************
 
     NEC uPD65031 'BLINK' emulation
diff --git a/src/mess/tools/imgtool/modules/amiga.c b/src/mess/tools/imgtool/modules/amiga.c
index 5b8d3d971e4..9aa23b0d0d2 100644
--- a/src/mess/tools/imgtool/modules/amiga.c
+++ b/src/mess/tools/imgtool/modules/amiga.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /****************************************************************************
 
     amiga.c
diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c
index f72d01df7de..ce4bbff8c6d 100644
--- a/src/mess/tools/imgtool/modules/fat.c
+++ b/src/mess/tools/imgtool/modules/fat.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /****************************************************************************
 
     fat.c
diff --git a/src/mess/tools/imgtool/modules/fat.h b/src/mess/tools/imgtool/modules/fat.h
index a2088f49b86..b46ad77a357 100644
--- a/src/mess/tools/imgtool/modules/fat.h
+++ b/src/mess/tools/imgtool/modules/fat.h
@@ -1,3 +1,3 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 void fat_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinfo *info);
diff --git a/src/mess/tools/imgtool/modules/pc_flop.c b/src/mess/tools/imgtool/modules/pc_flop.c
index 9e85f912645..d7d498ef829 100644
--- a/src/mess/tools/imgtool/modules/pc_flop.c
+++ b/src/mess/tools/imgtool/modules/pc_flop.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /****************************************************************************
 
     pc_flop.c
diff --git a/src/mess/tools/imgtool/modules/pc_hard.c b/src/mess/tools/imgtool/modules/pc_hard.c
index 5130163932d..9d3cfb79107 100644
--- a/src/mess/tools/imgtool/modules/pc_hard.c
+++ b/src/mess/tools/imgtool/modules/pc_hard.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /****************************************************************************
 
     pc_hard.c
diff --git a/src/mess/tools/imgtool/modules/prodos.c b/src/mess/tools/imgtool/modules/prodos.c
index 0105e0827e9..1e781759a86 100644
--- a/src/mess/tools/imgtool/modules/prodos.c
+++ b/src/mess/tools/imgtool/modules/prodos.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /****************************************************************************
 
     prodos.c
diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c
index c0529456d3e..5aabc4788be 100644
--- a/src/mess/video/733_asr.c
+++ b/src/mess/video/733_asr.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*
     733 ASR emulation
 
diff --git a/src/mess/video/733_asr.h b/src/mess/video/733_asr.h
index ee5c3fcbd85..323e3f688fe 100644
--- a/src/mess/video/733_asr.h
+++ b/src/mess/video/733_asr.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 
 #define asr733_chr_region ":gfx1"
 
diff --git a/src/mess/video/911_chr.h b/src/mess/video/911_chr.h
index f0ffa218c5e..de41d265a06 100644
--- a/src/mess/video/911_chr.h
+++ b/src/mess/video/911_chr.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*
     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 2c0c3e44c17..cf0e77d2148 100644
--- a/src/mess/video/911_key.h
+++ b/src/mess/video/911_key.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*
     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 0a41c3450f1..3c323cd10fe 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*
     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 e3f7f1f3fb7..3c8bbe02521 100644
--- a/src/mess/video/911_vdt.h
+++ b/src/mess/video/911_vdt.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 
 #include "sound/beep.h"
 
diff --git a/src/mess/video/apple2.h b/src/mess/video/apple2.h
index b1bb5612f6f..f0df6717578 100644
--- a/src/mess/video/apple2.h
+++ b/src/mess/video/apple2.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
 /*********************************************************************
 
     video/apple2.h  - Video handling for 8-bit Apple IIs
diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c
index 46089dbfdc4..214b88c0078 100644
--- a/src/mess/video/crt.c
+++ b/src/mess/video/crt.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*
     video/crt.c
 
diff --git a/src/mess/video/crt.h b/src/mess/video/crt.h
index e37e8f0bbba..ccca938ad3b 100644
--- a/src/mess/video/crt.h
+++ b/src/mess/video/crt.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Raphael Nabet
 /*************************************************************************
 
     video/crt.h
diff --git a/src/mess/video/gb_lcd.c b/src/mess/video/gb_lcd.c
index f741c2a3397..b46aece5a15 100644
--- a/src/mess/video/gb_lcd.c
+++ b/src/mess/video/gb_lcd.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
 /***************************************************************************
 
   gb_lcd.c
diff --git a/src/mess/video/gb_lcd.h b/src/mess/video/gb_lcd.h
index e02b8003d2c..31bd0c30403 100644
--- a/src/mess/video/gb_lcd.h
+++ b/src/mess/video/gb_lcd.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
 /*****************************************************************************
  *
  * video/gb_lcd.h
diff --git a/src/mess/video/gime.c b/src/mess/video/gime.c
index 402fb9c4008..93e06b149eb 100644
--- a/src/mess/video/gime.c
+++ b/src/mess/video/gime.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
 /*********************************************************************
 
     gime.c
diff --git a/src/mess/video/gime.h b/src/mess/video/gime.h
index 5eab3ac8571..862dfeec3b0 100644
--- a/src/mess/video/gime.h
+++ b/src/mess/video/gime.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
 /*********************************************************************
 
     gime.h
diff --git a/src/mess/video/hec2video.c b/src/mess/video/hec2video.c
index 06f33311faf..f82fbcc2b97 100644
--- a/src/mess/video/hec2video.c
+++ b/src/mess/video/hec2video.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:JJ Stacino
 /////////////////////////////////////////////////////////////////////////////////
 ///// Hector video
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mess/video/k1ge.h b/src/mess/video/k1ge.h
index a3eaa7fe753..6ecb2e771bc 100644
--- a/src/mess/video/k1ge.h
+++ b/src/mess/video/k1ge.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
 /******************************************************************************
 
   K1GE/K2GE graphics emulation
diff --git a/src/mess/video/maria.c b/src/mess/video/maria.c
index 5deb21df5db..4542acefc59 100644
--- a/src/mess/video/maria.c
+++ b/src/mess/video/maria.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Dan Boris
 /***************************************************************************
 
   Atari MARIA video emulation
diff --git a/src/mess/video/maria.h b/src/mess/video/maria.h
index 64e2e986540..8e91354cb06 100644
--- a/src/mess/video/maria.h
+++ b/src/mess/video/maria.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Dan Boris
 #ifndef __ATARI_MARIA__
 #define __ATARI_MARIA__
 
diff --git a/src/mess/video/newport.c b/src/mess/video/newport.c
index 867eaf00a73..8d331fbb60f 100644
--- a/src/mess/video/newport.c
+++ b/src/mess/video/newport.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
 /*
     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 5bc8679019a..16ee86065fb 100644
--- a/src/mess/video/newport.h
+++ b/src/mess/video/newport.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
 /*
     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 e601a9b2b2e..6541008c5a7 100644
--- a/src/mess/video/nick.c
+++ b/src/mess/video/nick.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
 /**********************************************************************
 
     Intelligent Designs NICK emulation
diff --git a/src/mess/video/nick.h b/src/mess/video/nick.h
index 3959179967a..4cb21be87a5 100644
--- a/src/mess/video/nick.h
+++ b/src/mess/video/nick.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
 /**********************************************************************
 
     Intelligent Designs NICK emulation
diff --git a/src/mess/video/p2000m.c b/src/mess/video/p2000m.c
index 8abc69892a9..a75a994fe28 100644
--- a/src/mess/video/p2000m.c
+++ b/src/mess/video/p2000m.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:???
+// copyright-holders:Paul Daniels
 /**********************************************************************
 
     p2000m.c
diff --git a/src/mess/video/pc1251.c b/src/mess/video/pc1251.c
index 161276bd432..c891306600f 100644
--- a/src/mess/video/pc1251.c
+++ b/src/mess/video/pc1251.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1350.c b/src/mess/video/pc1350.c
index 3e40fb0ece9..0804f75ed7c 100644
--- a/src/mess/video/pc1350.c
+++ b/src/mess/video/pc1350.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1401.c b/src/mess/video/pc1401.c
index 7a957c620f2..d7663dce91b 100644
--- a/src/mess/video/pc1401.c
+++ b/src/mess/video/pc1401.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 #include "emu.h"
 
 #include "includes/pocketc.h"
diff --git a/src/mess/video/pc1403.c b/src/mess/video/pc1403.c
index 79a41aea3de..ebb3f0b68f3 100644
--- a/src/mess/video/pc1403.c
+++ b/src/mess/video/pc1403.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:GPL-2.0+
+// copyright-holders:Peter Trauner
 /*****************************************************************************
  *
  *   pc1403.c
diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c
index 8639917ccf2..e77c5339bd0 100644
--- a/src/mess/video/pc_t1t.c
+++ b/src/mess/video/pc_t1t.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
 /***************************************************************************
 
     IBM PC junior
diff --git a/src/mess/video/pc_t1t.h b/src/mess/video/pc_t1t.h
index 23927d1553e..3c89cbc0b0f 100644
--- a/src/mess/video/pc_t1t.h
+++ b/src/mess/video/pc_t1t.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
 #ifndef PC_T1T_H
 #define PC_T1T_H
 
diff --git a/src/mess/video/poisk1.h b/src/mess/video/poisk1.h
index 27ce0039a26..092de267b1e 100644
--- a/src/mess/video/poisk1.h
+++ b/src/mess/video/poisk1.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Sergey Svishchev
 #include "emu.h"
 
 #define CGA_PALETTE_SETS 83