diff --git a/LCS/Blob/include/Blob/BlobArray.h b/LCS/Blob/include/Blob/BlobArray.h
index caa631085aca7429534a67bb858493165823358f..e19e8b3e6ad71d18ecaefc6c3c7a31b4300ab80b 100644
--- a/LCS/Blob/include/Blob/BlobArray.h
+++ b/LCS/Blob/include/Blob/BlobArray.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAY_H
 #define LOFAR_COMMON_BLOBARRAY_H
 
-// \file BlobArray
+// \file BlobArray.h
 //Blob handling for arrays.
 
 #include <Common/BlobOStream.h>
diff --git a/LCS/Blob/include/Blob/BlobArrayHeader.h b/LCS/Blob/include/Blob/BlobArrayHeader.h
index 05c2473189c7482394821f261020bcdcd3055773..5e54969031d8b7588608fc414609f9c5aefadee3 100644
--- a/LCS/Blob/include/Blob/BlobArrayHeader.h
+++ b/LCS/Blob/include/Blob/BlobArrayHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAYHEADER_H
 #define LOFAR_COMMON_BLOBARRAYHEADER_H
 
-// \file BlobArrayHeader
+// \file BlobArrayHeader.h
 // Standard array header for a blob.
 
 #include <Common/BlobHeader.h>
diff --git a/LCS/Blob/include/Blob/BlobException.h b/LCS/Blob/include/Blob/BlobException.h
index 2e5117da137a26ea3bd6efcd3d4284e51ff52ea8..c7de17c46bae49c69978ecfd524d27f5db57e7b2 100644
--- a/LCS/Blob/include/Blob/BlobException.h
+++ b/LCS/Blob/include/Blob/BlobException.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBEXCEPTION_H
 #define LOFAR_COMMON_BLOBEXCEPTION_H
 
-// \fileBlobException
+// \fileBlobException.h
 // Blob Exception class. 
 
 //# Includes
diff --git a/LCS/Blob/include/Blob/BlobField.h b/LCS/Blob/include/Blob/BlobField.h
index 1b7bd11dfb3ea767b6a5131cc33d188d0d293e4a..76a44d9e4d40e8719cdd7fc558381fb5ccdfb51a 100644
--- a/LCS/Blob/include/Blob/BlobField.h
+++ b/LCS/Blob/include/Blob/BlobField.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELD_H
 #define LOFAR_COMMON_BLOBFIELD_H
 
-// \file  BlobField
+// \file  BlobField.h
 // Definition of a field in a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobFieldSet.h b/LCS/Blob/include/Blob/BlobFieldSet.h
index f625e5908d4dd7ad0763cc176679cbf43e6ed17c..bb5a74a220b4f5b1c6b45ef50c9603bf5452e6a4 100644
--- a/LCS/Blob/include/Blob/BlobFieldSet.h
+++ b/LCS/Blob/include/Blob/BlobFieldSet.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELDSET_H
 #define LOFAR_COMMON_BLOBFIELDSET_H
 
-// \file BlobFieldSet
+// \file BlobFieldSet.h
 // Definition all fields in a blob.
 
 #include <Common/BlobField.h>
diff --git a/LCS/Blob/include/Blob/BlobHeader.h b/LCS/Blob/include/Blob/BlobHeader.h
index c78fa2351771373c2e2fa771aabd14814e48d210..40f53fbed65ea956df869596361c8776340d5b05 100644
--- a/LCS/Blob/include/Blob/BlobHeader.h
+++ b/LCS/Blob/include/Blob/BlobHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBHEADER_H
 #define LOFAR_COMMON_BLOBHEADER_H
 
-// \file BlobHeader
+// \file BlobHeader.h
 // Standard header for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobIBufChar.h b/LCS/Blob/include/Blob/BlobIBufChar.h
index 0702f37edf910c417434920a492e1b7dc43365bd..465707e47eb4a9d93ab6f12114b26944f070ffaa 100644
--- a/LCS/Blob/include/Blob/BlobIBufChar.h
+++ b/LCS/Blob/include/Blob/BlobIBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFCHAR_H
 #define LOFAR_COMMON_BLOBIBUFCHAR_H
 
-// \file BlobIBufChar
+// \file BlobIBufChar.h
 // Input buffer for a blob using a plain pointer.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Blob/include/Blob/BlobIBufStream.h b/LCS/Blob/include/Blob/BlobIBufStream.h
index bc9a1cebabad8b2ca0ae697d587302009b75823f..6761bcfc608f1ae739dfd7085107b13593c4a32c 100644
--- a/LCS/Blob/include/Blob/BlobIBufStream.h
+++ b/LCS/Blob/include/Blob/BlobIBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTREAM_H
 #define LOFAR_COMMON_BLOBIBUFSTREAM_H
 
-// \file BlobIBufStream
+// \file BlobIBufStream.h
 // Input buffer for a blob using an istream.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Blob/include/Blob/BlobIBufString.h b/LCS/Blob/include/Blob/BlobIBufString.h
index 790054f0c0153994d7a14bc72b95f190555d8401..b2da09431effa373de857d045748c0277aa8a2fb 100644
--- a/LCS/Blob/include/Blob/BlobIBufString.h
+++ b/LCS/Blob/include/Blob/BlobIBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTRING_H
 #define LOFAR_COMMON_BLOBIBUFSTRING_H
 
-// \file BlobIBufString
+// \file BlobIBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Blob/include/Blob/BlobIBufVector.h b/LCS/Blob/include/Blob/BlobIBufVector.h
index b50073b08de2d84cfaf3e114a4ede496dfb81f72..4c4073221719663ed4a67f96285fe83f67e94025 100644
--- a/LCS/Blob/include/Blob/BlobIBufVector.h
+++ b/LCS/Blob/include/Blob/BlobIBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFVECTOR_H
 #define LOFAR_COMMON_BLOBIBUFVECTOR_H
 
-// \file BlobIBufVector
+// \file BlobIBufVector.h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Blob/include/Blob/BlobIBuffer.h b/LCS/Blob/include/Blob/BlobIBuffer.h
index 9b47a50d9cdfd56cee3a3115480ad693220b1686..ce0f2b0c4cb9ec45e73f4ff2b892ad7e3441c944 100644
--- a/LCS/Blob/include/Blob/BlobIBuffer.h
+++ b/LCS/Blob/include/Blob/BlobIBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFFER_H
 #define LOFAR_COMMON_BLOBIBUFFER_H
 
-// \file BlobIBuffer
+// \file BlobIBuffer.h
 // Abstract base class for input buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobIStream.h b/LCS/Blob/include/Blob/BlobIStream.h
index 61a66db20c3a72abac1250fc6cd9069cd4fa2455..8057c96322406fa2d9d4add79ffdb03a7c567b63 100644
--- a/LCS/Blob/include/Blob/BlobIStream.h
+++ b/LCS/Blob/include/Blob/BlobIStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBISTREAM_H
 #define LOFAR_COMMON_BLOBISTREAM_H
 
-// \file BlobIStream
+// \file BlobIStream.h
 // Input stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobOBufChar.h b/LCS/Blob/include/Blob/BlobOBufChar.h
index 6993d2188bc33cf3c98098095c241f7c02eef8fe..62087760b216a332addbac985ce1d94710da7b87 100644
--- a/LCS/Blob/include/Blob/BlobOBufChar.h
+++ b/LCS/Blob/include/Blob/BlobOBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFCHAR_H
 #define LOFAR_COMMON_BLOBOBUFCHAR_H
 
-// \file BlobOBufChar
+// \file BlobOBufChar.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Blob/include/Blob/BlobOBufNull.h b/LCS/Blob/include/Blob/BlobOBufNull.h
index 9256bb169bacc62f130962a47dad588f2292447c..70ff05999e903bf7b4ec58306a576de4dc78bf23 100644
--- a/LCS/Blob/include/Blob/BlobOBufNull.h
+++ b/LCS/Blob/include/Blob/BlobOBufNull.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFNULL_H
 #define LOFAR_COMMON_BLOBOBUFNULL_H
 
-// \file  BlobOBufNull
+// \file  BlobOBufNull.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Blob/include/Blob/BlobOBufStream.h b/LCS/Blob/include/Blob/BlobOBufStream.h
index 4e0b726f8640cf13b3d2764d4fe262e928368ef8..fe62a212978050c21d4e92751cec498f91d320a1 100644
--- a/LCS/Blob/include/Blob/BlobOBufStream.h
+++ b/LCS/Blob/include/Blob/BlobOBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTREAM_H
 #define LOFAR_COMMON_BLOBOBUFSTREAM_H
 
-// \file BlobOBufStream
+// \file BlobOBufStream.h
 // Output buffer for a blob using an ostream.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Blob/include/Blob/BlobOBufString.h b/LCS/Blob/include/Blob/BlobOBufString.h
index 4f3a7c92a8cc49cfd05db5c3ebfc473cd543e94e..6a121f54cad6b5a614c2e2ef0339182e30d28dac 100644
--- a/LCS/Blob/include/Blob/BlobOBufString.h
+++ b/LCS/Blob/include/Blob/BlobOBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTRING_H
 #define LOFAR_COMMON_BLOBOBUFSTRING_H
 
-// \file BlobOBufString
+// \file BlobOBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Blob/include/Blob/BlobOBufVector.h b/LCS/Blob/include/Blob/BlobOBufVector.h
index 772111c2b2a155739af50272bb9cc6084ccdd165..700609707ce9ed1b76bee5f5388c1228204199bc 100644
--- a/LCS/Blob/include/Blob/BlobOBufVector.h
+++ b/LCS/Blob/include/Blob/BlobOBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFVECTOR_H
 #define LOFAR_COMMON_BLOBOBUFVECTOR_H
 
-// \file BlobOBufVector 
+// \file BlobOBufVector .h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Blob/include/Blob/BlobOBuffer.h b/LCS/Blob/include/Blob/BlobOBuffer.h
index 9920a9b8a29495185fd5dcd6274bfdba0d82a6f6..38ab939f69b5be86c98b21b746ac7a8d25889086 100644
--- a/LCS/Blob/include/Blob/BlobOBuffer.h
+++ b/LCS/Blob/include/Blob/BlobOBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFFER_H
 #define LOFAR_COMMON_BLOBOBUFFER_H
 
-// \file  BlobOBuffer
+// \file  BlobOBuffer.h
 // Abstract base class for output buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobOStream.h b/LCS/Blob/include/Blob/BlobOStream.h
index f78a06e2c38d380cce763b5dcbac15b4e0b84ef4..dcef33be103a2ec4cc0c939e7578a35a3eb86dd2 100644
--- a/LCS/Blob/include/Blob/BlobOStream.h
+++ b/LCS/Blob/include/Blob/BlobOStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOSTREAM_H
 #define LOFAR_COMMON_BLOBOSTREAM_H
 
-// \file BlobOStream
+// \file BlobOStream.h
 // Output stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobString.h b/LCS/Blob/include/Blob/BlobString.h
index b74b073f8ef439f3c55fb6f7344e84afd86bda15..1c391b4814d7c39f6bd76902759a7e35f806c41c 100644
--- a/LCS/Blob/include/Blob/BlobString.h
+++ b/LCS/Blob/include/Blob/BlobString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRING_H
 #define LOFAR_COMMON_BLOBSTRING_H
 
-// \file BlobString
+// \file BlobString.h
 //Blob buffer that can be a string<uchar> or char.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Blob/include/Blob/BlobStringTraits.h b/LCS/Blob/include/Blob/BlobStringTraits.h
index 0a15f141528f9e1626217be58b9327d4b7a5b0f4..8beb1b8a9c87ed1a1709b8891deaf25b058d82d0 100644
--- a/LCS/Blob/include/Blob/BlobStringTraits.h
+++ b/LCS/Blob/include/Blob/BlobStringTraits.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTRAITS_H
 #define LOFAR_COMMON_BLOBSTRINGTRAITS_H
 
-// \file BlobStringTraits
+// \file BlobStringTraits.h
 // char_traits<uchar> implementation for GCC.
 
 // This file implements the char_traits<unsigned char> specialisation.
diff --git a/LCS/Blob/include/Blob/BlobStringType.h b/LCS/Blob/include/Blob/BlobStringType.h
index 9bae78f5dfe0ed09b6985d9d533ccdf7f8dc8dba..3394d52bedd85f66c27ae2726003cbdb1a1f4829 100644
--- a/LCS/Blob/include/Blob/BlobStringType.h
+++ b/LCS/Blob/include/Blob/BlobStringType.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTYPE_H
 #define LOFAR_COMMON_BLOBSTRINGTYPE_H
 
-// \file BlobStringType
+// \file BlobStringType.h
 //Define type for a blob string.
 
 #include <Common/Allocator.h>
diff --git a/LCS/Blob/include/Blob/KeyParser.h b/LCS/Blob/include/Blob/KeyParser.h
index 743734276df0af0abc52e549f66e630030012e9b..222d0ccb96da44f801e14957a0523e61033245b6 100644
--- a/LCS/Blob/include/Blob/KeyParser.h
+++ b/LCS/Blob/include/Blob/KeyParser.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYPARSER_H
 #define LOFAR_COMMON_KEYPARSER_H
 
-// \file KeyParser
+// \file KeyParser.h
 // Class for parsing a key=value line.
 
 //# Includes
diff --git a/LCS/Blob/include/Blob/KeyValue.h b/LCS/Blob/include/Blob/KeyValue.h
index feab45d7185ecea71c5c87280bcf9cd4e40f6783..bcf16b3ec93d5c0b14e6ef3e6446183a56c71c95 100644
--- a/LCS/Blob/include/Blob/KeyValue.h
+++ b/LCS/Blob/include/Blob/KeyValue.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUE_H
 #define LOFAR_COMMON_KEYVALUE_H
 
-// \file KeyValue
+// \file KeyValue.h
 // Class to hold a general value.
 
 #include <lofar_config.h>
diff --git a/LCS/Blob/include/Blob/KeyValueMap.h b/LCS/Blob/include/Blob/KeyValueMap.h
index ebc2f1befb6da32523ecc6e7fe9d839ed89d9b6a..41bc2db800cb90b433d7a568e99562b1a4cb64c2 100644
--- a/LCS/Blob/include/Blob/KeyValueMap.h
+++ b/LCS/Blob/include/Blob/KeyValueMap.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUEMAP_H
 #define LOFAR_COMMON_KEYVALUEMAP_H
 
-// \file KeyValueMap
+// \file KeyValueMap.h
 // Class to hold a collection of key name/value pairs.
 
 #include <Common/KeyValue.h>
diff --git a/LCS/Common/include/Common/Allocator.h b/LCS/Common/include/Common/Allocator.h
index 41bcae5c1b1c127d6f4c3c7ba27cd9634a9b2b57..f113e25bd4e4b03268ead438bf70980d38f36b95 100644
--- a/LCS/Common/include/Common/Allocator.h
+++ b/LCS/Common/include/Common/Allocator.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_ALLOCATOR_H
 #define LOFAR_COMMON_ALLOCATOR_H
 
-// \file Allocator
+// \file Allocator.h
 // Abstract base class for LOFAR memory (de)allocator.
 
 #include <unistd.h>
diff --git a/LCS/Common/include/Common/BlitzToAips.h b/LCS/Common/include/Common/BlitzToAips.h
index 315c29c762c4a5363ee6f818b5fb071794c9bad5..666cc05bf7398c975913cbf95244c750e3164dc9 100644
--- a/LCS/Common/include/Common/BlitzToAips.h
+++ b/LCS/Common/include/Common/BlitzToAips.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLITZTOAIPS_H
 #define LOFAR_COMMON_BLITZTOAIPS_H
 
-// \file BlitzToAips
+// \file BlitzToAips.h
 // Conversion methods for Blitz++ and AIPS++ data structures.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/BlobArray.h b/LCS/Common/include/Common/BlobArray.h
index caa631085aca7429534a67bb858493165823358f..e19e8b3e6ad71d18ecaefc6c3c7a31b4300ab80b 100644
--- a/LCS/Common/include/Common/BlobArray.h
+++ b/LCS/Common/include/Common/BlobArray.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAY_H
 #define LOFAR_COMMON_BLOBARRAY_H
 
-// \file BlobArray
+// \file BlobArray.h
 //Blob handling for arrays.
 
 #include <Common/BlobOStream.h>
diff --git a/LCS/Common/include/Common/BlobArrayHeader.h b/LCS/Common/include/Common/BlobArrayHeader.h
index 05c2473189c7482394821f261020bcdcd3055773..5e54969031d8b7588608fc414609f9c5aefadee3 100644
--- a/LCS/Common/include/Common/BlobArrayHeader.h
+++ b/LCS/Common/include/Common/BlobArrayHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAYHEADER_H
 #define LOFAR_COMMON_BLOBARRAYHEADER_H
 
-// \file BlobArrayHeader
+// \file BlobArrayHeader.h
 // Standard array header for a blob.
 
 #include <Common/BlobHeader.h>
diff --git a/LCS/Common/include/Common/BlobException.h b/LCS/Common/include/Common/BlobException.h
index 2e5117da137a26ea3bd6efcd3d4284e51ff52ea8..c7de17c46bae49c69978ecfd524d27f5db57e7b2 100644
--- a/LCS/Common/include/Common/BlobException.h
+++ b/LCS/Common/include/Common/BlobException.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBEXCEPTION_H
 #define LOFAR_COMMON_BLOBEXCEPTION_H
 
-// \fileBlobException
+// \fileBlobException.h
 // Blob Exception class. 
 
 //# Includes
diff --git a/LCS/Common/include/Common/BlobField.h b/LCS/Common/include/Common/BlobField.h
index 1b7bd11dfb3ea767b6a5131cc33d188d0d293e4a..76a44d9e4d40e8719cdd7fc558381fb5ccdfb51a 100644
--- a/LCS/Common/include/Common/BlobField.h
+++ b/LCS/Common/include/Common/BlobField.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELD_H
 #define LOFAR_COMMON_BLOBFIELD_H
 
-// \file  BlobField
+// \file  BlobField.h
 // Definition of a field in a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobFieldSet.h b/LCS/Common/include/Common/BlobFieldSet.h
index f625e5908d4dd7ad0763cc176679cbf43e6ed17c..bb5a74a220b4f5b1c6b45ef50c9603bf5452e6a4 100644
--- a/LCS/Common/include/Common/BlobFieldSet.h
+++ b/LCS/Common/include/Common/BlobFieldSet.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELDSET_H
 #define LOFAR_COMMON_BLOBFIELDSET_H
 
-// \file BlobFieldSet
+// \file BlobFieldSet.h
 // Definition all fields in a blob.
 
 #include <Common/BlobField.h>
diff --git a/LCS/Common/include/Common/BlobHeader.h b/LCS/Common/include/Common/BlobHeader.h
index c78fa2351771373c2e2fa771aabd14814e48d210..40f53fbed65ea956df869596361c8776340d5b05 100644
--- a/LCS/Common/include/Common/BlobHeader.h
+++ b/LCS/Common/include/Common/BlobHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBHEADER_H
 #define LOFAR_COMMON_BLOBHEADER_H
 
-// \file BlobHeader
+// \file BlobHeader.h
 // Standard header for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobIBufChar.h b/LCS/Common/include/Common/BlobIBufChar.h
index 0702f37edf910c417434920a492e1b7dc43365bd..465707e47eb4a9d93ab6f12114b26944f070ffaa 100644
--- a/LCS/Common/include/Common/BlobIBufChar.h
+++ b/LCS/Common/include/Common/BlobIBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFCHAR_H
 #define LOFAR_COMMON_BLOBIBUFCHAR_H
 
-// \file BlobIBufChar
+// \file BlobIBufChar.h
 // Input buffer for a blob using a plain pointer.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Common/include/Common/BlobIBufStream.h b/LCS/Common/include/Common/BlobIBufStream.h
index bc9a1cebabad8b2ca0ae697d587302009b75823f..6761bcfc608f1ae739dfd7085107b13593c4a32c 100644
--- a/LCS/Common/include/Common/BlobIBufStream.h
+++ b/LCS/Common/include/Common/BlobIBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTREAM_H
 #define LOFAR_COMMON_BLOBIBUFSTREAM_H
 
-// \file BlobIBufStream
+// \file BlobIBufStream.h
 // Input buffer for a blob using an istream.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Common/include/Common/BlobIBufString.h b/LCS/Common/include/Common/BlobIBufString.h
index 790054f0c0153994d7a14bc72b95f190555d8401..b2da09431effa373de857d045748c0277aa8a2fb 100644
--- a/LCS/Common/include/Common/BlobIBufString.h
+++ b/LCS/Common/include/Common/BlobIBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTRING_H
 #define LOFAR_COMMON_BLOBIBUFSTRING_H
 
-// \file BlobIBufString
+// \file BlobIBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Common/include/Common/BlobIBufVector.h b/LCS/Common/include/Common/BlobIBufVector.h
index b50073b08de2d84cfaf3e114a4ede496dfb81f72..4c4073221719663ed4a67f96285fe83f67e94025 100644
--- a/LCS/Common/include/Common/BlobIBufVector.h
+++ b/LCS/Common/include/Common/BlobIBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFVECTOR_H
 #define LOFAR_COMMON_BLOBIBUFVECTOR_H
 
