diff --git a/mediachanger/castorrmc/common/castor1compat.c b/mediachanger/castorrmc/common/castor1compat.c
index dbed82756e3ac97061fb2126ba36eec467c565d8..0ddf49bae967a668d7508e338a42fa68aaeca74c 100644
--- a/mediachanger/castorrmc/common/castor1compat.c
+++ b/mediachanger/castorrmc/common/castor1compat.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      castor1compat.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/common/socket.c b/mediachanger/castorrmc/common/socket.c
index 2e2fee66c5a9d23897f6a988368d1385cf246514..351193c31b16650b5515d4d0ef7c13d613193df1 100644
--- a/mediachanger/castorrmc/common/socket.c
+++ b/mediachanger/castorrmc/common/socket.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      socket.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/common/util.c b/mediachanger/castorrmc/common/util.c
index 9e8c001c0f8d58c4e1816a58d84e1e90c38746ce..bec55700a5cd005f500aaaf7d75fa10011c83b36 100644
--- a/mediachanger/castorrmc/common/util.c
+++ b/mediachanger/castorrmc/common/util.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      util.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/Cdomainname.h b/mediachanger/castorrmc/h/Cdomainname.h
index 3e86794f302513e12b35d2d0fa3df7ba0e316e2f..08b0f14c67b0f4e00169dd0e059d4fd341ab82a5 100644
--- a/mediachanger/castorrmc/h/Cdomainname.h
+++ b/mediachanger/castorrmc/h/Cdomainname.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      Cdomainname.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/net.h b/mediachanger/castorrmc/h/net.h
index 5365c4c133871d535ddc8e438b184ae263e68386..f05ff344761609ebeabe02a37ebb32ef6d1a6d4d 100644
--- a/mediachanger/castorrmc/h/net.h
+++ b/mediachanger/castorrmc/h/net.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      net.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rbtsubr_constants.h b/mediachanger/castorrmc/h/rbtsubr_constants.h
index 8a500cbdd1a1ac27ee891ac6c14acc2fa0b174d4..9cce18c281994db51c59bf83f7a65df4c97f02b2 100644
--- a/mediachanger/castorrmc/h/rbtsubr_constants.h
+++ b/mediachanger/castorrmc/h/rbtsubr_constants.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      rbtsubr_constants.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_find_char.h b/mediachanger/castorrmc/h/rmc_find_char.h
index 9ffe3e9f69faa5aec62ce7692847431695b1e8ab..6d0d874b13c1dd20b3754790867272504b152f3f 100644
--- a/mediachanger/castorrmc/h/rmc_find_char.h
+++ b/mediachanger/castorrmc/h/rmc_find_char.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                h/rmc_find_char.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_get_acs_drive_id.h b/mediachanger/castorrmc/h/rmc_get_acs_drive_id.h
index 2fb938d2167be2e69aabb866a785d7d0d1c7959f..c3e44611b1a16df58afdc036b4bb3a3b8e6c5b11 100644
--- a/mediachanger/castorrmc/h/rmc_get_acs_drive_id.h
+++ b/mediachanger/castorrmc/h/rmc_get_acs_drive_id.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                h/rmc_get_acs_drive_id.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_get_loader_type.h b/mediachanger/castorrmc/h/rmc_get_loader_type.h
index 3aece112dfb18a21e98e868234ff24911799d25e..95d724130e6aaefcdaa0d4738430c32f316a6c52 100644
--- a/mediachanger/castorrmc/h/rmc_get_loader_type.h
+++ b/mediachanger/castorrmc/h/rmc_get_loader_type.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                h/rmc_get_loader_type.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_get_rmc_host_of_drive.h b/mediachanger/castorrmc/h/rmc_get_rmc_host_of_drive.h
index 452468d2487ea4856fe63e2e6392962bd2dfa40d..b56f0a498b0c07cab6df539c7b1750181b5d5cde 100644
--- a/mediachanger/castorrmc/h/rmc_get_rmc_host_of_drive.h
+++ b/mediachanger/castorrmc/h/rmc_get_rmc_host_of_drive.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                h/rmc_get_rmc_host_of_drive.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_procreq.h b/mediachanger/castorrmc/h/rmc_procreq.h
index f753db9aab867eebbba8360be7aa9a580e39a990..3e95da8d9de90f3cac51775dde3d94469ccffcd5 100644
--- a/mediachanger/castorrmc/h/rmc_procreq.h
+++ b/mediachanger/castorrmc/h/rmc_procreq.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      rmc_procreq.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h b/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
index b7f6ac313a04efe9d1e11a506d6a594b012bf2d3..ca9099360982f856d932d510c23ed93dfbf511d7 100644
--- a/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
+++ b/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                      rmc_send_scsi_cmd.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/rmc_smcsubr.h b/mediachanger/castorrmc/h/rmc_smcsubr.h
index bf1bdab494ebc8e2382fe86320c97fd6ff02f572..c99fc26e3fecc346ca42de550624a14b0f7a894f 100644
--- a/mediachanger/castorrmc/h/rmc_smcsubr.h
+++ b/mediachanger/castorrmc/h/rmc_smcsubr.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 h/rmc_smcsubr.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/h/strerror_r_wrapper.h b/mediachanger/castorrmc/h/strerror_r_wrapper.h
index 642430d6a7791c7585299c28b4a9db77e932d0c4..2687c689dbbb916c8c4f9b4e68d439cd2840f7de 100644
--- a/mediachanger/castorrmc/h/strerror_r_wrapper.h
+++ b/mediachanger/castorrmc/h/strerror_r_wrapper.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- *         h/strerror_r_wrapper.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_find_char.c b/mediachanger/castorrmc/rmc/rmc_find_char.c
index c03b4ff049322ecfbf1b87967f12ec134be89450..785e64db8eb6d2cd3a09b570c28db69ed7f132cc 100644
--- a/mediachanger/castorrmc/rmc/rmc_find_char.c
+++ b/mediachanger/castorrmc/rmc/rmc_find_char.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 rmc/rmc_find_char.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_get_acs_drive_id.c b/mediachanger/castorrmc/rmc/rmc_get_acs_drive_id.c
index 0196a8f864442f3b7facfc827268a5c888319a2c..78cb8f8b863c289e39c57953ce7c7d2af6941cdf 100644
--- a/mediachanger/castorrmc/rmc/rmc_get_acs_drive_id.c
+++ b/mediachanger/castorrmc/rmc/rmc_get_acs_drive_id.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 rmc/rmc_get_acs_drive_id.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_get_loader_type.c b/mediachanger/castorrmc/rmc/rmc_get_loader_type.c
index 52a430897fc43abd6d5f55161cdd3c307d3a9d86..7eef8da5054635280f624955768329cd9741611f 100644
--- a/mediachanger/castorrmc/rmc/rmc_get_loader_type.c
+++ b/mediachanger/castorrmc/rmc/rmc_get_loader_type.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                h/rmc_get_loader_type.h
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_get_rmc_host_of_drive.c b/mediachanger/castorrmc/rmc/rmc_get_rmc_host_of_drive.c
index fd86cebb5ffe8e99e3c880ce0aadaefef88c97c0..1c682b0b41c1077ab5e3296ec9cb329e4d12ba63 100644
--- a/mediachanger/castorrmc/rmc/rmc_get_rmc_host_of_drive.c
+++ b/mediachanger/castorrmc/rmc/rmc_get_rmc_host_of_drive.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 rmc/rmc_get_rmc_host_of_drive.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_mnt.c b/mediachanger/castorrmc/rmc/rmc_mnt.c
index 7ce375ea55668f671b3b13d2de183c1d2e693988..884b8283bdb6e80d1e47f431320c559b13252b6d 100644
--- a/mediachanger/castorrmc/rmc/rmc_mnt.c
+++ b/mediachanger/castorrmc/rmc/rmc_mnt.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 rmc/rmc_mnt.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
diff --git a/mediachanger/castorrmc/rmc/rmc_unmnt.c b/mediachanger/castorrmc/rmc/rmc_unmnt.c
index 678e9fbdfb7b940de1af7316966f48bc1108c67c..4b984fe759dae3cab5fbafd838dc6ce91c5f5864 100644
--- a/mediachanger/castorrmc/rmc/rmc_unmnt.c
+++ b/mediachanger/castorrmc/rmc/rmc_unmnt.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- *                 rmc/rmc_unmnt.c
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor