diff --git a/src/emu/bus/isa/com.c b/src/emu/bus/isa/com.c
index c115987c9ff..6d4873009a4 100644
--- a/src/emu/bus/isa/com.c
+++ b/src/emu/bus/isa/com.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Carl
+// copyright-holders:Carl,Miodrag Milanovic
 /***************************************************************************
 
   ISA 8 bit Generic Communication Card
diff --git a/src/emu/bus/isa/com.h b/src/emu/bus/isa/com.h
index a2d13d31e31..0ddd0bb1bc9 100644
--- a/src/emu/bus/isa/com.h
+++ b/src/emu/bus/isa/com.h
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:Carl
+/// license:BSD-3-Clause
+// copyright-holders:Carl,Miodrag Milanovic
 #pragma once
 
 #ifndef __ISA_COM_H__
diff --git a/src/emu/bus/isa/dectalk.c b/src/emu/bus/isa/dectalk.c
index de2b019bd3c..5cd014b7b6e 100644
--- a/src/emu/bus/isa/dectalk.c
+++ b/src/emu/bus/isa/dectalk.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #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 1d7d054ed88..029d41e8263 100644
--- a/src/emu/bus/isa/dectalk.h
+++ b/src/emu/bus/isa/dectalk.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #ifndef ISA_DECTALK_H_
 #define ISA_DECTALK_H_
 
diff --git a/src/emu/bus/isa/ne1000.c b/src/emu/bus/isa/ne1000.c
index 9b6043c7bb3..a62d5e71f8f 100644
--- a/src/emu/bus/isa/ne1000.c
+++ b/src/emu/bus/isa/ne1000.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #include "emu.h"
 #include "ne1000.h"
 
diff --git a/src/emu/bus/isa/ne1000.h b/src/emu/bus/isa/ne1000.h
index 76f1cda964d..c246c70d02f 100644
--- a/src/emu/bus/isa/ne1000.h
+++ b/src/emu/bus/isa/ne1000.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #ifndef __NE1000_H__
 #define __NE1000_H__
 
diff --git a/src/emu/bus/isa/ne2000.c b/src/emu/bus/isa/ne2000.c
index 94e83aefc6a..b635f8e736c 100644
--- a/src/emu/bus/isa/ne2000.c
+++ b/src/emu/bus/isa/ne2000.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #include "emu.h"
 #include "ne2000.h"
 
diff --git a/src/emu/bus/isa/ne2000.h b/src/emu/bus/isa/ne2000.h
index 90a8d5e4792..76a271dadc0 100644
--- a/src/emu/bus/isa/ne2000.h
+++ b/src/emu/bus/isa/ne2000.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #ifndef __NE2000_H__
 #define __NE2000_H__
 
diff --git a/src/emu/bus/isa/num9rev.c b/src/emu/bus/isa/num9rev.c
index 25e04e8880b..8e2216654fd 100644
--- a/src/emu/bus/isa/num9rev.c
+++ b/src/emu/bus/isa/num9rev.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:???
+// copyright-holders:Carl
 // 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 d85d54e7df9..44011ddb9af 100644
--- a/src/emu/bus/isa/num9rev.h
+++ b/src/emu/bus/isa/num9rev.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #pragma once
 
 #ifndef __NUM9REV_H__
diff --git a/src/emu/bus/isa/sb16.c b/src/emu/bus/isa/sb16.c
index 7700ebc40e5..b39195c9557 100644
--- a/src/emu/bus/isa/sb16.c
+++ b/src/emu/bus/isa/sb16.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:???
+// copyright-holders:Carl
 
 // Soundblaster 16 - LLE
 //
diff --git a/src/emu/bus/isa/sb16.h b/src/emu/bus/isa/sb16.h
index a7ae952ab1b..0236f97ea3f 100644
--- a/src/emu/bus/isa/sb16.h
+++ b/src/emu/bus/isa/sb16.h
@@ -1,5 +1,6 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
+
 #ifndef __SB16__
 #define __SB16__
 
diff --git a/src/emu/bus/isa/ssi2001.c b/src/emu/bus/isa/ssi2001.c
index 955798762f2..4a77e870190 100644
--- a/src/emu/bus/isa/ssi2001.c
+++ b/src/emu/bus/isa/ssi2001.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 // Innovation SSI-2001
 
 #include "ssi2001.h"
diff --git a/src/emu/bus/isa/ssi2001.h b/src/emu/bus/isa/ssi2001.h
index f149c445f72..589adac9f0b 100644
--- a/src/emu/bus/isa/ssi2001.h
+++ b/src/emu/bus/isa/ssi2001.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #ifndef __SSI2001__
 #define __SSI2001__
 
diff --git a/src/emu/bus/isa/stereo_fx.c b/src/emu/bus/isa/stereo_fx.c
index db9c8dbec00..4c1f3a37a80 100644
--- a/src/emu/bus/isa/stereo_fx.c
+++ b/src/emu/bus/isa/stereo_fx.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Carl
 // 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 1b4043cec26..d82367cfff9 100644
--- a/src/emu/bus/isa/stereo_fx.h
+++ b/src/emu/bus/isa/stereo_fx.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Carl
 #ifndef __STEREO_FX__
 #define __STEREO_FX__
 
diff --git a/src/emu/bus/pc_joy/pc_joy.c b/src/emu/bus/pc_joy/pc_joy.c
index 1d2020499bd..a8059c2f6da 100644
--- a/src/emu/bus/pc_joy/pc_joy.c
+++ b/src/emu/bus/pc_joy/pc_joy.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 /*************************************************************************
  *
  *      pc_joy.h
diff --git a/src/emu/bus/pc_joy/pc_joy.h b/src/emu/bus/pc_joy/pc_joy.h
index bcc86882ef6..f67e74ff003 100644
--- a/src/emu/bus/pc_joy/pc_joy.h
+++ b/src/emu/bus/pc_joy/pc_joy.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 /*************************************************************************
  *
  *      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 5aad8836f0b..ebfb1af785b 100644
--- a/src/emu/bus/pc_joy/pc_joy_sw.c
+++ b/src/emu/bus/pc_joy/pc_joy_sw.c
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 //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 558507e6ac5..12506ef1f1b 100644
--- a/src/emu/bus/pc_joy/pc_joy_sw.h
+++ b/src/emu/bus/pc_joy/pc_joy_sw.h
@@ -1,5 +1,5 @@
-// license:???
-// copyright-holders:???
+// license:BSD-3-Clause
+// copyright-holders:Carl
 #ifndef PC_JOY_SW_H_
 #define PC_JOY_SW_H_
 
diff --git a/src/emu/bus/psx/analogue.c b/src/emu/bus/psx/analogue.c
index 579d666e6fb..f9896dcd2e5 100644
--- a/src/emu/bus/psx/analogue.c
+++ b/src/emu/bus/psx/analogue.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 #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 abaf41586af..dad5490f944 100644
--- a/src/emu/bus/psx/analogue.h
+++ b/src/emu/bus/psx/analogue.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 #ifndef PSXANALOG_H_
 #define PSXANALOG_H_
 
diff --git a/src/emu/bus/psx/ctlrport.c b/src/emu/bus/psx/ctlrport.c
index b5e5fabba89..09099cb5481 100644
--- a/src/emu/bus/psx/ctlrport.c
+++ b/src/emu/bus/psx/ctlrport.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 /* PAD emulation */
 
 #include "ctlrport.h"