-// \file BlobIBufVector
+// \file BlobIBufVector.h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Common/include/Common/BlobIBuffer.h b/LCS/Common/include/Common/BlobIBuffer.h
index 9b47a50d9cdfd56cee3a3115480ad693220b1686..ce0f2b0c4cb9ec45e73f4ff2b892ad7e3441c944 100644
--- a/LCS/Common/include/Common/BlobIBuffer.h
+++ b/LCS/Common/include/Common/BlobIBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFFER_H
 #define LOFAR_COMMON_BLOBIBUFFER_H
 
-// \file BlobIBuffer
+// \file BlobIBuffer.h
 // Abstract base class for input buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobIStream.h b/LCS/Common/include/Common/BlobIStream.h
index 61a66db20c3a72abac1250fc6cd9069cd4fa2455..8057c96322406fa2d9d4add79ffdb03a7c567b63 100644
--- a/LCS/Common/include/Common/BlobIStream.h
+++ b/LCS/Common/include/Common/BlobIStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBISTREAM_H
 #define LOFAR_COMMON_BLOBISTREAM_H
 
-// \file BlobIStream
+// \file BlobIStream.h
 // Input stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobOBufChar.h b/LCS/Common/include/Common/BlobOBufChar.h
index 6993d2188bc33cf3c98098095c241f7c02eef8fe..62087760b216a332addbac985ce1d94710da7b87 100644
--- a/LCS/Common/include/Common/BlobOBufChar.h
+++ b/LCS/Common/include/Common/BlobOBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFCHAR_H
 #define LOFAR_COMMON_BLOBOBUFCHAR_H
 
-// \file BlobOBufChar
+// \file BlobOBufChar.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/include/Common/BlobOBufNull.h b/LCS/Common/include/Common/BlobOBufNull.h
index 9256bb169bacc62f130962a47dad588f2292447c..70ff05999e903bf7b4ec58306a576de4dc78bf23 100644
--- a/LCS/Common/include/Common/BlobOBufNull.h
+++ b/LCS/Common/include/Common/BlobOBufNull.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFNULL_H
 #define LOFAR_COMMON_BLOBOBUFNULL_H
 
-// \file  BlobOBufNull
+// \file  BlobOBufNull.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/include/Common/BlobOBufStream.h b/LCS/Common/include/Common/BlobOBufStream.h
index 4e0b726f8640cf13b3d2764d4fe262e928368ef8..fe62a212978050c21d4e92751cec498f91d320a1 100644
--- a/LCS/Common/include/Common/BlobOBufStream.h
+++ b/LCS/Common/include/Common/BlobOBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTREAM_H
 #define LOFAR_COMMON_BLOBOBUFSTREAM_H
 
-// \file BlobOBufStream
+// \file BlobOBufStream.h
 // Output buffer for a blob using an ostream.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/include/Common/BlobOBufString.h b/LCS/Common/include/Common/BlobOBufString.h
index 4f3a7c92a8cc49cfd05db5c3ebfc473cd543e94e..6a121f54cad6b5a614c2e2ef0339182e30d28dac 100644
--- a/LCS/Common/include/Common/BlobOBufString.h
+++ b/LCS/Common/include/Common/BlobOBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTRING_H
 #define LOFAR_COMMON_BLOBOBUFSTRING_H
 
-// \file BlobOBufString
+// \file BlobOBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Common/include/Common/BlobOBufVector.h b/LCS/Common/include/Common/BlobOBufVector.h
index 772111c2b2a155739af50272bb9cc6084ccdd165..700609707ce9ed1b76bee5f5388c1228204199bc 100644
--- a/LCS/Common/include/Common/BlobOBufVector.h
+++ b/LCS/Common/include/Common/BlobOBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFVECTOR_H
 #define LOFAR_COMMON_BLOBOBUFVECTOR_H
 
-// \file BlobOBufVector 
+// \file BlobOBufVector .h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Common/include/Common/BlobOBuffer.h b/LCS/Common/include/Common/BlobOBuffer.h
index 9920a9b8a29495185fd5dcd6274bfdba0d82a6f6..38ab939f69b5be86c98b21b746ac7a8d25889086 100644
--- a/LCS/Common/include/Common/BlobOBuffer.h
+++ b/LCS/Common/include/Common/BlobOBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFFER_H
 #define LOFAR_COMMON_BLOBOBUFFER_H
 
-// \file  BlobOBuffer
+// \file  BlobOBuffer.h
 // Abstract base class for output buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobOStream.h b/LCS/Common/include/Common/BlobOStream.h
index f78a06e2c38d380cce763b5dcbac15b4e0b84ef4..dcef33be103a2ec4cc0c939e7578a35a3eb86dd2 100644
--- a/LCS/Common/include/Common/BlobOStream.h
+++ b/LCS/Common/include/Common/BlobOStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOSTREAM_H
 #define LOFAR_COMMON_BLOBOSTREAM_H
 
-// \file BlobOStream
+// \file BlobOStream.h
 // Output stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobString.h b/LCS/Common/include/Common/BlobString.h
index b74b073f8ef439f3c55fb6f7344e84afd86bda15..1c391b4814d7c39f6bd76902759a7e35f806c41c 100644
--- a/LCS/Common/include/Common/BlobString.h
+++ b/LCS/Common/include/Common/BlobString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRING_H
 #define LOFAR_COMMON_BLOBSTRING_H
 
-// \file BlobString
+// \file BlobString.h
 //Blob buffer that can be a string<uchar> or char.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/BlobStringTraits.h b/LCS/Common/include/Common/BlobStringTraits.h
index 0a15f141528f9e1626217be58b9327d4b7a5b0f4..8beb1b8a9c87ed1a1709b8891deaf25b058d82d0 100644
--- a/LCS/Common/include/Common/BlobStringTraits.h
+++ b/LCS/Common/include/Common/BlobStringTraits.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTRAITS_H
 #define LOFAR_COMMON_BLOBSTRINGTRAITS_H
 
-// \file BlobStringTraits
+// \file BlobStringTraits.h
 // char_traits<uchar> implementation for GCC.
 
 // This file implements the char_traits<unsigned char> specialisation.
diff --git a/LCS/Common/include/Common/BlobStringType.h b/LCS/Common/include/Common/BlobStringType.h
index 9bae78f5dfe0ed09b6985d9d533ccdf7f8dc8dba..3394d52bedd85f66c27ae2726003cbdb1a1f4829 100644
--- a/LCS/Common/include/Common/BlobStringType.h
+++ b/LCS/Common/include/Common/BlobStringType.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTYPE_H
 #define LOFAR_COMMON_BLOBSTRINGTYPE_H
 
-// \file BlobStringType
+// \file BlobStringType.h
 //Define type for a blob string.
 
 #include <Common/Allocator.h>
diff --git a/LCS/Common/include/Common/CheckConfig.h b/LCS/Common/include/Common/CheckConfig.h
index b59266d8b0de279efafbaad83c2498bbb08de7cf..d151747f6a881650a0821e7572b6a8fedd2fe595 100644
--- a/LCS/Common/include/Common/CheckConfig.h
+++ b/LCS/Common/include/Common/CheckConfig.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_CHECKCONFIG_H
 #define LOFAR_COMMON_CHECKCONFIG_H
 
-// \file CheckConfig
+// \file CheckConfig.h
 // Macros for declaring a config-dependent data structure.
 
 // The CHECK_CONFIG macros should be used if and when you declare a
diff --git a/LCS/Common/include/Common/DataConvert.h b/LCS/Common/include/Common/DataConvert.h
index e3d1c197fc71ba2ffbef3333c55e939d06d321b4..4148b9a6dcc2c559d5d92d47312d5e74851eae4a 100644
--- a/LCS/Common/include/Common/DataConvert.h
+++ b/LCS/Common/include/Common/DataConvert.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DATACONVERT_H
 #define LOFAR_COMMON_DATACONVERT_H
 
-// \file DataConvert
+// \file DataConvert.h
 // Global functions to convert data values.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/DataFormat.h b/LCS/Common/include/Common/DataFormat.h
index caa856ed7527e42ebeaa8c1e251fdb57fe43145d..71acdb632c9d10c61c394200c3f991c545f0fa3a 100644
--- a/LCS/Common/include/Common/DataFormat.h
+++ b/LCS/Common/include/Common/DataFormat.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DATAFORMAT_H
 #define LOFAR_COMMON_DATAFORMAT_H
 
-// \file DataFormat
+// \file DataFormat.h
 // Get the data format (endian type).
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/Debug.h b/LCS/Common/include/Common/Debug.h
index 44334eef64e6d720fb3a19a0b3b100c7f21bed60..a236706b03e1a87c94b01ca00177ba6db24aaf58 100644
--- a/LCS/Common/include/Common/Debug.h
+++ b/LCS/Common/include/Common/Debug.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DEBUG_H
 #define LOFAR_COMMON_DEBUG_H
 
-// \file Debug.h
+// \file Debug.h.h
 //
 
 #ifdef __DEPRECATED
diff --git a/LCS/Common/include/Common/Exception.h b/LCS/Common/include/Common/Exception.h
index 484e2c162db16cd8b39acbf611c272b93b154f29..de771db541fbbc0a3bec1dc70ce1fb530a4ae8ad 100644
--- a/LCS/Common/include/Common/Exception.h
+++ b/LCS/Common/include/Common/Exception.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_EXCEPTION_H
 #define LOFAR_COMMON_EXCEPTION_H
 
-// \file Exception
+// \file Exception.h
 // LCS Exception base class.
 
 //# Includes
diff --git a/LCS/Common/include/Common/HEADER.h b/LCS/Common/include/Common/HEADER.h
index b642879dd75c2d61fca6ef0aeed6bbe9644d22ab..fe84577d7f9162e9870ca8fca8a57c341318745c 100644
--- a/LCS/Common/include/Common/HEADER.h
+++ b/LCS/Common/include/Common/HEADER.h
@@ -25,7 +25,7 @@
 
 //# Never #include <config.h> or #include <lofar_config.h> in a header file!
 
-// \file filename
+// \file filename.h
 // one line description.
 
 //# Includes
diff --git a/LCS/Common/include/Common/KeyParser.h b/LCS/Common/include/Common/KeyParser.h
index 743734276df0af0abc52e549f66e630030012e9b..222d0ccb96da44f801e14957a0523e61033245b6 100644
--- a/LCS/Common/include/Common/KeyParser.h
+++ b/LCS/Common/include/Common/KeyParser.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYPARSER_H
 #define LOFAR_COMMON_KEYPARSER_H
 
-// \file KeyParser
+// \file KeyParser.h
 // Class for parsing a key=value line.
 
 //# Includes
