diff --git a/BaseLib/StringTools.h b/BaseLib/StringTools.h
index d63f537f4bcaae58a770513667a19821b294668e..92bf2c58c48296ddfe5e8364ee576a311cf2f832 100644
--- a/BaseLib/StringTools.h
+++ b/BaseLib/StringTools.h
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file StringTools.h
+ *
+ * Created on 2010-06-16 by Thomas Fischer
+ */
+
 #ifndef STRINGTOOLS_H
 #define STRINGTOOLS_H
 
diff --git a/BaseLib/TimeMeasurementBase.h b/BaseLib/TimeMeasurementBase.h
index 6466dd7f31c89bb7740f65d9c65d49bf07981dff..1f27e28fc3a6092b9ff2ab06b37aeebeaf148f3e 100644
--- a/BaseLib/TimeMeasurementBase.h
+++ b/BaseLib/TimeMeasurementBase.h
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file TimeMeasurementBase.h
+ *
+ * Created on xxxx-xx-xx by Thomas Fischer
+ */
+
 #ifndef TIMEMEASUREMENT_H
 #define TIMEMEASUREMENT_H
 
diff --git a/BaseLib/swap.h b/BaseLib/swap.h
index 265054b11302c9c1ad931bc0d2a504e80ba7639b..c9698fd6ab0b616a305c5f44d038e96a4d742a99 100644
--- a/BaseLib/swap.h
+++ b/BaseLib/swap.h
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file swap.h
+ *
+ * Created on xxxx-xx-xx by xx
+ */
 #ifndef SWAP_H_
 #define SWAP_H_
 
diff --git a/BaseLib/wait.h b/BaseLib/wait.h
index d9d7994b404c0e44bf0da029ea55a4ef7921a0fd..438b403ec7059646cde762b48e4acd0fc5d75e10 100644
--- a/BaseLib/wait.h
+++ b/BaseLib/wait.h
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.com/LICENSE.txt
  *
  *
- * \file DateTools.h
+ * \file wait.h
  *
  * Created on 2011-02-17 by Karsten Rink
  */
diff --git a/GeoLib/Color.h b/GeoLib/Color.h
index c8831061496668e6d48d708fc8e373670e083f7d..05be5f9ba85e8483fdf3ad62823bc9a4e395bd9e 100644
--- a/GeoLib/Color.h
+++ b/GeoLib/Color.h
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.com/LICENSE.txt
  *
  *
- * \file Color.cpp
+ * \file Color.h
  *
  * Created on 2010-02-04 by Karsten Rink
  *
diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
index 6fcb92031d903229b02ebcf0063568c6cf016c2c..3a99423765552d570adb0b261a8c174607cebcf7 100644
--- a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
+++ b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file generateDiagPrecond.cpp
+ *
+ * Created on xxxx-xx-xx by Thomas Fischer
+ */
+
 #include "sparse.h"
 #include <limits>
 #include <cmath>
diff --git a/MathLib/LinAlg/Solvers/CG.h b/MathLib/LinAlg/Solvers/CG.h
index 0cc441a8bfc03accfd3a9efb71d3cb1acb499b60..d10e1a84765fd0ddd28f61b918e27000792dd063 100644
--- a/MathLib/LinAlg/Solvers/CG.h
+++ b/MathLib/LinAlg/Solvers/CG.h
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.com/LICENSE.txt
  *
  *
- * \file solver.h
+ * \file CG.h
  *
  * Created on 2011-09-27 by Thomas Fischer
  */
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
index 96464179f045a6cc6d6eb81edc3e8d7ba502ffca..8fc573ac5704ff4ae8d5036e3207bfc3f39d459e 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
@@ -1,4 +1,10 @@
-/*
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
  * \file Cluster.h
  *
  * Created on 2012-01-02 by Thomas Fischer
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
index e7e273fc06482e76b4097808eed3e2aee86af6c5..6062b26c5bc71e42d94a48b15a36f16ac2ef9c5e 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
@@ -1,5 +1,11 @@
 /**
- * Separator.h
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file Separator.h
  *
  * Created on 2012-01-02 by Thomas Fischer
  */
diff --git a/MathLib/LinAlg/Sparse/amuxCRS.cpp b/MathLib/LinAlg/Sparse/amuxCRS.cpp
index dcb72f9cb12985e6537e1256bc92d5a9f6d888d7..8acd84c8cbc4e5171aaf60ad68b0b8a394a14ce4 100644
--- a/MathLib/LinAlg/Sparse/amuxCRS.cpp
+++ b/MathLib/LinAlg/Sparse/amuxCRS.cpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.com/LICENSE.txt
  *
  *
- * \file CRSMatrix.h
+ * \file amuxCRS.cpp
  *
  * Created on 2011-09-20 by Thomas Fischer
  */
diff --git a/MathLib/LinAlg/Sparse/amuxCRS.h b/MathLib/LinAlg/Sparse/amuxCRS.h
index bcc354f4541603017088c0ea2c57446d40c9e23d..a3a6d098b84fcb01ebdfd67d5e1341e9256bd471 100644
--- a/MathLib/LinAlg/Sparse/amuxCRS.h
+++ b/MathLib/LinAlg/Sparse/amuxCRS.h
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file amuxCRS.h
+ *
+ * Created on 2011-09-20 by Thomas Fischer
+ */
+
 #ifndef AMUXCRS_H
 #define AMUXCRS_H
 
diff --git a/MathLib/sparse.h b/MathLib/sparse.h
index cc56696efbce7f5d4fb9f2d11f2a9104e85527cd..68f0a32b7ac2645f39abb241800d94870fe551b0 100644
--- a/MathLib/sparse.h
+++ b/MathLib/sparse.h
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file sparse.h
+ *
+ * Created on xxxx-xx-xx by Thomas Fischer
+ */
+
 #ifndef SPARSE_H
 #define SPARSE_H
 
diff --git a/MathLib/vector_io.h b/MathLib/vector_io.h
index ab6ef2b935758c2c9af2ab43b1dfc27942c28722..f19689e935f122e856bd7216d36ef540cf8e49a2 100644
--- a/MathLib/vector_io.h
+++ b/MathLib/vector_io.h
@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.com/LICENSE.txt
+ *
+ *
+ * \file vector_io.h
+ *
+ * Created on xxxx-xx-xx by Thomas Fischer
+ */
+
 #ifndef VECTOR_IO_H
 #define VECTOR_IO_H
 
diff --git a/MeshLib/Elements/FemElem.cpp b/MeshLib/Elements/FemElem.cpp
index 418eb2c62c59c52d7d1417bc58dc8b1f9134457d..0c0dd9fe540216d98771cedf1bce4a24262c9101 100644
--- a/MeshLib/Elements/FemElem.cpp
+++ b/MeshLib/Elements/FemElem.cpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.com/LICENSE.txt
  *
  *
- * \file Tet.cpp
+ * \file FemElem.cpp
  *
  * Created on 2012-05-03 by Karsten Rink
  */