diff --git a/cmdline/bw.c b/cmdline/bw.c
index ff88cd07..cba2595d 100644
--- a/cmdline/bw.c
+++ b/cmdline/bw.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2016 Andrea Mazzoleni
- */
+// Copyright (C) 2016 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/bw.h b/cmdline/bw.h
index 38cfa974..f74a4d97 100644
--- a/cmdline/bw.h
+++ b/cmdline/bw.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2016 Andrea Mazzoleni
- */
+// Copyright (C) 2016 Andrea Mazzoleni
 
 #ifndef __BW_H
 #define __BW_H
diff --git a/cmdline/check.c b/cmdline/check.c
index 3027eb8e..27943b0b 100644
--- a/cmdline/check.c
+++ b/cmdline/check.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/device.c b/cmdline/device.c
index f4c2e75f..8f537d3d 100644
--- a/cmdline/device.c
+++ b/cmdline/device.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2015 Andrea Mazzoleni
- */
+// Copyright (C) 2015 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/dry.c b/cmdline/dry.c
index 9565bb23..22d526a0 100644
--- a/cmdline/dry.c
+++ b/cmdline/dry.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/dup.c b/cmdline/dup.c
index 933e885d..d59f7571 100644
--- a/cmdline/dup.c
+++ b/cmdline/dup.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/elem.c b/cmdline/elem.c
index 6a48c007..f551b929 100644
--- a/cmdline/elem.c
+++ b/cmdline/elem.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/elem.h b/cmdline/elem.h
index 35b04619..9bb08e75 100644
--- a/cmdline/elem.h
+++ b/cmdline/elem.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __ELEM_H
 #define __ELEM_H
diff --git a/cmdline/handle.c b/cmdline/handle.c
index 67fe7b54..e513b6df 100644
--- a/cmdline/handle.c
+++ b/cmdline/handle.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/handle.h b/cmdline/handle.h
index 17bc2e9f..79075d43 100644
--- a/cmdline/handle.h
+++ b/cmdline/handle.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __HANDLE_H
 #define __HANDLE_H
diff --git a/cmdline/import.c b/cmdline/import.c
index c5fc2ca6..36b84621 100644
--- a/cmdline/import.c
+++ b/cmdline/import.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/import.h b/cmdline/import.h
index 3178509c..04689699 100644
--- a/cmdline/import.h
+++ b/cmdline/import.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __IMPORT_H
 #define __IMPORT_H
diff --git a/cmdline/io.c b/cmdline/io.c
index 143cc919..934f4c09 100644
--- a/cmdline/io.c
+++ b/cmdline/io.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2016 Andrea Mazzoleni
- */
+// Copyright (C) 2016 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/io.h b/cmdline/io.h
index 16172b5f..72acf265 100644
--- a/cmdline/io.h
+++ b/cmdline/io.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2016 Andrea Mazzoleni
- */
+// Copyright (C) 2016 Andrea Mazzoleni
 
 #ifndef __IO_H
 #define __IO_H
diff --git a/cmdline/list.c b/cmdline/list.c
index 306ffe40..df7bf6e8 100644
--- a/cmdline/list.c
+++ b/cmdline/list.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/locate.c b/cmdline/locate.c
index d3f58ca9..c3fc42cb 100644
--- a/cmdline/locate.c
+++ b/cmdline/locate.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2026 Andrea Mazzoleni
- */
+// Copyright (C) 2026 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/locate.h b/cmdline/locate.h
index feec8b93..57162559 100644
--- a/cmdline/locate.h
+++ b/cmdline/locate.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2026 Andrea Mazzoleni
- */
+// Copyright (C) 2026 Andrea Mazzoleni
 
 #ifndef __LOCATE_H
 #define __LOCATE_H
diff --git a/cmdline/main.c b/cmdline/main.c
index b4455a67..85c4257b 100644
--- a/cmdline/main.c
+++ b/cmdline/main.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2025 Andrea Mazzoleni
- */
+// Copyright (C) 2025 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/metro.c b/cmdline/metro.c
index 829b8d16..666be2fb 100644
--- a/cmdline/metro.c
+++ b/cmdline/metro.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2019 Andrea Mazzoleni
- */
+// Copyright (C) 2019 Andrea Mazzoleni
 
 /*
  * Derivative work from MetroHash128::Hash
diff --git a/cmdline/mingw.c b/cmdline/mingw.c
index edce632f..7b77aea8 100644
--- a/cmdline/mingw.c
+++ b/cmdline/mingw.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/mingw.h b/cmdline/mingw.h
index ffd52fc2..fb14489a 100644
--- a/cmdline/mingw.h
+++ b/cmdline/mingw.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __PORTABLE_MINGW_H
 #define __PORTABLE_MINGW_H
diff --git a/cmdline/mkstream.c b/cmdline/mkstream.c
index c95fd7dc..fd46f83b 100644
--- a/cmdline/mkstream.c
+++ b/cmdline/mkstream.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2015 Andrea Mazzoleni
- */
+// Copyright (C) 2015 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/mktest.c b/cmdline/mktest.c
index 79337f06..a3fdc914 100644
--- a/cmdline/mktest.c
+++ b/cmdline/mktest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/murmur3.c b/cmdline/murmur3.c
index 145e18b8..3d148268 100644
--- a/cmdline/murmur3.c
+++ b/cmdline/murmur3.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 /*
  * Derivative work from MurmorHash3.cpp revision r136
diff --git a/cmdline/museair.c b/cmdline/museair.c
index 70e6ec35..bd431a1e 100644
--- a/cmdline/museair.c
+++ b/cmdline/museair.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2026 Andrea Mazzoleni
- */
+// Copyright (C) 2026 Andrea Mazzoleni
 
 /*
  * Derivative work from MuseAir 0.4-rc4 in the "Bfast" configuration
diff --git a/cmdline/parity.c b/cmdline/parity.c
index cd3922cd..dd09b06d 100644
--- a/cmdline/parity.c
+++ b/cmdline/parity.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/parity.h b/cmdline/parity.h
index 70e099b0..d80756ec 100644
--- a/cmdline/parity.h
+++ b/cmdline/parity.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __PARITY_H
 #define __PARITY_H
diff --git a/cmdline/pool.c b/cmdline/pool.c
index 4e929586..7167f100 100644
--- a/cmdline/pool.c
+++ b/cmdline/pool.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/portable.h b/cmdline/portable.h
index de9dd914..35f16b49 100644
--- a/cmdline/portable.h
+++ b/cmdline/portable.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __PORTABLE_H
 #define __PORTABLE_H
diff --git a/cmdline/rehash.c b/cmdline/rehash.c
index 540eb2d2..5770dc34 100644
--- a/cmdline/rehash.c
+++ b/cmdline/rehash.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/scan.c b/cmdline/scan.c
index 1b53232a..4bec861e 100644
--- a/cmdline/scan.c
+++ b/cmdline/scan.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/scrub.c b/cmdline/scrub.c
index 165250e8..78b01a73 100644
--- a/cmdline/scrub.c
+++ b/cmdline/scrub.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/search.c b/cmdline/search.c
index da2acf8d..363af064 100644
--- a/cmdline/search.c
+++ b/cmdline/search.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2014 Andrea Mazzoleni
- */
+// Copyright (C) 2014 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/search.h b/cmdline/search.h
index 20b8143c..6eb8d62c 100644
--- a/cmdline/search.h
+++ b/cmdline/search.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2014 Andrea Mazzoleni
- */
+// Copyright (C) 2014 Andrea Mazzoleni
 
 #ifndef __SEARCH_H
 #define __SEARCH_H
diff --git a/cmdline/selftest.c b/cmdline/selftest.c
index dc6c8571..fe95f5de 100644
--- a/cmdline/selftest.c
+++ b/cmdline/selftest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/snapraid.c b/cmdline/snapraid.c
index 2d4d70c6..f29320ae 100644
--- a/cmdline/snapraid.c
+++ b/cmdline/snapraid.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/snapraid.h b/cmdline/snapraid.h
index f8988cdf..f0f25184 100644
--- a/cmdline/snapraid.h
+++ b/cmdline/snapraid.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __SNAPRAID_H
 #define __SNAPRAID_H