diff --git a/src/emu/bus/psx/ctlrport.h b/src/emu/bus/psx/ctlrport.h
index 27f869273eb..2d02cf31c14 100644
--- a/src/emu/bus/psx/ctlrport.h
+++ b/src/emu/bus/psx/ctlrport.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 #pragma once
 
 #ifndef __PSXCPORT_H__
diff --git a/src/emu/bus/psx/memcard.c b/src/emu/bus/psx/memcard.c
index c0e93d20545..3e0bd047954 100644
--- a/src/emu/bus/psx/memcard.c
+++ b/src/emu/bus/psx/memcard.c
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:etabeta
+// license:???
+// copyright-holders:Carl,psxAuthor,R.Belmont
 /*
     psxcard.c - Sony PlayStation memory card device
 
diff --git a/src/emu/bus/psx/memcard.h b/src/emu/bus/psx/memcard.h
index c342c7c854e..58d1dd1120d 100644
--- a/src/emu/bus/psx/memcard.h
+++ b/src/emu/bus/psx/memcard.h
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:etabeta
+// license:???
+// copyright-holders:Carl,psxAuthor,R.Belmont
 #pragma once
 
 #ifndef _PSXCARD_
diff --git a/src/emu/bus/psx/multitap.c b/src/emu/bus/psx/multitap.c
index 08f9ed9a514..67a794b1f58 100644
--- a/src/emu/bus/psx/multitap.c
+++ b/src/emu/bus/psx/multitap.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 // psx multitap emulation
 
 #include "multitap.h"
diff --git a/src/emu/bus/psx/multitap.h b/src/emu/bus/psx/multitap.h
index ca7dc7edc4e..f968d4e4dc6 100644
--- a/src/emu/bus/psx/multitap.h
+++ b/src/emu/bus/psx/multitap.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:etabeta
+// copyright-holders:Carl
 #ifndef PSXMULTITAP_H_
 #define PSXMULTITAP_H_