diff --git a/FileIO/RapidXmlIO/zLibDataCompressor.cpp b/FileIO/RapidXmlIO/zLibDataCompressor.cpp
index 3a5b67bd6ed8b1a31bf99e6551276579969a3e5a..98cac6bfcdb2316c9d0549ffdd7aced96e79f59e 100644
--- a/FileIO/RapidXmlIO/zLibDataCompressor.cpp
+++ b/FileIO/RapidXmlIO/zLibDataCompressor.cpp
@@ -10,9 +10,6 @@
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
  *
- * \file zLibDataCompressor.cpp
- *
- * Created on 2012-11-26 by Karsten Rink
  * Based on the vtkZLibDataCompressor-class in VTK 5.6
  */
 
diff --git a/FileIO/RapidXmlIO/zLibDataCompressor.h b/FileIO/RapidXmlIO/zLibDataCompressor.h
index 0c22c6c8fa03b108962e41d2dc875e8729c1b28b..33023fcc0edc730128e65666fe7b3c8e0e83386d 100644
--- a/FileIO/RapidXmlIO/zLibDataCompressor.h
+++ b/FileIO/RapidXmlIO/zLibDataCompressor.h
@@ -11,9 +11,6 @@
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
  *
- * \file zLibDataCompressor.h
- *
- * Created on 2012-11-26 by Karsten Rink
  * Based on the vtkZLibDataCompressor-class in VTK 5.6
  */
 
diff --git a/Gui/Vrpn/QSpaceNavigatorClient.cpp b/Gui/Vrpn/QSpaceNavigatorClient.cpp
index 0cd1c0942522ca07c3e5fa5634e094b8744bc0f6..1f77721e038e169228f6ef1e514bf2ece6c337b1 100644
--- a/Gui/Vrpn/QSpaceNavigatorClient.cpp
+++ b/Gui/Vrpn/QSpaceNavigatorClient.cpp
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file QSpaceNavigatorClient.cpp
- *
- * Created on 2010-08-31 by Lars Bilke
  */
 
 // ** INCLUDES **
diff --git a/Gui/Vrpn/QSpaceNavigatorClient.h b/Gui/Vrpn/QSpaceNavigatorClient.h
index ac84dd8c86362824ec13d01e4b13704546acf0e7..468bd6f8064a4adc66faca1f0ca780f37dc4b1db 100644
--- a/Gui/Vrpn/QSpaceNavigatorClient.h
+++ b/Gui/Vrpn/QSpaceNavigatorClient.h
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file QSpaceNavigatorClient.h
- *
- * Created on 2010-08-31 by Lars Bilke
  */
 
 #ifndef QSPACENAVIGATORCLIENT_H
diff --git a/Gui/Vrpn/QVrpnArtTrackingClient.cpp b/Gui/Vrpn/QVrpnArtTrackingClient.cpp
index 3825748b71934d39e101542ad964a6107210db8b..91c7cd2e71b20868715b45d3b0e8635f7eb1bcdc 100644
--- a/Gui/Vrpn/QVrpnArtTrackingClient.cpp
+++ b/Gui/Vrpn/QVrpnArtTrackingClient.cpp
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file QVrpnArtTrackingClient.cpp
- *
- * Created on 2010-09-03 by Lars Bilke
  */
 
 // ** INCLUDES **
diff --git a/Gui/Vrpn/QVrpnArtTrackingClient.h b/Gui/Vrpn/QVrpnArtTrackingClient.h
index f2322067bbbb6205bf9f194b7f038398fa8686a9..cef8921b893e7666f9be60759e77ed3a249a447a 100644
--- a/Gui/Vrpn/QVrpnArtTrackingClient.h
+++ b/Gui/Vrpn/QVrpnArtTrackingClient.h
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file QVrpnArtTrackingClient.h
- *
- * Created on 2010-09-03 by Lars Bilke
  */
 
 #ifndef QVRPNARTTRACKINGCLIENT_H