diff --git a/LCS/Common/include/Common/KeyValue.h b/LCS/Common/include/Common/KeyValue.h
index feab45d7185ecea71c5c87280bcf9cd4e40f6783..bcf16b3ec93d5c0b14e6ef3e6446183a56c71c95 100644
--- a/LCS/Common/include/Common/KeyValue.h
+++ b/LCS/Common/include/Common/KeyValue.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUE_H
 #define LOFAR_COMMON_KEYVALUE_H
 
-// \file KeyValue
+// \file KeyValue.h
 // Class to hold a general value.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/KeyValueMap.h b/LCS/Common/include/Common/KeyValueMap.h
index ebc2f1befb6da32523ecc6e7fe9d839ed89d9b6a..41bc2db800cb90b433d7a568e99562b1a4cb64c2 100644
--- a/LCS/Common/include/Common/KeyValueMap.h
+++ b/LCS/Common/include/Common/KeyValueMap.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUEMAP_H
 #define LOFAR_COMMON_KEYVALUEMAP_H
 
-// \file KeyValueMap
+// \file KeyValueMap.h
 // Class to hold a collection of key name/value pairs.
 
 #include <Common/KeyValue.h>
diff --git a/LCS/Common/include/Common/LofarLog4Cplus.h b/LCS/Common/include/Common/LofarLog4Cplus.h
index 4c3e21a528a43d1a4c8b747cedd911e7bcc50071..a407fb4c280902ca542e3fe1241c9c1b65812ace 100644
--- a/LCS/Common/include/Common/LofarLog4Cplus.h
+++ b/LCS/Common/include/Common/LofarLog4Cplus.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOG4CPLUS_H
 #define LOFAR_COMMON_LOG4CPLUS_H
 
-// \file LofarLog4Cplus
+// \file LofarLog4Cplus.h
 // Interface to the log4cplus logging package
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/LofarLogCout.h b/LCS/Common/include/Common/LofarLogCout.h
index 2fc58b6cfca32182155be249c9264429053264fc..4b1772cf8aba84135b4d2471e075de31b5969455 100644
--- a/LCS/Common/include/Common/LofarLogCout.h
+++ b/LCS/Common/include/Common/LofarLogCout.h
@@ -23,7 +23,7 @@
 //# No include guard is used, because it should only be included indirectly
 //# by LofarLogger.h (and by LofarLogCout.cc).
 
-// \file LofarLogCout
+// \file LofarLogCout.h
 //  Macro interface to the cout/cerr logging implementation
 
 #include <Common/lofar_iostream.h>
diff --git a/LCS/Common/include/Common/LofarLogger.h b/LCS/Common/include/Common/LofarLogger.h
index 1e3bfdd780f1ca54bcf7f6cbd1b741f8165dd7e7..e27f45b92149844cfb7e246612231bcb3fc1fd19 100644
--- a/LCS/Common/include/Common/LofarLogger.h
+++ b/LCS/Common/include/Common/LofarLogger.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARLOGGER_H
 #define LOFAR_COMMON_LOFARLOGGER_H
 
-// \file LofarLogger
+// \file LofarLogger.h
 // Macro interface to the lofar logging package
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/LofarTypedefs.h b/LCS/Common/include/Common/LofarTypedefs.h
index 8fd5251f8010cdca9700b5fefdc980af2143f32c..c0d67dafbe97a472a3ea8703747162ffc06da972 100644
--- a/LCS/Common/include/Common/LofarTypedefs.h
+++ b/LCS/Common/include/Common/LofarTypedefs.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARTYPEDEFS_H
 #define LOFAR_COMMON_LOFARTYPEDEFS_H
 
-// \file LofarTypedefs
+// \file LofarTypedefs.h
 //
 
 #include <complex>
diff --git a/LCS/Common/include/Common/LofarTypes.h b/LCS/Common/include/Common/LofarTypes.h
index b2b2d46a1e97e4ffe2fe37f73747fbe33e780625..cc361f898794f2da63645a6f500131d41f40b007 100644
--- a/LCS/Common/include/Common/LofarTypes.h
+++ b/LCS/Common/include/Common/LofarTypes.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARTYPES_H
 #define LOFAR_COMMON_LOFARTYPES_H
 
-// \file LofarTypes
+// \file LofarTypes.h
 //
 
 #include <Common/LofarTypedefs.h>
