diff --git a/cpumf/autocompletion_generator_host.c b/cpumf/autocompletion_generator_host.c
index b7c48aaf..4cd3142a 100644
--- a/cpumf/autocompletion_generator_host.c
+++ b/cpumf/autocompletion_generator_host.c
@@ -1,11 +1,7 @@
-// SPDX-License-Identifier: MIT
 /*
- * Autocompletion generation - for cpumf family of tools
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #include "lib/util_autocomp.h"
diff --git a/cpumf/chcpumf_cli.h b/cpumf/chcpumf_cli.h
index 4f485c67..c72e2a30 100644
--- a/cpumf/chcpumf_cli.h
+++ b/cpumf/chcpumf_cli.h
@@ -1,11 +1,7 @@
-/* SPDX-License-Identifier: MIT */
 /*
- * Command line utilities - for chcpumf
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #ifndef CHCPUMF_CLI_H
diff --git a/cpumf/lscpumf_cli.h b/cpumf/lscpumf_cli.h
index eaa0aedc..c1f160b4 100644
--- a/cpumf/lscpumf_cli.h
+++ b/cpumf/lscpumf_cli.h
@@ -1,11 +1,7 @@
-/* SPDX-License-Identifier: MIT */
 /*
- * Command line utilities - for lscpumf
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #ifndef LSCPUMF_CLI_H
diff --git a/cpumf/lshwc_cli.h b/cpumf/lshwc_cli.h
index f079e608..2250b562 100644
--- a/cpumf/lshwc_cli.h
+++ b/cpumf/lshwc_cli.h
@@ -1,11 +1,7 @@
-/* SPDX-License-Identifier: MIT */
 /*
- * Command line utilities - for lshwc
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #ifndef LSHWC_CLI_H
diff --git a/cpumf/lspai_cli.h b/cpumf/lspai_cli.h
index 37ffaf84..a4912f64 100644
--- a/cpumf/lspai_cli.h
+++ b/cpumf/lspai_cli.h
@@ -1,11 +1,7 @@
-/* SPDX-License-Identifier: MIT */
 /*
- * Command line utilities - for lspai
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #ifndef LSPAI_CLI_H
diff --git a/cpumf/pai_cli.h b/cpumf/pai_cli.h
index 278229d3..5170fa77 100644
--- a/cpumf/pai_cli.h
+++ b/cpumf/pai_cli.h
@@ -1,11 +1,7 @@
-/* SPDX-License-Identifier: MIT */
 /*
- * Command line utilities - for pai
+ * SPDX-License-Identifier: MIT
  *
- * Copyright IBM Corp. 2025
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
+ * Copyright IBM Corp.
  */
 
 #ifndef PAI_CLI_H