diff --git a/cmdline/speed.c b/cmdline/speed.c
index 97ff53f9..ad0c0b8c 100644
--- a/cmdline/speed.c
+++ b/cmdline/speed.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/spooky2.c b/cmdline/spooky2.c
index e324b58d..db3afa25 100644
--- a/cmdline/spooky2.c
+++ b/cmdline/spooky2.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 /*
  * Derivative work from SpookyV2.cpp/h
diff --git a/cmdline/state.c b/cmdline/state.c
index 701a6f04..953eec81 100644
--- a/cmdline/state.c
+++ b/cmdline/state.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/state.h b/cmdline/state.h
index 9e8bc3ba..677a5198 100644
--- a/cmdline/state.h
+++ b/cmdline/state.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __STATE_H
 #define __STATE_H
diff --git a/cmdline/status.c b/cmdline/status.c
index f72b5d89..8b0c70b6 100644
--- a/cmdline/status.c
+++ b/cmdline/status.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/stream.c b/cmdline/stream.c
index 7b9e4c2e..59c9df55 100644
--- a/cmdline/stream.c
+++ b/cmdline/stream.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/stream.h b/cmdline/stream.h
index 2bfc5aac..ece27409 100644
--- a/cmdline/stream.h
+++ b/cmdline/stream.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __STREAM_H
 #define __STREAM_H
diff --git a/cmdline/support.c b/cmdline/support.c
index 27992ab2..dc75f2de 100644
--- a/cmdline/support.c
+++ b/cmdline/support.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/support.h b/cmdline/support.h
index 2d6cfc32..04622327 100644
--- a/cmdline/support.h
+++ b/cmdline/support.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __SUPPORT_H
 #define __SUPPORT_H
diff --git a/cmdline/sync.c b/cmdline/sync.c
index 7c274e9c..c8d648e6 100644
--- a/cmdline/sync.c
+++ b/cmdline/sync.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/thermal.c b/cmdline/thermal.c
index 9bdff997..f30f90a7 100644
--- a/cmdline/thermal.c
+++ b/cmdline/thermal.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2025 Andrea Mazzoleni
- */
+// Copyright (C) 2025 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/thermal.h b/cmdline/thermal.h
index 124b6977..82fe8f61 100644
--- a/cmdline/thermal.h
+++ b/cmdline/thermal.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2025 Andrea Mazzoleni
- */
+// Copyright (C) 2025 Andrea Mazzoleni
 
 #ifndef __THERMAL_H
 #define __THERMAL_H
diff --git a/cmdline/touch.c b/cmdline/touch.c
index 2e6a0df5..768c74ca 100644
--- a/cmdline/touch.c
+++ b/cmdline/touch.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2014 Andrea Mazzoleni
- */
+// Copyright (C) 2014 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/unix.c b/cmdline/unix.c
index be51b15d..d6920381 100644
--- a/cmdline/unix.c
+++ b/cmdline/unix.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/unix.h b/cmdline/unix.h
index 00387660..6d8d3d0c 100644
--- a/cmdline/unix.h
+++ b/cmdline/unix.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __UNIX_H
 #define __UNIX_H
diff --git a/cmdline/util.c b/cmdline/util.c
index b3dafd1a..6da26f1d 100644
--- a/cmdline/util.c
+++ b/cmdline/util.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #include "portable.h"
 
diff --git a/cmdline/util.h b/cmdline/util.h
index 861992d1..bba6e0a2 100644
--- a/cmdline/util.h
+++ b/cmdline/util.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-/*
- * Copyright (C) 2011 Andrea Mazzoleni
- */
+// Copyright (C) 2011 Andrea Mazzoleni
 
 #ifndef __UTIL_H
 #define __UTIL_H
diff --git a/raid/check.c b/raid/check.c
index d7f652fd..4f98713f 100644
--- a/raid/check.c
+++ b/raid/check.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2015 Andrea Mazzoleni
- */
+// Copyright (C) 2015 Andrea Mazzoleni
 
 #include "internal.h"
 #include "combo.h"
diff --git a/raid/combo.h b/raid/combo.h
index 7c7228a6..767dfb66 100644
--- a/raid/combo.h
+++ b/raid/combo.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_COMBO_H
 #define __RAID_COMBO_H
diff --git a/raid/cpu.h b/raid/cpu.h
index 2185e7d7..3951e299 100644
--- a/raid/cpu.h
+++ b/raid/cpu.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_CPU_H
 #define __RAID_CPU_H