@@ -41,7 +41,7 @@
 
 namespace LOFAR
 {
-  // \addtogroup LOFAR
+  // \addtogroup Common
   // @{
 
   //# Make the type names defined in LofarTypedefs.h available in the
diff --git a/LCS/Common/include/Common/Lonumerics.h b/LCS/Common/include/Common/Lonumerics.h
index ff959eaa59fa4408f5864ed729e2c8996643a220..2e938de2fa26470fa3a7d208935ccfbfdffc9a94 100644
--- a/LCS/Common/include/Common/Lonumerics.h
+++ b/LCS/Common/include/Common/Lonumerics.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LONUMERICS_H
 #define LOFARCOMMON_LONUMERICS_H 1
 
-// \file Lonumerics
+// \file Lonumerics.h
 // Define numeric types
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/include/Common/Lorrays-Blitz.h b/LCS/Common/include/Common/Lorrays-Blitz.h
index 307fa1fc13da139c4d63139bfcb5f5118dfe4c7b..4d4a74167169d1be953168763dc3fc5aea5f67c9 100644
--- a/LCS/Common/include/Common/Lorrays-Blitz.h
+++ b/LCS/Common/include/Common/Lorrays-Blitz.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LORRAYS_BLITZ_H
 #define LOFAR_COMMON_LORRAYS_BLITZ_H
 
-// \file Lorrays-Blitz
+// \file Lorrays-Blitz.h
 // Define Blitz array types
 
 // other code can use this symbol to check for blitz arrays
diff --git a/LCS/Common/include/Common/Lorrays.h b/LCS/Common/include/Common/Lorrays.h
index 01738741aa3efbb098889cc9181e917bd44fd4e8..cde2251b3f4ebb95fc9ff53bf4e9e7fcfeb910ff 100644
--- a/LCS/Common/include/Common/Lorrays.h
+++ b/LCS/Common/include/Common/Lorrays.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LORRAYS_H
 #define LOFAR_COMMON_LORRAYS_H
 
-// \file Lorrays
+// \file Lorrays.h
 // Define Array type to use (Blitz or AIPS++
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/RunOnNode.h b/LCS/Common/include/Common/RunOnNode.h
index 564c1e1581f851567dbaf0a98f37afd626201168..73249b0943a8453be4c1c2c36cb65427bf71252f 100644
--- a/LCS/Common/include/Common/RunOnNode.h
+++ b/LCS/Common/include/Common/RunOnNode.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_LCS_RUNONNODE_H
 #define LOFAR_LCS_RUNONNODE_H
 
-// \file RunOnNode
+// \file RunOnNode.h
 //
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/Stopwatch.h b/LCS/Common/include/Common/Stopwatch.h
index 3728cd1b691c90cdb675de98a6e111039c9bbaf4..8f50a2d8cf6836d166d7a0aa25c64a7f9212c96c 100644
--- a/LCS/Common/include/Common/Stopwatch.h
+++ b/LCS/Common/include/Common/Stopwatch.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STOPWATCH_H
 #define LOFAR_COMMON_STOPWATCH_H
 
-// \file StopWatch
+// \file StopWatch.h
 // timer class
 
 //# Includes
diff --git a/LCS/Common/include/Common/StringUtil.h b/LCS/Common/include/Common/StringUtil.h
index fc0672e4b9e69786a8b41ad3144c92f5641f4f06..781312d9a00e42eedd922fdb4b5caaebd8c3c799 100644
--- a/LCS/Common/include/Common/StringUtil.h
+++ b/LCS/Common/include/Common/StringUtil.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRINGUTIL_H
 #define LOFAR_COMMON_STRINGUTIL_H
 
-// \fileStringUtil
+// \fileStringUtil.h
 
 
 //#include <lofar_config.h>
diff --git a/LCS/Common/include/Common/Thread.h b/LCS/Common/include/Common/Thread.h
index db96fef399a88210b179b77fd607533cdbbe1c15..04fb93094b819dd3ba903261e45a2c800566576d 100644
--- a/LCS/Common/include/Common/Thread.h
+++ b/LCS/Common/include/Common/Thread.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_THREAD_H
 #define LOFAR_COMMON_THREAD_H
    
-// \file Thread
+// \file Thread.h
 // basic header for the Thread package 
 
 #include <Common/Thread/Thread.h>
diff --git a/LCS/Common/include/Common/Timer.h b/LCS/Common/include/Common/Timer.h
index 7f13d27591ccaabdd028032cc31d7b0206cddd89..37ef2a10fbad4f0a0179c0738b621fde0b27e1f0 100644
--- a/LCS/Common/include/Common/Timer.h
+++ b/LCS/Common/include/Common/Timer.h
@@ -24,6 +24,7 @@
 #define LOFAR_COMMON_TIMER_H
 
 // \file Timer
+.h
 // Accurate timer
 
 #include <cstdlib>
diff --git a/LCS/Common/include/Common/TypeNames.h b/LCS/Common/include/Common/TypeNames.h
index da6e6daddc199e58098e6e6fd23b6f90aed35eea..a28646f11a74ba62cfb408b357db941dffc38d18 100644
--- a/LCS/Common/include/Common/TypeNames.h
+++ b/LCS/Common/include/Common/TypeNames.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_TYPENAMES_H
 #define LOFAR_COMMON_TYPENAMES_H
 
-// \file TypeNames
+// \file TypeNames.h
 // Return a string giving the type name to be stored in blobs.
 
 //# Includes
diff --git a/LCS/Common/include/Common/VectorUtil.h b/LCS/Common/include/Common/VectorUtil.h
index cd5d5f09bd81b6c3df8d7397b933d32ee15bdbc6..dd894c3028f554c93bad2d6d60acc3a7a59d95e6 100644
--- a/LCS/Common/include/Common/VectorUtil.h
+++ b/LCS/Common/include/Common/VectorUtil.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_VECTORUTIL_H
 #define LOFAR_COMMON_VECTORUTIL_H
 
-// \file VectorUtil
+// \file VectorUtil.h
 // Utility functions on the std::vector class.
 
 #include <vector>
diff --git a/LCS/Common/include/Common/hexdump.h b/LCS/Common/include/Common/hexdump.h
index f16a7d7e20964218138b3f6c48f0f25c93a4bf01..f472eebd104245b5610ce73e7546f2dc6a55c9ea 100644
--- a/LCS/Common/include/Common/hexdump.h
+++ b/LCS/Common/include/Common/hexdump.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_HEXDUMP_H
 #define LOFAR_COMMON_HEXDUMP_H
 
-// \file hexdump
+// \file hexdump.h
 // create hexdump of given datablock.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/include/Common/lofar_algorithm.h b/LCS/Common/include/Common/lofar_algorithm.h
index 52d5b83132af39da792a98fb5430b4176125e417..8c66b9332d59a7d180e6067bc60597b40b9f6f5d 100644
--- a/LCS/Common/include/Common/lofar_algorithm.h
+++ b/LCS/Common/include/Common/lofar_algorithm.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_ALGORITHM_H
 #define LOFAR_COMMON_LOFAR_ALGORITHM_H
 
-// \file lofar_algorithm
+// \file lofar_algorithm.h
 //
 
 #include <algorithm>
diff --git a/LCS/Common/include/Common/lofar_complex.h b/LCS/Common/include/Common/lofar_complex.h
index 60212daf68ff86e06373c6c58463d001213497d4..000dd487aa4c94c48be1b94afe66ea8636f38dc5 100644
--- a/LCS/Common/include/Common/lofar_complex.h
+++ b/LCS/Common/include/Common/lofar_complex.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_COMPLEX_H
 #define LOFAR_COMMON_LOFAR_COMPLEX_H
 
-// \file lofar_complex
+// \file lofar_complex.h
 //
 
 #include <complex>
diff --git a/LCS/Common/include/Common/lofar_fstream.h b/LCS/Common/include/Common/lofar_fstream.h
index cc77fb448d0cffa58876971a9d531f9cc801b09f..076937d74a3875f2dd665c2491e9c1eb15038ba3 100644
--- a/LCS/Common/include/Common/lofar_fstream.h
+++ b/LCS/Common/include/Common/lofar_fstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_FSTREAM_H
 #define LOFAR_COMMON_LOFAR_FSTREAM_H
 
-// \file lofar_fstream
+// \file lofar_fstream.h
 //
 
 #include <fstream>
diff --git a/LCS/Common/include/Common/lofar_global_symbol_warning.h b/LCS/Common/include/Common/lofar_global_symbol_warning.h
index 63a45e0573faaa253b4c4e3054d80275ef6ae57b..e7c4a0f1918a5176cb0304dd7b9cade9aa1638bf 100644
--- a/LCS/Common/include/Common/lofar_global_symbol_warning.h
+++ b/LCS/Common/include/Common/lofar_global_symbol_warning.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_GLOBAL_SYMBOL_WARNING_H
 #define LOFAR_COMMON_LOFAR_GLOBAL_SYMBOL_WARNING_H
 
-// \file lofar_global_symbol_warning
+// \file lofar_global_symbol_warning.h
 //
 
 // \addtogroup Common
diff --git a/LCS/Common/include/Common/lofar_iomanip.h b/LCS/Common/include/Common/lofar_iomanip.h
index a0ecb2965b4d38312ec526f8d74964ed6f4f2c81..666a696502f410a02cab78b0da058eb1e84f7de1 100644
--- a/LCS/Common/include/Common/lofar_iomanip.h
+++ b/LCS/Common/include/Common/lofar_iomanip.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_IOMANIP_H
 #define LOFAR_COMMON_LOFAR_IOMANIP_H
 
-// \file lofar_iomanip
+// \file lofar_iomanip.h
 //
 
 #include <iomanip>
diff --git a/LCS/Common/include/Common/lofar_iostream.h b/LCS/Common/include/Common/lofar_iostream.h
index 94c7d85be74d7746638744bb8aaa155a667f0c32..e3bb0c4734a052e8f77cc243fc213accbc537082 100644
--- a/LCS/Common/include/Common/lofar_iostream.h
+++ b/LCS/Common/include/Common/lofar_iostream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_IOSTREAM_H
 #define LOFAR_COMMON_LOFAR_IOSTREAM_H
 
-// \file lofar_iostream
+// \file lofar_iostream.h
 //
 
 #include <Common/lofar_iosfwd.h>
diff --git a/LCS/Common/include/Common/lofar_list.h b/LCS/Common/include/Common/lofar_list.h
index 4375d2b1a4378fc2eec175e9e72dd93a5e72d575..1b92bf17d4390bf9c419bcb08129c4592ea38806 100644
--- a/LCS/Common/include/Common/lofar_list.h
+++ b/LCS/Common/include/Common/lofar_list.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_LIST_H
 #define LOFAR_COMMON_LOFAR_LIST_H
 
-// \file lofar_list
+// \file lofar_list.h
 //
 
 #include <list>
diff --git a/LCS/Common/include/Common/lofar_map.h b/LCS/Common/include/Common/lofar_map.h
index 898d7a62c2dec7f2668e3db64119aa59ca67006a..e97a46f63919e67e38180f204b64dcb754934295 100644
--- a/LCS/Common/include/Common/lofar_map.h
+++ b/LCS/Common/include/Common/lofar_map.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_MAP_H
 #define LOFAR_COMMON_MAP_H
 
-// \file lofar_map
+// \file lofar_map.h
 //
 
 #include <map>
diff --git a/LCS/Common/include/Common/lofar_sstream.h b/LCS/Common/include/Common/lofar_sstream.h
index b3e258232494b77cd355a1f51873b03f9887c8a3..e17313beec2569497f34a93b36cc994f3e5d6f72 100644
--- a/LCS/Common/include/Common/lofar_sstream.h
+++ b/LCS/Common/include/Common/lofar_sstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_SSTREAM_H
 #define LOFAR_COMMON_SSTREAM_H
 
-// \file lofar_sstream
+// \file lofar_sstream.h
 //
 
 #include <sstream>
diff --git a/LCS/Common/include/Common/lofar_stack.h b/LCS/Common/include/Common/lofar_stack.h
index 7cd805a5fbc78d591bfe48c5b4d5fac23465af38..8d5bf621381782150099459f8327965ff3c8874d 100644
--- a/LCS/Common/include/Common/lofar_stack.h
+++ b/LCS/Common/include/Common/lofar_stack.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STACK_H
 #define LOFAR_COMMON_STACK_H
 
-// \file lofar_stack
+// \file lofar_stack.h
 //
 
 #include <Common/lofar_deque.h>
diff --git a/LCS/Common/include/Common/lofar_string.h b/LCS/Common/include/Common/lofar_string.h
index 73f470d4ad1415bb9ac0c509a54ca22e3e3bc4f6..d024cc0b2ddd39c51a2b2bef277d9c44ac31921a 100644
--- a/LCS/Common/include/Common/lofar_string.h
+++ b/LCS/Common/include/Common/lofar_string.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRING_H
 #define LOFAR_COMMON_STRING_H
 
-// \file lofar_string
+// \file lofar_string.h
 //
 #include <string>
 
diff --git a/LCS/Common/include/Common/lofar_strstream.h b/LCS/Common/include/Common/lofar_strstream.h
index e4c6ff3a93403217567e09c3e547dbe95a062ddd..a1e49b1fe69f2242f81bdd9c2d818843a47a92e7 100644
--- a/LCS/Common/include/Common/lofar_strstream.h
+++ b/LCS/Common/include/Common/lofar_strstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRSTREAM_H
 #define LOFAR_COMMON_STRSTREAM_H
 
-// \file lofar_strstream
+// \file lofar_strstream.h
 //
 
 // The strstream classes are considered deprecated. The are not supported
diff --git a/LCS/Common/include/Common/lofar_vector.h b/LCS/Common/include/Common/lofar_vector.h
index 750edb3e98e53a5d8eae04643b1aeff79bd214f2..acb3464bfcc5bdb295ce88214b1c9bf72d04e7cd 100644
--- a/LCS/Common/include/Common/lofar_vector.h
+++ b/LCS/Common/include/Common/lofar_vector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_VECTOR_H
 #define LOFAR_COMMON_VECTOR_H
 
-// \file lofar_vector
+// \file lofar_vector.h
 //
 
 #include <vector>
diff --git a/LCS/Common/src/Allocator.h b/LCS/Common/src/Allocator.h
index 41bcae5c1b1c127d6f4c3c7ba27cd9634a9b2b57..f113e25bd4e4b03268ead438bf70980d38f36b95 100644
--- a/LCS/Common/src/Allocator.h
+++ b/LCS/Common/src/Allocator.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_ALLOCATOR_H
 #define LOFAR_COMMON_ALLOCATOR_H
 
-// \file Allocator
+// \file Allocator.h
 // Abstract base class for LOFAR memory (de)allocator.
 
 #include <unistd.h>
diff --git a/LCS/Common/src/BlitzToAips.h b/LCS/Common/src/BlitzToAips.h
index 315c29c762c4a5363ee6f818b5fb071794c9bad5..666cc05bf7398c975913cbf95244c750e3164dc9 100644
--- a/LCS/Common/src/BlitzToAips.h
+++ b/LCS/Common/src/BlitzToAips.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLITZTOAIPS_H
 #define LOFAR_COMMON_BLITZTOAIPS_H
 
-// \file BlitzToAips
+// \file BlitzToAips.h
 // Conversion methods for Blitz++ and AIPS++ data structures.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/BlobArray.h b/LCS/Common/src/BlobArray.h
index caa631085aca7429534a67bb858493165823358f..e19e8b3e6ad71d18ecaefc6c3c7a31b4300ab80b 100644
--- a/LCS/Common/src/BlobArray.h
+++ b/LCS/Common/src/BlobArray.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAY_H
 #define LOFAR_COMMON_BLOBARRAY_H
 
-// \file BlobArray
+// \file BlobArray.h
 //Blob handling for arrays.
 
 #include <Common/BlobOStream.h>
diff --git a/LCS/Common/src/BlobArrayHeader.h b/LCS/Common/src/BlobArrayHeader.h
index 05c2473189c7482394821f261020bcdcd3055773..5e54969031d8b7588608fc414609f9c5aefadee3 100644
--- a/LCS/Common/src/BlobArrayHeader.h
+++ b/LCS/Common/src/BlobArrayHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBARRAYHEADER_H
 #define LOFAR_COMMON_BLOBARRAYHEADER_H
 
-// \file BlobArrayHeader
+// \file BlobArrayHeader.h
 // Standard array header for a blob.
 
 #include <Common/BlobHeader.h>
diff --git a/LCS/Common/src/BlobException.h b/LCS/Common/src/BlobException.h
index 2e5117da137a26ea3bd6efcd3d4284e51ff52ea8..c7de17c46bae49c69978ecfd524d27f5db57e7b2 100644
--- a/LCS/Common/src/BlobException.h
+++ b/LCS/Common/src/BlobException.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBEXCEPTION_H
 #define LOFAR_COMMON_BLOBEXCEPTION_H
 
-// \fileBlobException
+// \fileBlobException.h
 // Blob Exception class. 
 
 //# Includes
diff --git a/LCS/Common/src/BlobField.h b/LCS/Common/src/BlobField.h
index 1b7bd11dfb3ea767b6a5131cc33d188d0d293e4a..76a44d9e4d40e8719cdd7fc558381fb5ccdfb51a 100644
--- a/LCS/Common/src/BlobField.h
+++ b/LCS/Common/src/BlobField.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELD_H
 #define LOFAR_COMMON_BLOBFIELD_H
 
-// \file  BlobField
+// \file  BlobField.h
 // Definition of a field in a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobFieldSet.h b/LCS/Common/src/BlobFieldSet.h
index f625e5908d4dd7ad0763cc176679cbf43e6ed17c..bb5a74a220b4f5b1c6b45ef50c9603bf5452e6a4 100644
--- a/LCS/Common/src/BlobFieldSet.h
+++ b/LCS/Common/src/BlobFieldSet.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBFIELDSET_H
 #define LOFAR_COMMON_BLOBFIELDSET_H
 
-// \file BlobFieldSet
+// \file BlobFieldSet.h
 // Definition all fields in a blob.
 
 #include <Common/BlobField.h>
diff --git a/LCS/Common/src/BlobHeader.h b/LCS/Common/src/BlobHeader.h
index c78fa2351771373c2e2fa771aabd14814e48d210..40f53fbed65ea956df869596361c8776340d5b05 100644
--- a/LCS/Common/src/BlobHeader.h
+++ b/LCS/Common/src/BlobHeader.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBHEADER_H
 #define LOFAR_COMMON_BLOBHEADER_H
 
-// \file BlobHeader
+// \file BlobHeader.h
 // Standard header for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobIBufChar.h b/LCS/Common/src/BlobIBufChar.h
index 0702f37edf910c417434920a492e1b7dc43365bd..465707e47eb4a9d93ab6f12114b26944f070ffaa 100644
--- a/LCS/Common/src/BlobIBufChar.h
+++ b/LCS/Common/src/BlobIBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFCHAR_H
 #define LOFAR_COMMON_BLOBIBUFCHAR_H
 
-// \file BlobIBufChar
+// \file BlobIBufChar.h
 // Input buffer for a blob using a plain pointer.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Common/src/BlobIBufStream.h b/LCS/Common/src/BlobIBufStream.h
index bc9a1cebabad8b2ca0ae697d587302009b75823f..6761bcfc608f1ae739dfd7085107b13593c4a32c 100644
--- a/LCS/Common/src/BlobIBufStream.h
+++ b/LCS/Common/src/BlobIBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTREAM_H
 #define LOFAR_COMMON_BLOBIBUFSTREAM_H
 
-// \file BlobIBufStream
+// \file BlobIBufStream.h
 // Input buffer for a blob using an istream.
 
 #include <Common/BlobIBuffer.h>
diff --git a/LCS/Common/src/BlobIBufString.h b/LCS/Common/src/BlobIBufString.h
index 790054f0c0153994d7a14bc72b95f190555d8401..b2da09431effa373de857d045748c0277aa8a2fb 100644
--- a/LCS/Common/src/BlobIBufString.h
+++ b/LCS/Common/src/BlobIBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFSTRING_H
 #define LOFAR_COMMON_BLOBIBUFSTRING_H
 
-// \file BlobIBufString
+// \file BlobIBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Common/src/BlobIBufVector.h b/LCS/Common/src/BlobIBufVector.h
index b50073b08de2d84cfaf3e114a4ede496dfb81f72..4c4073221719663ed4a67f96285fe83f67e94025 100644
--- a/LCS/Common/src/BlobIBufVector.h
+++ b/LCS/Common/src/BlobIBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFVECTOR_H
 #define LOFAR_COMMON_BLOBIBUFVECTOR_H
 
-// \file BlobIBufVector
+// \file BlobIBufVector.h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobIBufChar.h>
diff --git a/LCS/Common/src/BlobIBuffer.h b/LCS/Common/src/BlobIBuffer.h
index 9b47a50d9cdfd56cee3a3115480ad693220b1686..ce0f2b0c4cb9ec45e73f4ff2b892ad7e3441c944 100644
--- a/LCS/Common/src/BlobIBuffer.h
+++ b/LCS/Common/src/BlobIBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBIBUFFER_H
 #define LOFAR_COMMON_BLOBIBUFFER_H
 
-// \file BlobIBuffer
+// \file BlobIBuffer.h
 // Abstract base class for input buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobIStream.h b/LCS/Common/src/BlobIStream.h
index 61a66db20c3a72abac1250fc6cd9069cd4fa2455..8057c96322406fa2d9d4add79ffdb03a7c567b63 100644
--- a/LCS/Common/src/BlobIStream.h
+++ b/LCS/Common/src/BlobIStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBISTREAM_H
 #define LOFAR_COMMON_BLOBISTREAM_H
 
-// \file BlobIStream
+// \file BlobIStream.h
 // Input stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobOBufChar.h b/LCS/Common/src/BlobOBufChar.h
index 6993d2188bc33cf3c98098095c241f7c02eef8fe..62087760b216a332addbac985ce1d94710da7b87 100644
--- a/LCS/Common/src/BlobOBufChar.h
+++ b/LCS/Common/src/BlobOBufChar.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFCHAR_H
 #define LOFAR_COMMON_BLOBOBUFCHAR_H
 
-// \file BlobOBufChar
+// \file BlobOBufChar.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/src/BlobOBufNull.h b/LCS/Common/src/BlobOBufNull.h
index 9256bb169bacc62f130962a47dad588f2292447c..70ff05999e903bf7b4ec58306a576de4dc78bf23 100644
--- a/LCS/Common/src/BlobOBufNull.h
+++ b/LCS/Common/src/BlobOBufNull.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFNULL_H
 #define LOFAR_COMMON_BLOBOBUFNULL_H
 
-// \file  BlobOBufNull
+// \file  BlobOBufNull.h
 // Output buffer for a blob using a plain pointer.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/src/BlobOBufStream.h b/LCS/Common/src/BlobOBufStream.h
index 4e0b726f8640cf13b3d2764d4fe262e928368ef8..fe62a212978050c21d4e92751cec498f91d320a1 100644
--- a/LCS/Common/src/BlobOBufStream.h
+++ b/LCS/Common/src/BlobOBufStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTREAM_H
 #define LOFAR_COMMON_BLOBOBUFSTREAM_H
 
-// \file BlobOBufStream
+// \file BlobOBufStream.h
 // Output buffer for a blob using an ostream.
 
 #include <Common/BlobOBuffer.h>
diff --git a/LCS/Common/src/BlobOBufString.h b/LCS/Common/src/BlobOBufString.h
index 4f3a7c92a8cc49cfd05db5c3ebfc473cd543e94e..6a121f54cad6b5a614c2e2ef0339182e30d28dac 100644
--- a/LCS/Common/src/BlobOBufString.h
+++ b/LCS/Common/src/BlobOBufString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFSTRING_H
 #define LOFAR_COMMON_BLOBOBUFSTRING_H
 
-// \file BlobOBufString
+// \file BlobOBufString.h
 // Input buffer for a blob using a string.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Common/src/BlobOBufVector.h b/LCS/Common/src/BlobOBufVector.h
index 772111c2b2a155739af50272bb9cc6084ccdd165..700609707ce9ed1b76bee5f5388c1228204199bc 100644
--- a/LCS/Common/src/BlobOBufVector.h
+++ b/LCS/Common/src/BlobOBufVector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFVECTOR_H
 #define LOFAR_COMMON_BLOBOBUFVECTOR_H
 
-// \file BlobOBufVector 
+// \file BlobOBufVector .h
 // Input buffer for a blob using a vector.
 
 #include <Common/BlobOBufChar.h>
diff --git a/LCS/Common/src/BlobOBuffer.h b/LCS/Common/src/BlobOBuffer.h
index 9920a9b8a29495185fd5dcd6274bfdba0d82a6f6..38ab939f69b5be86c98b21b746ac7a8d25889086 100644
--- a/LCS/Common/src/BlobOBuffer.h
+++ b/LCS/Common/src/BlobOBuffer.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOBUFFER_H
 #define LOFAR_COMMON_BLOBOBUFFER_H
 
-// \file  BlobOBuffer
+// \file  BlobOBuffer.h
 // Abstract base class for output buffer for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobOStream.h b/LCS/Common/src/BlobOStream.h
index f78a06e2c38d380cce763b5dcbac15b4e0b84ef4..dcef33be103a2ec4cc0c939e7578a35a3eb86dd2 100644
--- a/LCS/Common/src/BlobOStream.h
+++ b/LCS/Common/src/BlobOStream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBOSTREAM_H
 #define LOFAR_COMMON_BLOBOSTREAM_H
 
-// \file BlobOStream
+// \file BlobOStream.h
 // Output stream for a blob.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobString.h b/LCS/Common/src/BlobString.h
index b74b073f8ef439f3c55fb6f7344e84afd86bda15..1c391b4814d7c39f6bd76902759a7e35f806c41c 100644
--- a/LCS/Common/src/BlobString.h
+++ b/LCS/Common/src/BlobString.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRING_H
 #define LOFAR_COMMON_BLOBSTRING_H
 
-// \file BlobString
+// \file BlobString.h
 //Blob buffer that can be a string<uchar> or char.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/BlobStringTraits.h b/LCS/Common/src/BlobStringTraits.h
index 0a15f141528f9e1626217be58b9327d4b7a5b0f4..8beb1b8a9c87ed1a1709b8891deaf25b058d82d0 100644
--- a/LCS/Common/src/BlobStringTraits.h
+++ b/LCS/Common/src/BlobStringTraits.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTRAITS_H
 #define LOFAR_COMMON_BLOBSTRINGTRAITS_H
 
-// \file BlobStringTraits
+// \file BlobStringTraits.h
 // char_traits<uchar> implementation for GCC.
 
 // This file implements the char_traits<unsigned char> specialisation.
diff --git a/LCS/Common/src/BlobStringType.h b/LCS/Common/src/BlobStringType.h
index 9bae78f5dfe0ed09b6985d9d533ccdf7f8dc8dba..3394d52bedd85f66c27ae2726003cbdb1a1f4829 100644
--- a/LCS/Common/src/BlobStringType.h
+++ b/LCS/Common/src/BlobStringType.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_BLOBSTRINGTYPE_H
 #define LOFAR_COMMON_BLOBSTRINGTYPE_H
 
-// \file BlobStringType
+// \file BlobStringType.h
 //Define type for a blob string.
 
 #include <Common/Allocator.h>
diff --git a/LCS/Common/src/CheckConfig.h b/LCS/Common/src/CheckConfig.h
index b59266d8b0de279efafbaad83c2498bbb08de7cf..d151747f6a881650a0821e7572b6a8fedd2fe595 100644
--- a/LCS/Common/src/CheckConfig.h
+++ b/LCS/Common/src/CheckConfig.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_CHECKCONFIG_H
 #define LOFAR_COMMON_CHECKCONFIG_H
 
-// \file CheckConfig
+// \file CheckConfig.h
 // Macros for declaring a config-dependent data structure.
 
 // The CHECK_CONFIG macros should be used if and when you declare a
diff --git a/LCS/Common/src/DataConvert.h b/LCS/Common/src/DataConvert.h
index e3d1c197fc71ba2ffbef3333c55e939d06d321b4..4148b9a6dcc2c559d5d92d47312d5e74851eae4a 100644
--- a/LCS/Common/src/DataConvert.h
+++ b/LCS/Common/src/DataConvert.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DATACONVERT_H
 #define LOFAR_COMMON_DATACONVERT_H
 
-// \file DataConvert
+// \file DataConvert.h
 // Global functions to convert data values.
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/DataFormat.h b/LCS/Common/src/DataFormat.h
index caa856ed7527e42ebeaa8c1e251fdb57fe43145d..71acdb632c9d10c61c394200c3f991c545f0fa3a 100644
--- a/LCS/Common/src/DataFormat.h
+++ b/LCS/Common/src/DataFormat.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DATAFORMAT_H
 #define LOFAR_COMMON_DATAFORMAT_H
 
-// \file DataFormat
+// \file DataFormat.h
 // Get the data format (endian type).
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/Debug.h b/LCS/Common/src/Debug.h
index 44334eef64e6d720fb3a19a0b3b100c7f21bed60..a236706b03e1a87c94b01ca00177ba6db24aaf58 100644
--- a/LCS/Common/src/Debug.h
+++ b/LCS/Common/src/Debug.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_DEBUG_H
 #define LOFAR_COMMON_DEBUG_H
 
-// \file Debug.h
+// \file Debug.h.h
 //
 
 #ifdef __DEPRECATED
diff --git a/LCS/Common/src/Exception.h b/LCS/Common/src/Exception.h
index 484e2c162db16cd8b39acbf611c272b93b154f29..de771db541fbbc0a3bec1dc70ce1fb530a4ae8ad 100644
--- a/LCS/Common/src/Exception.h
+++ b/LCS/Common/src/Exception.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_EXCEPTION_H
 #define LOFAR_COMMON_EXCEPTION_H
 
-// \file Exception
+// \file Exception.h
 // LCS Exception base class.
 
 //# Includes
diff --git a/LCS/Common/src/HEADER.h b/LCS/Common/src/HEADER.h
index b642879dd75c2d61fca6ef0aeed6bbe9644d22ab..fe84577d7f9162e9870ca8fca8a57c341318745c 100644
--- a/LCS/Common/src/HEADER.h
+++ b/LCS/Common/src/HEADER.h
@@ -25,7 +25,7 @@
 
 //# Never #include <config.h> or #include <lofar_config.h> in a header file!
 
-// \file filename
+// \file filename.h
 // one line description.
 
 //# Includes
diff --git a/LCS/Common/src/KeyParser.h b/LCS/Common/src/KeyParser.h
index 743734276df0af0abc52e549f66e630030012e9b..222d0ccb96da44f801e14957a0523e61033245b6 100644
--- a/LCS/Common/src/KeyParser.h
+++ b/LCS/Common/src/KeyParser.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYPARSER_H
 #define LOFAR_COMMON_KEYPARSER_H
 
-// \file KeyParser
+// \file KeyParser.h
 // Class for parsing a key=value line.
 
 //# Includes
diff --git a/LCS/Common/src/KeyValue.h b/LCS/Common/src/KeyValue.h
index feab45d7185ecea71c5c87280bcf9cd4e40f6783..bcf16b3ec93d5c0b14e6ef3e6446183a56c71c95 100644
--- a/LCS/Common/src/KeyValue.h
+++ b/LCS/Common/src/KeyValue.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUE_H
 #define LOFAR_COMMON_KEYVALUE_H
 
-// \file KeyValue
+// \file KeyValue.h
 // Class to hold a general value.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/KeyValueMap.h b/LCS/Common/src/KeyValueMap.h
index ebc2f1befb6da32523ecc6e7fe9d839ed89d9b6a..41bc2db800cb90b433d7a568e99562b1a4cb64c2 100644
--- a/LCS/Common/src/KeyValueMap.h
+++ b/LCS/Common/src/KeyValueMap.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_KEYVALUEMAP_H
 #define LOFAR_COMMON_KEYVALUEMAP_H
 
-// \file KeyValueMap
+// \file KeyValueMap.h
 // Class to hold a collection of key name/value pairs.
 
 #include <Common/KeyValue.h>
diff --git a/LCS/Common/src/LofarLog4Cplus.h b/LCS/Common/src/LofarLog4Cplus.h
index 4c3e21a528a43d1a4c8b747cedd911e7bcc50071..a407fb4c280902ca542e3fe1241c9c1b65812ace 100644
--- a/LCS/Common/src/LofarLog4Cplus.h
+++ b/LCS/Common/src/LofarLog4Cplus.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOG4CPLUS_H
 #define LOFAR_COMMON_LOG4CPLUS_H
 
-// \file LofarLog4Cplus
+// \file LofarLog4Cplus.h
 // Interface to the log4cplus logging package
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/LofarLogCout.h b/LCS/Common/src/LofarLogCout.h
index 2fc58b6cfca32182155be249c9264429053264fc..4b1772cf8aba84135b4d2471e075de31b5969455 100644
--- a/LCS/Common/src/LofarLogCout.h
+++ b/LCS/Common/src/LofarLogCout.h
@@ -23,7 +23,7 @@
 //# No include guard is used, because it should only be included indirectly
 //# by LofarLogger.h (and by LofarLogCout.cc).
 
-// \file LofarLogCout
+// \file LofarLogCout.h
 //  Macro interface to the cout/cerr logging implementation
 
 #include <Common/lofar_iostream.h>
diff --git a/LCS/Common/src/LofarLogger.h b/LCS/Common/src/LofarLogger.h
index 1e3bfdd780f1ca54bcf7f6cbd1b741f8165dd7e7..e27f45b92149844cfb7e246612231bcb3fc1fd19 100644
--- a/LCS/Common/src/LofarLogger.h
+++ b/LCS/Common/src/LofarLogger.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARLOGGER_H
 #define LOFAR_COMMON_LOFARLOGGER_H
 
-// \file LofarLogger
+// \file LofarLogger.h
 // Macro interface to the lofar logging package
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/LofarTypedefs.h b/LCS/Common/src/LofarTypedefs.h
index 8fd5251f8010cdca9700b5fefdc980af2143f32c..c0d67dafbe97a472a3ea8703747162ffc06da972 100644
--- a/LCS/Common/src/LofarTypedefs.h
+++ b/LCS/Common/src/LofarTypedefs.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARTYPEDEFS_H
 #define LOFAR_COMMON_LOFARTYPEDEFS_H
 
-// \file LofarTypedefs
+// \file LofarTypedefs.h
 //
 
 #include <complex>
diff --git a/LCS/Common/src/LofarTypes.h b/LCS/Common/src/LofarTypes.h
index b2b2d46a1e97e4ffe2fe37f73747fbe33e780625..cc361f898794f2da63645a6f500131d41f40b007 100644
--- a/LCS/Common/src/LofarTypes.h
+++ b/LCS/Common/src/LofarTypes.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFARTYPES_H
 #define LOFAR_COMMON_LOFARTYPES_H
 
-// \file LofarTypes
+// \file LofarTypes.h
 //
 
 #include <Common/LofarTypedefs.h>
@@ -41,7 +41,7 @@
 
 namespace LOFAR
 {
-  // \addtogroup LOFAR
+  // \addtogroup Common
   // @{
 
   //# Make the type names defined in LofarTypedefs.h available in the
diff --git a/LCS/Common/src/Lonumerics.h b/LCS/Common/src/Lonumerics.h
index ff959eaa59fa4408f5864ed729e2c8996643a220..2e938de2fa26470fa3a7d208935ccfbfdffc9a94 100644
--- a/LCS/Common/src/Lonumerics.h
+++ b/LCS/Common/src/Lonumerics.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LONUMERICS_H
 #define LOFARCOMMON_LONUMERICS_H 1
 
-// \file Lonumerics
+// \file Lonumerics.h
 // Define numeric types
 
 #include <Common/LofarTypes.h>
diff --git a/LCS/Common/src/Lorrays-Blitz.h b/LCS/Common/src/Lorrays-Blitz.h
index 307fa1fc13da139c4d63139bfcb5f5118dfe4c7b..4d4a74167169d1be953168763dc3fc5aea5f67c9 100644
--- a/LCS/Common/src/Lorrays-Blitz.h
+++ b/LCS/Common/src/Lorrays-Blitz.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LORRAYS_BLITZ_H
 #define LOFAR_COMMON_LORRAYS_BLITZ_H
 
-// \file Lorrays-Blitz
+// \file Lorrays-Blitz.h
 // Define Blitz array types
 
 // other code can use this symbol to check for blitz arrays
diff --git a/LCS/Common/src/Lorrays.h b/LCS/Common/src/Lorrays.h
index 01738741aa3efbb098889cc9181e917bd44fd4e8..cde2251b3f4ebb95fc9ff53bf4e9e7fcfeb910ff 100644
--- a/LCS/Common/src/Lorrays.h
+++ b/LCS/Common/src/Lorrays.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LORRAYS_H
 #define LOFAR_COMMON_LORRAYS_H
 
-// \file Lorrays
+// \file Lorrays.h
 // Define Array type to use (Blitz or AIPS++
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/RunOnNode.h b/LCS/Common/src/RunOnNode.h
index 564c1e1581f851567dbaf0a98f37afd626201168..73249b0943a8453be4c1c2c36cb65427bf71252f 100644
--- a/LCS/Common/src/RunOnNode.h
+++ b/LCS/Common/src/RunOnNode.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_LCS_RUNONNODE_H
 #define LOFAR_LCS_RUNONNODE_H
 
-// \file RunOnNode
+// \file RunOnNode.h
 //
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/Stopwatch.h b/LCS/Common/src/Stopwatch.h
index 3728cd1b691c90cdb675de98a6e111039c9bbaf4..8f50a2d8cf6836d166d7a0aa25c64a7f9212c96c 100644
--- a/LCS/Common/src/Stopwatch.h
+++ b/LCS/Common/src/Stopwatch.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STOPWATCH_H
 #define LOFAR_COMMON_STOPWATCH_H
 
-// \file StopWatch
+// \file StopWatch.h
 // timer class
 
 //# Includes
diff --git a/LCS/Common/src/StringUtil.h b/LCS/Common/src/StringUtil.h
index fc0672e4b9e69786a8b41ad3144c92f5641f4f06..781312d9a00e42eedd922fdb4b5caaebd8c3c799 100644
--- a/LCS/Common/src/StringUtil.h
+++ b/LCS/Common/src/StringUtil.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRINGUTIL_H
 #define LOFAR_COMMON_STRINGUTIL_H
 
-// \fileStringUtil
+// \fileStringUtil.h
 
 
 //#include <lofar_config.h>
diff --git a/LCS/Common/src/Thread.h b/LCS/Common/src/Thread.h
index db96fef399a88210b179b77fd607533cdbbe1c15..04fb93094b819dd3ba903261e45a2c800566576d 100644
--- a/LCS/Common/src/Thread.h
+++ b/LCS/Common/src/Thread.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_THREAD_H
 #define LOFAR_COMMON_THREAD_H
    
-// \file Thread
+// \file Thread.h
 // basic header for the Thread package 
 
 #include <Common/Thread/Thread.h>
diff --git a/LCS/Common/src/Timer.h b/LCS/Common/src/Timer.h
index 7f13d27591ccaabdd028032cc31d7b0206cddd89..37ef2a10fbad4f0a0179c0738b621fde0b27e1f0 100644
--- a/LCS/Common/src/Timer.h
+++ b/LCS/Common/src/Timer.h
@@ -24,6 +24,7 @@
 #define LOFAR_COMMON_TIMER_H
 
 // \file Timer
+.h
 // Accurate timer
 
 #include <cstdlib>
diff --git a/LCS/Common/src/TypeNames.h b/LCS/Common/src/TypeNames.h
index da6e6daddc199e58098e6e6fd23b6f90aed35eea..a28646f11a74ba62cfb408b357db941dffc38d18 100644
--- a/LCS/Common/src/TypeNames.h
+++ b/LCS/Common/src/TypeNames.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_TYPENAMES_H
 #define LOFAR_COMMON_TYPENAMES_H
 
-// \file TypeNames
+// \file TypeNames.h
 // Return a string giving the type name to be stored in blobs.
 
 //# Includes
diff --git a/LCS/Common/src/VectorUtil.h b/LCS/Common/src/VectorUtil.h
index cd5d5f09bd81b6c3df8d7397b933d32ee15bdbc6..dd894c3028f554c93bad2d6d60acc3a7a59d95e6 100644
--- a/LCS/Common/src/VectorUtil.h
+++ b/LCS/Common/src/VectorUtil.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_VECTORUTIL_H
 #define LOFAR_COMMON_VECTORUTIL_H
 
-// \file VectorUtil
+// \file VectorUtil.h
 // Utility functions on the std::vector class.
 
 #include <vector>
diff --git a/LCS/Common/src/hexdump.h b/LCS/Common/src/hexdump.h
index f16a7d7e20964218138b3f6c48f0f25c93a4bf01..f472eebd104245b5610ce73e7546f2dc6a55c9ea 100644
--- a/LCS/Common/src/hexdump.h
+++ b/LCS/Common/src/hexdump.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_HEXDUMP_H
 #define LOFAR_COMMON_HEXDUMP_H
 
-// \file hexdump
+// \file hexdump.h
 // create hexdump of given datablock.
 
 #include <lofar_config.h>
diff --git a/LCS/Common/src/lofar_algorithm.h b/LCS/Common/src/lofar_algorithm.h
index 52d5b83132af39da792a98fb5430b4176125e417..8c66b9332d59a7d180e6067bc60597b40b9f6f5d 100644
--- a/LCS/Common/src/lofar_algorithm.h
+++ b/LCS/Common/src/lofar_algorithm.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_ALGORITHM_H
 #define LOFAR_COMMON_LOFAR_ALGORITHM_H
 
-// \file lofar_algorithm
+// \file lofar_algorithm.h
 //
 
 #include <algorithm>
diff --git a/LCS/Common/src/lofar_complex.h b/LCS/Common/src/lofar_complex.h
index 60212daf68ff86e06373c6c58463d001213497d4..000dd487aa4c94c48be1b94afe66ea8636f38dc5 100644
--- a/LCS/Common/src/lofar_complex.h
+++ b/LCS/Common/src/lofar_complex.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_COMPLEX_H
 #define LOFAR_COMMON_LOFAR_COMPLEX_H
 
-// \file lofar_complex
+// \file lofar_complex.h
 //
 
 #include <complex>
diff --git a/LCS/Common/src/lofar_fstream.h b/LCS/Common/src/lofar_fstream.h
index cc77fb448d0cffa58876971a9d531f9cc801b09f..076937d74a3875f2dd665c2491e9c1eb15038ba3 100644
--- a/LCS/Common/src/lofar_fstream.h
+++ b/LCS/Common/src/lofar_fstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_FSTREAM_H
 #define LOFAR_COMMON_LOFAR_FSTREAM_H
 
-// \file lofar_fstream
+// \file lofar_fstream.h
 //
 
 #include <fstream>
diff --git a/LCS/Common/src/lofar_global_symbol_warning.h b/LCS/Common/src/lofar_global_symbol_warning.h
index 63a45e0573faaa253b4c4e3054d80275ef6ae57b..e7c4a0f1918a5176cb0304dd7b9cade9aa1638bf 100644
--- a/LCS/Common/src/lofar_global_symbol_warning.h
+++ b/LCS/Common/src/lofar_global_symbol_warning.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_GLOBAL_SYMBOL_WARNING_H
 #define LOFAR_COMMON_LOFAR_GLOBAL_SYMBOL_WARNING_H
 
-// \file lofar_global_symbol_warning
+// \file lofar_global_symbol_warning.h
 //
 
 // \addtogroup Common
diff --git a/LCS/Common/src/lofar_iomanip.h b/LCS/Common/src/lofar_iomanip.h
index a0ecb2965b4d38312ec526f8d74964ed6f4f2c81..666a696502f410a02cab78b0da058eb1e84f7de1 100644
--- a/LCS/Common/src/lofar_iomanip.h
+++ b/LCS/Common/src/lofar_iomanip.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_IOMANIP_H
 #define LOFAR_COMMON_LOFAR_IOMANIP_H
 
-// \file lofar_iomanip
+// \file lofar_iomanip.h
 //
 
 #include <iomanip>
diff --git a/LCS/Common/src/lofar_iostream.h b/LCS/Common/src/lofar_iostream.h
index 94c7d85be74d7746638744bb8aaa155a667f0c32..e3bb0c4734a052e8f77cc243fc213accbc537082 100644
--- a/LCS/Common/src/lofar_iostream.h
+++ b/LCS/Common/src/lofar_iostream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_IOSTREAM_H
 #define LOFAR_COMMON_LOFAR_IOSTREAM_H
 
-// \file lofar_iostream
+// \file lofar_iostream.h
 //
 
 #include <Common/lofar_iosfwd.h>
diff --git a/LCS/Common/src/lofar_list.h b/LCS/Common/src/lofar_list.h
index 4375d2b1a4378fc2eec175e9e72dd93a5e72d575..1b92bf17d4390bf9c419bcb08129c4592ea38806 100644
--- a/LCS/Common/src/lofar_list.h
+++ b/LCS/Common/src/lofar_list.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_LOFAR_LIST_H
 #define LOFAR_COMMON_LOFAR_LIST_H
 
-// \file lofar_list
+// \file lofar_list.h
 //
 
 #include <list>
diff --git a/LCS/Common/src/lofar_map.h b/LCS/Common/src/lofar_map.h
index 898d7a62c2dec7f2668e3db64119aa59ca67006a..e97a46f63919e67e38180f204b64dcb754934295 100644
--- a/LCS/Common/src/lofar_map.h
+++ b/LCS/Common/src/lofar_map.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_MAP_H
 #define LOFAR_COMMON_MAP_H
 
-// \file lofar_map
+// \file lofar_map.h
 //
 
 #include <map>
diff --git a/LCS/Common/src/lofar_sstream.h b/LCS/Common/src/lofar_sstream.h
index b3e258232494b77cd355a1f51873b03f9887c8a3..e17313beec2569497f34a93b36cc994f3e5d6f72 100644
--- a/LCS/Common/src/lofar_sstream.h
+++ b/LCS/Common/src/lofar_sstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_SSTREAM_H
 #define LOFAR_COMMON_SSTREAM_H
 
-// \file lofar_sstream
+// \file lofar_sstream.h
 //
 
 #include <sstream>
diff --git a/LCS/Common/src/lofar_stack.h b/LCS/Common/src/lofar_stack.h
index 7cd805a5fbc78d591bfe48c5b4d5fac23465af38..8d5bf621381782150099459f8327965ff3c8874d 100644
--- a/LCS/Common/src/lofar_stack.h
+++ b/LCS/Common/src/lofar_stack.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STACK_H
 #define LOFAR_COMMON_STACK_H
 
-// \file lofar_stack
+// \file lofar_stack.h
 //
 
 #include <Common/lofar_deque.h>
diff --git a/LCS/Common/src/lofar_string.h b/LCS/Common/src/lofar_string.h
index 73f470d4ad1415bb9ac0c509a54ca22e3e3bc4f6..d024cc0b2ddd39c51a2b2bef277d9c44ac31921a 100644
--- a/LCS/Common/src/lofar_string.h
+++ b/LCS/Common/src/lofar_string.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRING_H
 #define LOFAR_COMMON_STRING_H
 
-// \file lofar_string
+// \file lofar_string.h
 //
 #include <string>
 
diff --git a/LCS/Common/src/lofar_strstream.h b/LCS/Common/src/lofar_strstream.h
index e4c6ff3a93403217567e09c3e547dbe95a062ddd..a1e49b1fe69f2242f81bdd9c2d818843a47a92e7 100644
--- a/LCS/Common/src/lofar_strstream.h
+++ b/LCS/Common/src/lofar_strstream.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_STRSTREAM_H
 #define LOFAR_COMMON_STRSTREAM_H
 
-// \file lofar_strstream
+// \file lofar_strstream.h
 //
 
 // The strstream classes are considered deprecated. The are not supported
diff --git a/LCS/Common/src/lofar_vector.h b/LCS/Common/src/lofar_vector.h
index 750edb3e98e53a5d8eae04643b1aeff79bd214f2..acb3464bfcc5bdb295ce88214b1c9bf72d04e7cd 100644
--- a/LCS/Common/src/lofar_vector.h
+++ b/LCS/Common/src/lofar_vector.h
@@ -23,7 +23,7 @@
 #ifndef LOFAR_COMMON_VECTOR_H
 #define LOFAR_COMMON_VECTOR_H
 
-// \file lofar_vector
+// \file lofar_vector.h
 //
 
 #include <vector>