diff --git a/Gui/Vrpn/TrackingSettingsWidget.cpp b/Gui/Vrpn/TrackingSettingsWidget.cpp
index cbaea1183afc1e0881d997d5d5162e1f9a023e11..b44477685ca8d763da9321851275edcd3ed4651f 100644
--- a/Gui/Vrpn/TrackingSettingsWidget.cpp
+++ b/Gui/Vrpn/TrackingSettingsWidget.cpp
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file TrackingSettingsWidget.cpp
- *
- * Created on 2010-09-06 by Lars Bilke
  */
 
 // ** INCLUDES **
diff --git a/Gui/Vrpn/TrackingSettingsWidget.h b/Gui/Vrpn/TrackingSettingsWidget.h
index 9635d3fb52e9f2f8fb5b3eabb0ac1196b99d7be5..f7f553ccf6bcd0b5ceb0c277750b65d751444ac1 100644
--- a/Gui/Vrpn/TrackingSettingsWidget.h
+++ b/Gui/Vrpn/TrackingSettingsWidget.h
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file TrackingSettingsWidget.h
- *
- * Created on 2010-09-06 by Lars Bilke
  */
 
 #ifndef TRACKINGSETTINGSWIDGET_H
diff --git a/Gui/Vrpn/VrpnClient.cpp b/Gui/Vrpn/VrpnClient.cpp
index 500dcb5ed9e62ff3c579a2c3d213d3f6db07f5d8..c45026824970459c9ece3fe1077de9246868949c 100644
--- a/Gui/Vrpn/VrpnClient.cpp
+++ b/Gui/Vrpn/VrpnClient.cpp
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file VrpnClient.cpp
- *
- * Created on 2010-08-30 by Lars Bilke
  */
 
 // ** INCLUDES **
diff --git a/Gui/Vrpn/VrpnClient.h b/Gui/Vrpn/VrpnClient.h
index 60b34375ab52a6f479d2723722a81068d3a65f28..443df6a0587d2fdf26f8a1e68e8f86d74d9a6b8c 100644
--- a/Gui/Vrpn/VrpnClient.h
+++ b/Gui/Vrpn/VrpnClient.h
@@ -1,12 +1,14 @@
 /**
+ * \file
+ * \author Lars Bilke
+ * \date 2010-08-31
+ *
+ * \copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.net/LICENSE.txt
  *
- * \file VrpnClient.h
- *
- * Created on 2010-08-30 by Lars Bilke
  */
 
 #ifndef VRPNCLIENT_H
diff --git a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
index 8b3cc72dd65c41c22851ed02b7fa85ef9eef6c5d..7200b5649dc752fc908d891ed656311915d1fa07 100644
--- a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
+++ b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
@@ -1,7 +1,14 @@
 /**
- * MatTestRemoveRowsCols.cpp
+ * \file
+ * \author Thomas Fischer
+ * \date   2011-11-08
+ * \brief  Test for removing entries in matrices.
  *
- * Created on 2011-11-08 by Thomas Fischer
+ * \copyright
+ * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
  */
 
 #include <fstream>
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index 4a1c9dcb62c6bc42e2744f5fe43c8d6009eea045..836f3e301b220b88b81a8d3e06da831bbbd70e69 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -1,7 +1,15 @@
-/*
- * MeshRead.cpp
+/**
+ * \file
+ * \author Karsten Rink
+ * \date   2012/05/09
+ * \brief  Test for reading meshes.
+ *
+ * \copyright
+ * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
  *
- * Created on 2012/05/09 by Karsten Rink
  */
 
 // BaseLib
diff --git a/SimpleTests/SolverTests/GMResDiagPrecond.cpp b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
index cd4c963cb4fc57faaaee9cf6e7f9a997a5e23edf..3aecc50d4002a3ef462d0fc00c8c3e3a46beb24a 100644
--- a/SimpleTests/SolverTests/GMResDiagPrecond.cpp
+++ b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
@@ -1,7 +1,15 @@
 /**
- * GMResDiagPrecond.cpp
+ * \file
+ * \author Thomas Fischer
+ * \date   2011-10-05
+ * \brief  Test for GMRes preconditioner.
+ *
+ * \copyright
+ * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
  *
- * Created on 2011-10-05 by Thomas Fischer
  */
 
 #include <iostream>