@@ -109,7 +107,7 @@ static inline int raid_cpu_match_avx(uint32_t cpuid_1_ecx, uint32_t cpuid_7_ebx,
 static inline int raid_cpu_has_sse2(void)
 {
 	/*
-	 * Intel® 64 and IA-32 Architectures Software Developer's Manual
+	 * Intel 64 and IA-32 Architectures Software Developer's Manual
 	 * 325462-048US September 2013
 	 *
 	 * 11.6.2 Checking for SSE/SSE2 Support
@@ -128,7 +126,7 @@ static inline int raid_cpu_has_sse2(void)
 static inline int raid_cpu_has_ssse3(void)
 {
 	/*
-	 * Intel® 64 and IA-32 Architectures Software Developer's Manual
+	 * Intel 64 and IA-32 Architectures Software Developer's Manual
 	 * 325462-048US September 2013
 	 *
 	 * 12.7.2 Checking for SSSE3 Support
@@ -145,7 +143,7 @@ static inline int raid_cpu_has_ssse3(void)
 static inline int raid_cpu_has_crc32(void)
 {
 	/*
-	 * Intel® 64 and IA-32 Architectures Software Developer's Manual
+	 * Intel 64 and IA-32 Architectures Software Developer's Manual
 	 * 325462-048US September 2013
 	 *
 	 * 12.12.3 Checking for SSE4.2 Support
diff --git a/raid/gf.h b/raid/gf.h
index d89ce48e..e1814566 100644
--- a/raid/gf.h
+++ b/raid/gf.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_GF_H
 #define __RAID_GF_H
diff --git a/raid/helper.c b/raid/helper.c
index e793ba9b..9651904e 100644
--- a/raid/helper.c
+++ b/raid/helper.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 
diff --git a/raid/helper.h b/raid/helper.h
index 8dc2cc51..d5e9f183 100644
--- a/raid/helper.h
+++ b/raid/helper.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_HELPER_H
 #define __RAID_HELPER_H
diff --git a/raid/int.c b/raid/int.c
index aae93c9c..3bee4704 100644
--- a/raid/int.c
+++ b/raid/int.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "gf.h"
diff --git a/raid/internal.h b/raid/internal.h
index 5e2d4ca0..3825b7d0 100644
--- a/raid/internal.h
+++ b/raid/internal.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_INTERNAL_H
 #define __RAID_INTERNAL_H
diff --git a/raid/intz.c b/raid/intz.c
index 943f9b3b..e3c222d4 100644
--- a/raid/intz.c
+++ b/raid/intz.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "gf.h"
diff --git a/raid/memory.c b/raid/memory.c
index 5660ce68..e8c4cce6 100644
--- a/raid/memory.c
+++ b/raid/memory.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "memory.h"
diff --git a/raid/memory.h b/raid/memory.h
index b86ee322..c99ff554 100644
--- a/raid/memory.h
+++ b/raid/memory.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_MEMORY_H
 #define __RAID_MEMORY_H
diff --git a/raid/mktables.c b/raid/mktables.c
index 3d5d7c3a..a4f512b2 100644
--- a/raid/mktables.c
+++ b/raid/mktables.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/raid/module.c b/raid/module.c
index 75e3df2b..18cc7f2c 100644
--- a/raid/module.c
+++ b/raid/module.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "memory.h"
diff --git a/raid/raid.c b/raid/raid.c
index dfa3f31e..c72afcc0 100644
--- a/raid/raid.c
+++ b/raid/raid.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "gf.h"
diff --git a/raid/raid.h b/raid/raid.h
index 2ee3ab96..8068b70c 100644
--- a/raid/raid.h
+++ b/raid/raid.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_H
 #define __RAID_H
diff --git a/raid/tables.c b/raid/tables.c
index 3a65b240..b9d50220 100644
--- a/raid/tables.c
+++ b/raid/tables.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 
diff --git a/raid/tag.c b/raid/tag.c
index e64f6798..82dbfdba 100644
--- a/raid/tag.c
+++ b/raid/tag.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 
diff --git a/raid/test.c b/raid/test.c
index 8dbbc59e..93a76c4f 100644
--- a/raid/test.c
+++ b/raid/test.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"
 #include "cpu.h"
diff --git a/raid/test.h b/raid/test.h
index 5ee73236..4908ccf4 100644
--- a/raid/test.h
+++ b/raid/test.h
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #ifndef __RAID_TEST_H
 #define __RAID_TEST_H
diff --git a/raid/test/fulltest.c b/raid/test/fulltest.c
index 1aa14864..58081fff 100644
--- a/raid/test/fulltest.c
+++ b/raid/test/fulltest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 /* Full sanity test for the RAID library */
 
diff --git a/raid/test/invtest.c b/raid/test/invtest.c
index ed7616b8..c1bd561a 100644
--- a/raid/test/invtest.c
+++ b/raid/test/invtest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 /* Matrix inversion test for the RAID library */
 
diff --git a/raid/test/selftest.c b/raid/test/selftest.c
index b5f24726..59aa9d9f 100644
--- a/raid/test/selftest.c
+++ b/raid/test/selftest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 /* Self-test for the RAID library */
 
diff --git a/raid/test/speedtest.c b/raid/test/speedtest.c
index cb30c2bc..add52d21 100644
--- a/raid/test/speedtest.c
+++ b/raid/test/speedtest.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 /* Speed test for the RAID library */
 
diff --git a/raid/x86z.c b/raid/x86z.c
index 1d14caae..084479a3 100644
--- a/raid/x86z.c
+++ b/raid/x86z.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2013 Andrea Mazzoleni
- */
+// Copyright (C) 2013 Andrea Mazzoleni
 
 #include "internal.h"