summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-04-13 15:01:40 +1000
committer Vas Crabb <vas@vastheman.com>2020-04-13 15:01:40 +1000
commitd10ba2b97a37cce242a4fee4839cde8e68cd0391 (patch)
tree4cda34172b3592970b2f822aea42f53c4166dcfb
parent4590736ee97e4d9a539188fc00f9636b6b6526bd (diff)
With permission from Dirk Best, apply 3-clause BSD license to common devices and image handling (nw)
Note that this does not apply to machine drivers or device implementations for a single machine family (e.g. Amiga chips or VTech expansion bus)
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp4
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.h4
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.h2
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_lx800.h2
-rw-r--r--src/devices/cpu/i8089/i8089_dasm.cpp2
-rw-r--r--src/devices/cpu/i8089/i8089_dasm.h2
-rw-r--r--src/devices/machine/74145.cpp2
-rw-r--r--src/devices/machine/74145.h2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cr511b.h2
-rw-r--r--src/devices/machine/cs4031.cpp2
-rw-r--r--src/devices/machine/cs4031.h2
-rw-r--r--src/devices/machine/e05a03.cpp2
-rw-r--r--src/devices/machine/e05a03.h2
-rw-r--r--src/devices/machine/ins8154.cpp2
-rw-r--r--src/devices/machine/ins8154.h2
-rw-r--r--src/devices/machine/wd1010.cpp2
-rw-r--r--src/devices/machine/wd1010.h2
-rw-r--r--src/devices/sound/dac76.cpp4
-rw-r--r--src/devices/sound/dac76.h4
-rw-r--r--src/devices/sound/mm5837.cpp4
-rw-r--r--src/devices/sound/mm5837.h4
-rw-r--r--src/devices/video/dl1416.cpp2
-rw-r--r--src/devices/video/dl1416.h2
-rw-r--r--src/devices/video/ef9369.cpp2
-rw-r--r--src/devices/video/ef9369.h2
-rw-r--r--src/devices/video/i82730.cpp2
-rw-r--r--src/devices/video/i82730.h2
-rw-r--r--src/devices/video/tea1002.cpp2
-rw-r--r--src/devices/video/tea1002.h2
-rw-r--r--src/lib/formats/2d_dsk.cpp2
-rw-r--r--src/lib/formats/2d_dsk.h2
-rw-r--r--src/lib/formats/apridisk.cpp3
-rw-r--r--src/lib/formats/apridisk.h2
-rw-r--r--src/lib/formats/cd90_640_dsk.cpp2
-rw-r--r--src/lib/formats/cd90_640_dsk.h2
-rw-r--r--src/lib/formats/cgenie_dsk.cpp2
-rw-r--r--src/lib/formats/cgenie_dsk.h2
-rw-r--r--src/lib/formats/guab_dsk.cpp2
-rw-r--r--src/lib/formats/guab_dsk.h2
-rw-r--r--src/lib/formats/hector_minidisc.cpp2
-rw-r--r--src/lib/formats/hector_minidisc.h2
-rw-r--r--src/lib/formats/jvc_dsk.cpp2
-rw-r--r--src/lib/formats/jvc_dsk.h2
-rw-r--r--src/lib/formats/nascom_dsk.cpp2
-rw-r--r--src/lib/formats/nascom_dsk.h2
-rw-r--r--src/lib/formats/pk8020_dsk.cpp2
-rw-r--r--src/lib/formats/pk8020_dsk.h2
-rw-r--r--src/lib/formats/svi_dsk.cpp2
-rw-r--r--src/lib/formats/svi_dsk.h2
-rw-r--r--src/lib/formats/trs80_dsk.cpp2
-rw-r--r--src/lib/formats/trs80_dsk.h2
-rw-r--r--src/lib/formats/vdk_dsk.cpp2
-rw-r--r--src/lib/formats/vdk_dsk.h2
-rw-r--r--src/lib/formats/vector06_dsk.cpp2
-rw-r--r--src/lib/formats/vector06_dsk.h2
-rw-r--r--src/lib/util/hashing.cpp1
-rw-r--r--src/tools/imgtool/modules/amiga.cpp2
-rw-r--r--src/tools/imgtool/modules/vzdos.cpp2
61 files changed, 66 insertions, 68 deletions
diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp
index 4e0bed0650e..141998a15fa 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.cpp
+++ b/src/devices/bus/amiga/keyboard/keyboard.cpp
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
Amiga Keyboard Interface
diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h
index fef26d40388..ce11d82ba32 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.h
+++ b/src/devices/bus/amiga/keyboard/keyboard.h
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
Amiga Keyboard Interface
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 5c978d49172..1ec3dccb338 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/******************************************************************************
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index 372f30eb660..f1f74002820 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 3dde6e8b916..32988311b3b 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
index e9c86b59105..86e71838c97 100644
--- a/src/devices/bus/centronics/epson_lx800.h
+++ b/src/devices/bus/centronics/epson_lx800.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
diff --git a/src/devices/cpu/i8089/i8089_dasm.cpp b/src/devices/cpu/i8089/i8089_dasm.cpp
index ad8b9d5705e..35e873dd461 100644
--- a/src/devices/cpu/i8089/i8089_dasm.cpp
+++ b/src/devices/cpu/i8089/i8089_dasm.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/cpu/i8089/i8089_dasm.h b/src/devices/cpu/i8089/i8089_dasm.h
index a8a7c2115a5..de699f7fb5d 100644
--- a/src/devices/cpu/i8089/i8089_dasm.h
+++ b/src/devices/cpu/i8089/i8089_dasm.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp
index 8e3250800b1..1ac1a41ffa6 100644
--- a/src/devices/machine/74145.cpp
+++ b/src/devices/machine/74145.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/*****************************************************************************
*
diff --git a/src/devices/machine/74145.h b/src/devices/machine/74145.h
index 402b7fedf63..f5965cea4b1 100644
--- a/src/devices/machine/74145.h
+++ b/src/devices/machine/74145.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index ea9d772fb92..5ff2decd5d5 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index b3de63c8aa6..ab70be1eb9c 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index 4cc990b43df..4af64f320a1 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h
index 3e554e91904..21cb09f2eb0 100644
--- a/src/devices/machine/cs4031.h
+++ b/src/devices/machine/cs4031.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index 2ccf97f026b..66a2a6785cc 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h
index 10022d6814b..4748bb3a84b 100644
--- a/src/devices/machine/e05a03.h
+++ b/src/devices/machine/e05a03.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp
index 11943cdee2c..0ce0dbd11d8 100644
--- a/src/devices/machine/ins8154.cpp
+++ b/src/devices/machine/ins8154.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/******************************************************************************
diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h
index 2ce40ec9e70..b4013c0876d 100644
--- a/src/devices/machine/ins8154.h
+++ b/src/devices/machine/ins8154.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/wd1010.cpp b/src/devices/machine/wd1010.cpp
index c845c52fc11..96fb4b5fdd0 100644
--- a/src/devices/machine/wd1010.cpp
+++ b/src/devices/machine/wd1010.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/machine/wd1010.h b/src/devices/machine/wd1010.h
index 3d734af1563..b6a637c99e9 100644
--- a/src/devices/machine/wd1010.h
+++ b/src/devices/machine/wd1010.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/sound/dac76.cpp b/src/devices/sound/dac76.cpp
index 388ccb7f2b0..846ae2306bd 100644
--- a/src/devices/sound/dac76.cpp
+++ b/src/devices/sound/dac76.cpp
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
PMI DAC-76 COMDAC
diff --git a/src/devices/sound/dac76.h b/src/devices/sound/dac76.h
index c9a78c51a19..f986b319917 100644
--- a/src/devices/sound/dac76.h
+++ b/src/devices/sound/dac76.h
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
PMI DAC-76 COMDAC
diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp
index ac48a540194..7b59758fdcd 100644
--- a/src/devices/sound/mm5837.cpp
+++ b/src/devices/sound/mm5837.cpp
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
National Semiconductor MM5837
diff --git a/src/devices/sound/mm5837.h b/src/devices/sound/mm5837.h
index ff65ed8a36c..8c7f8287db6 100644
--- a/src/devices/sound/mm5837.h
+++ b/src/devices/sound/mm5837.h
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
National Semiconductor MM5837
diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp
index a1ebf53c6a1..2508bb179fb 100644
--- a/src/devices/video/dl1416.cpp
+++ b/src/devices/video/dl1416.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best, Vas Crabb
/*****************************************************************************
*
diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h
index bf26f57f56c..9c4b6228ee3 100644
--- a/src/devices/video/dl1416.h
+++ b/src/devices/video/dl1416.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best, Vas Crabb
/*****************************************************************************
*
diff --git a/src/devices/video/ef9369.cpp b/src/devices/video/ef9369.cpp
index 2e2d9e12229..5f61544cc55 100644
--- a/src/devices/video/ef9369.cpp
+++ b/src/devices/video/ef9369.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/video/ef9369.h b/src/devices/video/ef9369.h
index 7c10d6d1b22..457e47f3264 100644
--- a/src/devices/video/ef9369.h
+++ b/src/devices/video/ef9369.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp
index eeeedd3b4d1..8834f2a0151 100644
--- a/src/devices/video/i82730.cpp
+++ b/src/devices/video/i82730.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h
index 2efc8c0a523..a107e90461b 100644
--- a/src/devices/video/i82730.h
+++ b/src/devices/video/i82730.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp
index 162fa128bfd..af80f9908a3 100644
--- a/src/devices/video/tea1002.cpp
+++ b/src/devices/video/tea1002.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/devices/video/tea1002.h b/src/devices/video/tea1002.h
index 44898c625ac..e208d20fb0a 100644
--- a/src/devices/video/tea1002.h
+++ b/src/devices/video/tea1002.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/2d_dsk.cpp b/src/lib/formats/2d_dsk.cpp
index 7f304b4eaa0..d73791bf45d 100644
--- a/src/lib/formats/2d_dsk.cpp
+++ b/src/lib/formats/2d_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/2d_dsk.h b/src/lib/formats/2d_dsk.h
index b5c1a61c256..1b9fa867630 100644
--- a/src/lib/formats/2d_dsk.h
+++ b/src/lib/formats/2d_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/apridisk.cpp b/src/lib/formats/apridisk.cpp
index a42aa9fa4d4..1eb4ac864b9 100644
--- a/src/lib/formats/apridisk.cpp
+++ b/src/lib/formats/apridisk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
@@ -8,7 +8,6 @@
***************************************************************************/
-#include "emu.h"
#include "imageutl.h"
#include "apridisk.h"
diff --git a/src/lib/formats/apridisk.h b/src/lib/formats/apridisk.h
index 125b71451a5..957ef3aef1c 100644
--- a/src/lib/formats/apridisk.h
+++ b/src/lib/formats/apridisk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/cd90_640_dsk.cpp b/src/lib/formats/cd90_640_dsk.cpp
index 1654d5d8c99..47295687d89 100644
--- a/src/lib/formats/cd90_640_dsk.cpp
+++ b/src/lib/formats/cd90_640_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/cd90_640_dsk.h b/src/lib/formats/cd90_640_dsk.h
index 5324698f498..b4ea030207a 100644
--- a/src/lib/formats/cd90_640_dsk.h
+++ b/src/lib/formats/cd90_640_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/cgenie_dsk.cpp b/src/lib/formats/cgenie_dsk.cpp
index 827830682ec..53686965b31 100644
--- a/src/lib/formats/cgenie_dsk.cpp
+++ b/src/lib/formats/cgenie_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/cgenie_dsk.h b/src/lib/formats/cgenie_dsk.h
index 3bbbccf4762..4dcca24a3be 100644
--- a/src/lib/formats/cgenie_dsk.h
+++ b/src/lib/formats/cgenie_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/guab_dsk.cpp b/src/lib/formats/guab_dsk.cpp
index 4c92362251a..283286c80a5 100644
--- a/src/lib/formats/guab_dsk.cpp
+++ b/src/lib/formats/guab_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/guab_dsk.h b/src/lib/formats/guab_dsk.h
index 771baa2bf75..e2bb97936f4 100644
--- a/src/lib/formats/guab_dsk.h
+++ b/src/lib/formats/guab_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/hector_minidisc.cpp b/src/lib/formats/hector_minidisc.cpp
index fe4a7ee44b1..116d3ba6580 100644
--- a/src/lib/formats/hector_minidisc.cpp
+++ b/src/lib/formats/hector_minidisc.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/hector_minidisc.h b/src/lib/formats/hector_minidisc.h
index a47fbea49d8..bd2a84bd379 100644
--- a/src/lib/formats/hector_minidisc.h
+++ b/src/lib/formats/hector_minidisc.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/jvc_dsk.cpp b/src/lib/formats/jvc_dsk.cpp
index f5de872c672..961329a040f 100644
--- a/src/lib/formats/jvc_dsk.cpp
+++ b/src/lib/formats/jvc_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/jvc_dsk.h b/src/lib/formats/jvc_dsk.h
index cbf1f341cde..da37856bcf6 100644
--- a/src/lib/formats/jvc_dsk.h
+++ b/src/lib/formats/jvc_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/nascom_dsk.cpp b/src/lib/formats/nascom_dsk.cpp
index 258de89c326..6d3bb61395b 100644
--- a/src/lib/formats/nascom_dsk.cpp
+++ b/src/lib/formats/nascom_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/nascom_dsk.h b/src/lib/formats/nascom_dsk.h
index 297cdb536eb..808e97b4441 100644
--- a/src/lib/formats/nascom_dsk.h
+++ b/src/lib/formats/nascom_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/pk8020_dsk.cpp b/src/lib/formats/pk8020_dsk.cpp
index e21fdbdb98e..a3e93ea3df8 100644
--- a/src/lib/formats/pk8020_dsk.cpp
+++ b/src/lib/formats/pk8020_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/pk8020_dsk.h b/src/lib/formats/pk8020_dsk.h
index f6a66a4f797..34e740f3e47 100644
--- a/src/lib/formats/pk8020_dsk.h
+++ b/src/lib/formats/pk8020_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/svi_dsk.cpp b/src/lib/formats/svi_dsk.cpp
index aae08ba329d..2fd168b1dff 100644
--- a/src/lib/formats/svi_dsk.cpp
+++ b/src/lib/formats/svi_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
index bc1487a48fe..c95bc241e21 100644
--- a/src/lib/formats/svi_dsk.h
+++ b/src/lib/formats/svi_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/trs80_dsk.cpp b/src/lib/formats/trs80_dsk.cpp
index 988c253a9b4..7455bf1c3c6 100644
--- a/src/lib/formats/trs80_dsk.cpp
+++ b/src/lib/formats/trs80_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/trs80_dsk.h b/src/lib/formats/trs80_dsk.h
index c5b99a1366b..61547331913 100644
--- a/src/lib/formats/trs80_dsk.h
+++ b/src/lib/formats/trs80_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/vdk_dsk.cpp b/src/lib/formats/vdk_dsk.cpp
index 308f544e2d3..70f417fd2db 100644
--- a/src/lib/formats/vdk_dsk.cpp
+++ b/src/lib/formats/vdk_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/vdk_dsk.h b/src/lib/formats/vdk_dsk.h
index abadc3bf2f6..c68fbd9bfb0 100644
--- a/src/lib/formats/vdk_dsk.h
+++ b/src/lib/formats/vdk_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/vector06_dsk.cpp b/src/lib/formats/vector06_dsk.cpp
index 6601d84e7c7..2cb0b6367c9 100644
--- a/src/lib/formats/vector06_dsk.cpp
+++ b/src/lib/formats/vector06_dsk.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/formats/vector06_dsk.h b/src/lib/formats/vector06_dsk.h
index a17cacfa04c..b667f123cca 100644
--- a/src/lib/formats/vector06_dsk.h
+++ b/src/lib/formats/vector06_dsk.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/***************************************************************************
diff --git a/src/lib/util/hashing.cpp b/src/lib/util/hashing.cpp
index e554bd731b4..771d3d7b78f 100644
--- a/src/lib/util/hashing.cpp
+++ b/src/lib/util/hashing.cpp
@@ -12,7 +12,6 @@
#include <zlib.h>
-#include <algorithm>
#include <iomanip>
#include <sstream>
diff --git a/src/tools/imgtool/modules/amiga.cpp b/src/tools/imgtool/modules/amiga.cpp
index 91488fb91a5..a840cac5648 100644
--- a/src/tools/imgtool/modules/amiga.cpp
+++ b/src/tools/imgtool/modules/amiga.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/****************************************************************************
diff --git a/src/tools/imgtool/modules/vzdos.cpp b/src/tools/imgtool/modules/vzdos.cpp
index 6a9d5b0c394..c32fe1fc3f6 100644
--- a/src/tools/imgtool/modules/vzdos.cpp
+++ b/src/tools/imgtool/modules/vzdos.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/****************************************************************************