diff --git a/AMDiS/CMakeLists.txt b/AMDiS/CMakeLists.txt
index fcc682294da583c84bcd251a46e5572140eb5000..7870c88174e9fec4d6b7a78fb89ce4ba6bcdaa23 100644
--- a/AMDiS/CMakeLists.txt
+++ b/AMDiS/CMakeLists.txt
@@ -89,6 +89,7 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
 	      ${SOURCE_DIR}/Element.cc
 	      ${SOURCE_DIR}/ElementData.cc
 	      ${SOURCE_DIR}/ElementDofIterator.cc
+	      ${SOURCE_DIR}/ElementRegion_ED.cc	
 	      ${SOURCE_DIR}/FiniteElemSpace.cc
 	      ${SOURCE_DIR}/FirstOrderAssembler.cc
 	      ${SOURCE_DIR}/FirstOrderTerm.cc
@@ -134,6 +135,8 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
 	      ${SOURCE_DIR}/SubElInfo.cc
 	      ${SOURCE_DIR}/SubQuadrature.cc
 	      ${SOURCE_DIR}/SurfaceQuadrature.cc
+	      ${SOURCE_DIR}/SurfaceRegion_ED.cc
+	      ${SOURCE_DIR}/SystemVector.cc
 	      ${SOURCE_DIR}/Tetrahedron.cc
 	      ${SOURCE_DIR}/Timer.cc
 	      ${SOURCE_DIR}/Traverse.cc
diff --git a/AMDiS/src/AMDiS.h b/AMDiS/src/AMDiS.h
index b71d46d65d26f40563a040c50a1819dd29293d0c..a49908d1af61565dc7d7bd9ffec7563ebc845e59 100644
--- a/AMDiS/src/AMDiS.h
+++ b/AMDiS/src/AMDiS.h
@@ -116,6 +116,7 @@
 
 #include "io/ArhReader.h"
 #include "io/ArhWriter.h"
+#include "io/DataCollector.h"
 #include "io/FileWriter.h"
 #include "io/GNUPlotWriter.h"
 #include "io/GridWriter.h"
@@ -128,10 +129,6 @@
 #include "io/VtkWriter.h"
 #include "io/VtkVectorWriter.h"
 
-#include "io/DataCollector.hh"
-#include "io/FileWriter.hh"
-#include "io/VtkVectorWriter.hh"
-
 #include "nonlin/ProblemNonLin.h"
 #include "nonlin/NonLinSolver.h"
 
diff --git a/AMDiS/src/ElementRegion_ED.cc b/AMDiS/src/ElementRegion_ED.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ac51aaadf87be117a40e5ebe4ffed3c82490bcf4
--- /dev/null
+++ b/AMDiS/src/ElementRegion_ED.cc
@@ -0,0 +1,59 @@
+//
+// Software License for AMDiS
+//
+// Copyright (c) 2010 Dresden University of Technology 
+// All rights reserved.
+// Authors: Simon Vey, Thomas Witkowski et al.
+//
+// This file is part of AMDiS
+//
+// See also license.opensource.txt in the distribution.
+
+
+#include "ElementRegion_ED.h"
+#include "Serializer.h"
+
+namespace AMDiS {
+  
+  bool ElementRegion_ED::refineElementData(Element* parent, 
+					   Element* child1,
+					   Element* child2,
+					   int elType)
+  {
+    ElementData::refineElementData(parent, child1, child2, elType);
+    
+    ElementRegion_ED *ep;
+    
+    ep = new ElementRegion_ED(child1->getElementData());
+    ep->region = region;
+    child1->setElementData(ep);
+    
+    ep = new ElementRegion_ED(child2->getElementData());
+    ep->region = region;
+    child2->setElementData(ep);
+    
+    return false;
+  }
+
+  
+  ElementData *ElementRegion_ED::clone() const
+  { 
+    ElementRegion_ED *newObj = new ElementRegion_ED;
+    newObj->region = region;
+    newObj->decorated = ElementData::clone();
+    return newObj; 
+  }
+
+  void ElementRegion_ED::serialize(std::ostream& out) 
+  {
+    ElementData::serialize(out);
+    SerUtil::serialize(out, region);
+  }
+
+  
+  void ElementRegion_ED::deserialize(std::istream& in) 
+  {
+    ElementData::deserialize(in);
+    SerUtil::deserialize(in, region);
+  }
+}
diff --git a/AMDiS/src/ElementRegion_ED.h b/AMDiS/src/ElementRegion_ED.h
index eec88deb8e3c5d303cbdfeba31e85208b3723346..18490c6cb0ff2566088ca20555e05a7a5798e548 100644
--- a/AMDiS/src/ElementRegion_ED.h
+++ b/AMDiS/src/ElementRegion_ED.h
@@ -25,7 +25,6 @@
 
 #include "ElementData.h"
 #include "FixVec.h"
-#include "Serializer.h"
 
 namespace AMDiS {
 
@@ -56,30 +55,9 @@ namespace AMDiS {
     bool refineElementData(Element* parent, 
 			   Element* child1,
 			   Element* child2,
-			   int elType)
-    {
-      ElementData::refineElementData(parent, child1, child2, elType);
-
-      ElementRegion_ED *ep;
+			   int elType);
 
-      ep = new ElementRegion_ED(child1->getElementData());
-      ep->region = region;
-      child1->setElementData(ep);
-
-      ep = new ElementRegion_ED(child2->getElementData());
-      ep->region = region;
-      child2->setElementData(ep);
-
-      return false;
-    }
-
-    ElementData *clone() const 
-    { 
-      ElementRegion_ED *newObj = new ElementRegion_ED;
-      newObj->region = region;
-      newObj->decorated = ElementData::clone();
-      return newObj; 
-    }
+    ElementData *clone() const;
 
     inline std::string getTypeName() const 
     { 
@@ -91,17 +69,9 @@ namespace AMDiS {
       return ELEMENT_REGION; 
     }
 
-    void serialize(std::ostream& out) 
-    {
-      ElementData::serialize(out);
-      SerUtil::serialize(out, region);
-    }
+    void serialize(std::ostream& out);
 
-    void deserialize(std::istream& in) 
-    {
-      ElementData::deserialize(in);
-      SerUtil::deserialize(in, region);
-    }
+    void deserialize(std::istream& in); 
 
     inline void setRegion(int r) 
     { 
diff --git a/AMDiS/src/ProblemInstat.cc b/AMDiS/src/ProblemInstat.cc
index 7289cf46d84b672b5eccb23ac636e607d25f82cd..e4f07c84b5c13d836f5b309e39cc11ecf9590c29 100644
--- a/AMDiS/src/ProblemInstat.cc
+++ b/AMDiS/src/ProblemInstat.cc
@@ -19,7 +19,6 @@
 #include "StandardProblemIteration.h"
 #include "est/Estimator.h"
 #include "io/FileWriter.h"
-#include "io/FileWriter.hh"
 
 namespace AMDiS {
   
diff --git a/AMDiS/src/ProblemStat.cc b/AMDiS/src/ProblemStat.cc
index 255e057e4ddba01b4d78d5693d3a498762dc963a..6ae98684fc7982c45c8aa93d717aa3b3d88a35ee 100644
--- a/AMDiS/src/ProblemStat.cc
+++ b/AMDiS/src/ProblemStat.cc
@@ -23,7 +23,6 @@
 #include "Marker.h"
 #include "AdaptInfo.h"
 #include "io/FileWriter.h"
-#include "io/FileWriter.hh"
 #include "CoarseningManager.h"
 #include "RefinementManager.h"
 #include "DualTraverse.h"
diff --git a/AMDiS/src/SurfaceRegion_ED.cc b/AMDiS/src/SurfaceRegion_ED.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a20cc076f7e1a40ed0115b2639c339f0350997f5
--- /dev/null
+++ b/AMDiS/src/SurfaceRegion_ED.cc
@@ -0,0 +1,73 @@
+//
+// Software License for AMDiS
+//
+// Copyright (c) 2010 Dresden University of Technology 
+// All rights reserved.
+// Authors: Simon Vey, Thomas Witkowski et al.
+//
+// This file is part of AMDiS
+//
+// See also license.opensource.txt in the distribution.
+
+
+#include "SurfaceRegion_ED.h"
+#include "Serializer.h"
+
+namespace AMDiS {
+  
+  bool SurfaceRegion_ED::refineElementData(Element* parent, 
+					   Element* child1,
+					   Element* child2,
+					   int elType)
+  {
+    ElementData::refineElementData(parent, child1, child2, elType);
+    
+    int sideOfChild;
+    SurfaceRegion_ED *surfaceRegion;
+    
+    sideOfChild = parent->getSideOfChild(0, side, elType);
+    if (sideOfChild >= 0) {
+      surfaceRegion = new SurfaceRegion_ED(child1->getElementData());
+      surfaceRegion->setSide(sideOfChild);
+      surfaceRegion->setRegion(region);
+      child1->setElementData(surfaceRegion);
+    }    
+    
+    sideOfChild = parent->getSideOfChild(1, side, elType);
+    if (sideOfChild >= 0) {
+      surfaceRegion = new SurfaceRegion_ED(child2->getElementData());
+      surfaceRegion->side = sideOfChild;
+      surfaceRegion->region = region;
+      child2->setElementData(surfaceRegion);
+    }
+    
+    return false;
+  }
+  
+  
+  ElementData *SurfaceRegion_ED::clone() const 
+  { 
+    SurfaceRegion_ED *newObj = new SurfaceRegion_ED;
+    newObj->side = side;
+    newObj->region = region;
+    newObj->decorated = ElementData::clone();
+    return newObj; 
+  }
+
+
+  void SurfaceRegion_ED::serialize(std::ostream& out)
+  {
+    ElementData::serialize(out);
+    SerUtil::serialize(out, side);
+    SerUtil::serialize(out, region);
+  }
+  
+
+  void SurfaceRegion_ED::deserialize(std::istream& in) 
+  {
+    ElementData::deserialize(in);
+    SerUtil::deserialize(in, side);
+    SerUtil::deserialize(in, region);
+  }
+}
+
diff --git a/AMDiS/src/SurfaceRegion_ED.h b/AMDiS/src/SurfaceRegion_ED.h
index 6890243e9c9da1dccd8d53a68c8c31217860bfc2..f427fab764b432652e3df67ca38326f077c7dfb6 100644
--- a/AMDiS/src/SurfaceRegion_ED.h
+++ b/AMDiS/src/SurfaceRegion_ED.h
@@ -25,7 +25,6 @@
 
 #include "ElementData.h"
 #include "FixVec.h"
-#include "Serializer.h"
 
 namespace AMDiS {
 
@@ -57,40 +56,9 @@ namespace AMDiS {
     bool refineElementData(Element* parent, 
 			   Element* child1,
 			   Element* child2,
-			   int elType)
-    {
-      ElementData::refineElementData(parent, child1, child2, elType);
-
-      int sideOfChild;
-      SurfaceRegion_ED *surfaceRegion;
-
-      sideOfChild = parent->getSideOfChild(0, side, elType);
-      if (sideOfChild >= 0) {
-	surfaceRegion = new SurfaceRegion_ED(child1->getElementData());
-	surfaceRegion->setSide(sideOfChild);
-	surfaceRegion->setRegion(region);
-	child1->setElementData(surfaceRegion);
-      }    
-
-      sideOfChild = parent->getSideOfChild(1, side, elType);
-      if (sideOfChild >= 0) {
-	surfaceRegion = new SurfaceRegion_ED(child2->getElementData());
-	surfaceRegion->side = sideOfChild;
-	surfaceRegion->region = region;
-	child2->setElementData(surfaceRegion);
-      }
+			   int elType);
 
-      return false;
-    }
-
-    ElementData *clone() const 
-    { 
-      SurfaceRegion_ED *newObj = new SurfaceRegion_ED;
-      newObj->side = side;
-      newObj->region = region;
-      newObj->decorated = ElementData::clone();
-      return newObj; 
-    }
+    ElementData *clone() const ;
 
     inline std::string getTypeName() const 
     { 
@@ -102,19 +70,9 @@ namespace AMDiS {
       return SURFACE_REGION; 
     }
 
-    void serialize(std::ostream& out) 
-    {
-      ElementData::serialize(out);
-      SerUtil::serialize(out, side);
-      SerUtil::serialize(out, region);
-    }
+    void serialize(std::ostream& out);
 
-    void deserialize(std::istream& in) 
-    {
-      ElementData::deserialize(in);
-      SerUtil::deserialize(in, side);
-      SerUtil::deserialize(in, region);
-    }
+    void deserialize(std::istream& in);
 
     inline void setSide(int s) 
     { 
diff --git a/AMDiS/src/SystemVector.cc b/AMDiS/src/SystemVector.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9b644920f16fd8eb216991c509ea8a7bcd34c2fc
--- /dev/null
+++ b/AMDiS/src/SystemVector.cc
@@ -0,0 +1,38 @@
+//
+// Software License for AMDiS
+//
+// Copyright (c) 2010 Dresden University of Technology 
+// All rights reserved.
+// Authors: Simon Vey, Thomas Witkowski et al.
+//
+// This file is part of AMDiS
+//
+// See also license.opensource.txt in the distribution.
+
+
+#include "SystemVector.h"
+#include "Serializer.h"
+
+namespace AMDiS {
+
+  void SystemVector::serialize(std::ostream &out) 
+  {
+    int size = vectors.getSize();
+    SerUtil::serialize(out, size);
+    for (int i = 0; i < size; i++)
+      vectors[i]->serialize(out);
+  }
+
+
+  void SystemVector::deserialize(std::istream &in) 
+  {
+    int size, oldSize = vectors.getSize();
+    SerUtil::deserialize(in, size);
+    vectors.resize(size);
+    for (int i = oldSize; i < size; i++)
+      vectors[i] = new DOFVector<double>(feSpace[i], "");
+    for (int i = 0; i < size; i++)
+      vectors[i]->deserialize(in);
+  }
+
+}
diff --git a/AMDiS/src/SystemVector.h b/AMDiS/src/SystemVector.h
index cd413fa0f43ecf9026c33f5f6a6ac5418a9ec0e5..e7bae72e2122fb0d0db0af5b282f870bb43c39ef 100644
--- a/AMDiS/src/SystemVector.h
+++ b/AMDiS/src/SystemVector.h
@@ -27,7 +27,6 @@
 #include "DOFVector.h"
 #include "CreatorInterface.h"
 #include "Serializable.h"
-#include "Serializer.h"
 
 namespace AMDiS {
 
@@ -193,24 +192,9 @@ namespace AMDiS {
       return *this;
     }
 
-    void serialize(std::ostream &out) 
-    {
-      int size = vectors.getSize();
-      SerUtil::serialize(out, size);
-      for (int i = 0; i < size; i++)
-	vectors[i]->serialize(out);
-    }
+    void serialize(std::ostream &out);
 
-    void deserialize(std::istream &in) 
-    {
-      int size, oldSize = vectors.getSize();
-      SerUtil::deserialize(in, size);
-      vectors.resize(size);
-      for (int i = oldSize; i < size; i++)
-	vectors[i] = new DOFVector<double>(feSpace[i], "");
-      for (int i = 0; i < size; i++)
-	vectors[i]->deserialize(in);
-    }
+    void deserialize(std::istream &in);
 
     void copy(const SystemVector& rhs) 
     {
diff --git a/AMDiS/src/io/DataCollector.h b/AMDiS/src/io/DataCollector.h
index 1005c61368a617f8125f99061e71e228ee5681cd..c25fc7982ca87bc11417e5fad2f89822526baf4e 100644
--- a/AMDiS/src/io/DataCollector.h
+++ b/AMDiS/src/io/DataCollector.h
@@ -231,5 +231,7 @@ namespace AMDiS {
   };
 }
 
+#include "DataCollector.hh"
+
 #endif
 
diff --git a/AMDiS/src/io/DataCollector.hh b/AMDiS/src/io/DataCollector.hh
index f581acd1dde4984520b4c9496f6232462a89c432..f253913c7fc6a9e93528e3e9afee1f6404e0d93a 100644
--- a/AMDiS/src/io/DataCollector.hh
+++ b/AMDiS/src/io/DataCollector.hh
@@ -23,13 +23,12 @@
 
 namespace AMDiS {
 
-
   template<typename T>
   DataCollector<T>::DataCollector(const FiniteElemSpace *fe,
-			       DOFVector<T> *val,
-			       int l,
-			       Flag flag,
-			       bool (*writeElemFct)(ElInfo*))
+				  DOFVector<T> *val,
+				  int l,
+				  Flag flag,
+				  bool (*writeElemFct)(ElInfo*))
     : values(val),
       level(l),
       traverseFlag(flag),
diff --git a/AMDiS/src/io/FileCompression.h b/AMDiS/src/io/FileCompression.h
new file mode 100644
index 0000000000000000000000000000000000000000..9b438dc868edfcc0625e045ea0b182210206115d
--- /dev/null
+++ b/AMDiS/src/io/FileCompression.h
@@ -0,0 +1,32 @@
+// ============================================================================
+// ==                                                                        ==
+// == AMDiS - Adaptive multidimensional simulations                          ==
+// ==                                                                        ==
+// ==  http://www.amdis-fem.org                                              ==
+// ==                                                                        ==
+// ============================================================================
+//
+// Software License for AMDiS
+//
+// Copyright (c) 2010 Dresden University of Technology 
+// All rights reserved.
+// Authors: Simon Vey, Thomas Witkowski et al.
+//
+// This file is part of AMDiS
+//
+// See also license.opensource.txt in the distribution.
+
+#ifndef AMDIS_FILE_COMPRESSION_H
+#define AMDIS_FILE_COMPRESSION_H
+
+namespace AMDiS {
+
+  typedef enum {
+    NONE = 0,
+    GZIP = 1,
+    BZIP2 = 2
+  } FileCompression;
+
+}
+
+#endif
diff --git a/AMDiS/src/io/FileWriter.cc b/AMDiS/src/io/FileWriter.cc
index 6a04e733f11c3d528b8e158ef83d887c7b3c314f..6ebd0b5c4a6fdc4b95c965bc19a53ab117c7a009 100644
--- a/AMDiS/src/io/FileWriter.cc
+++ b/AMDiS/src/io/FileWriter.cc
@@ -12,13 +12,11 @@
 
 #include "boost/lexical_cast.hpp"
 #include "FileWriter.h"
-#include "FileWriter.hh"
 #include "Initfile.h"
 #include "ValueWriter.h"
 #include "MacroWriter.h"
 #include "VtkWriter.h"
 #include "VtkVectorWriter.h"
-#include "VtkVectorWriter.hh"
 #include "PngWriter.h"
 #include "PovrayWriter.h"
 #include "DofWriter.h"
@@ -28,7 +26,7 @@
 #include "Flag.h"
 #include "ElInfo.h"
 #include "Mesh.h"
-#include "DataCollector.hh"
+#include "DataCollector.h"
 
 #if HAVE_PARALLEL_DOMAIN_AMDIS
 #include <mpi.h>
diff --git a/AMDiS/src/io/FileWriter.h b/AMDiS/src/io/FileWriter.h
index 1e30295f0d74e023694441f63b3e3177ee2e1754..8cae39da93a4a4e23a542b94f7b2873993b1c40c 100644
--- a/AMDiS/src/io/FileWriter.h
+++ b/AMDiS/src/io/FileWriter.h
@@ -32,18 +32,12 @@
 #include "AMDiS_fwd.h"
 #include "Mesh.h"
 #include "DataCollector.h"
+#include "FileCompression.h"
 
 namespace AMDiS {
 
   using namespace std;
 
-  typedef enum {
-    NONE = 0,
-    GZIP = 1,
-    BZIP2 = 2
-  } FileCompression;
-
-
   class FileWriterInterface
   {
   public:
@@ -100,8 +94,8 @@ namespace AMDiS {
    * \ingroup Output
    *
    * \brief
-   * Base class of FileWriterScal and FileWriterVec. Manages the file output
-   * of solution vectors.
+   * Base class of FileWriterScal and FileWriterVec. Manages the file
+   * output of solution vectors.
    */
   template<typename T>
   class FileWriterTemplated : public FileWriterInterface
@@ -112,14 +106,14 @@ namespace AMDiS {
 
     /// Constructor for a filewriter with more than one data component.
     FileWriterTemplated(string name,
-	       Mesh *mesh,
-	       vector< DOFVector<T>* > vecs);
+			Mesh *mesh,
+			vector< DOFVector<T>* > vecs);
 
     /// Constructor for a filewriter with more than one data component.
     FileWriterTemplated(std::string name,
-	       Mesh *mesh,
-	       SystemVector *vecs);
-
+			Mesh *mesh,
+			SystemVector *vecs);
+    
     /// Destructor
     virtual ~FileWriterTemplated();
 
@@ -253,7 +247,8 @@ namespace AMDiS {
   
   typedef FileWriterTemplated<double> FileWriter;
   typedef FileWriterTemplated<WorldVector<double> > FileVectorWriter;
-
 }
 
+#include "FileWriter.hh"
+
 #endif // AMDIS_FILEWRITER_H
diff --git a/AMDiS/src/io/FileWriter.hh b/AMDiS/src/io/FileWriter.hh
index 07f78fccde85e5b2391da9fb006c5e9f74166954..7b047769b9315b04279586b39871cfaecfb56918 100644
--- a/AMDiS/src/io/FileWriter.hh
+++ b/AMDiS/src/io/FileWriter.hh
@@ -21,7 +21,6 @@
 #include "MacroWriter.h"
 #include "VtkWriter.h"
 #include "VtkVectorWriter.h"
-#include "VtkVectorWriter.hh"
 #include "PngWriter.h"
 #include "PovrayWriter.h"
 #include "DofWriter.h"
@@ -32,7 +31,7 @@
 #include "ElInfo.h"
 #include "Mesh.h"
 #include "SystemVector.h"
-#include "DataCollector.hh"
+#include "DataCollector.h"
 
 #if HAVE_PARALLEL_DOMAIN_AMDIS
 #include <mpi.h>
diff --git a/AMDiS/src/io/MacroWriter.cc b/AMDiS/src/io/MacroWriter.cc
index 9d5b5fea58a49cc223a34380e7bad1864228d77b..b155cbbeb8bad9785f1630d68a51c1cbc0e6dcbc 100644
--- a/AMDiS/src/io/MacroWriter.cc
+++ b/AMDiS/src/io/MacroWriter.cc
@@ -24,7 +24,6 @@
 #include "ElementRegion_ED.h"
 #include <string>
 #include "Traverse.h"
-#include "DataCollector.hh"
 
 namespace AMDiS {
 
diff --git a/AMDiS/src/io/PngWriter.cc b/AMDiS/src/io/PngWriter.cc
index bbdaae2cb8442342a1c62ed040690bbb223c0542..01164cf3841f401af6bca811a8cf90472de8aa30 100644
--- a/AMDiS/src/io/PngWriter.cc
+++ b/AMDiS/src/io/PngWriter.cc
@@ -18,7 +18,7 @@
 #include "PngWriter.h"
 #include "Traverse.h"
 #include "DOFVector.h"
-#include "DataCollector.hh"
+#include "DataCollector.h"
 
 namespace AMDiS {
   int PngWriter::writeFile(std::string filename, int imageType) 
diff --git a/AMDiS/src/io/PovrayWriter.cc b/AMDiS/src/io/PovrayWriter.cc
index 07f0339e7d9326a2dbb302d35d261453bfb86248..244eb26428b6ea0ca065016f76e40cd9ea2617cd 100644
--- a/AMDiS/src/io/PovrayWriter.cc
+++ b/AMDiS/src/io/PovrayWriter.cc
@@ -19,7 +19,7 @@
 #include <map>
 #include <algorithm>
 #include "Traverse.h"
-#include "DataCollector.hh"
+#include "DataCollector.h"
 
 using namespace std;
 
diff --git a/AMDiS/src/io/ValueWriter.cc b/AMDiS/src/io/ValueWriter.cc
index 2419d848cac20d4ef04a19232f94a7a9d119519c..5435282d71738ec3f5922b2158598b702712a4a5 100644
--- a/AMDiS/src/io/ValueWriter.cc
+++ b/AMDiS/src/io/ValueWriter.cc
@@ -18,7 +18,7 @@
 #include "DOFAdmin.h"
 #include "ElInfo.h"
 #include "BasisFunction.h"
-#include "DataCollector.hh"
+#include "DataCollector.h"
 
 namespace AMDiS {
 
diff --git a/AMDiS/src/io/VtkVectorWriter.cc b/AMDiS/src/io/VtkVectorWriter.cc
index 98c057d275b77b40e6ff55f2c0a7a588d517470d..25544a5a2c1935e00deecc71ad649c985377cdae 100644
--- a/AMDiS/src/io/VtkVectorWriter.cc
+++ b/AMDiS/src/io/VtkVectorWriter.cc
@@ -24,9 +24,7 @@
 #endif
 
 #include "VtkVectorWriter.h"
-#include "VtkVectorWriter.hh"
 #include "DataCollector.h"
-#include "DataCollector.hh"
 #include "DOFVector.h"
 #include "SurfaceRegion_ED.h"
 #include "ElementRegion_ED.h"
diff --git a/AMDiS/src/io/VtkVectorWriter.h b/AMDiS/src/io/VtkVectorWriter.h
index 0920bea32e0f03d7688b759c06c3de2088d5d1b6..081cab83b27c99027ee327838fd8c1bec867af22 100644
--- a/AMDiS/src/io/VtkVectorWriter.h
+++ b/AMDiS/src/io/VtkVectorWriter.h
@@ -31,8 +31,8 @@
 #include <fstream>
 #include "BasisFunction.h"
 #include "DataCollector.h"
-#include "FileWriter.h"
 #include "SystemVector.h"
+#include "FileCompression.h"
 
 namespace AMDiS {
 
@@ -66,7 +66,8 @@ namespace AMDiS {
       compress = c;
     }
 
-    void setWriteAs3dVector(bool w) {
+    void setWriteAs3dVector(bool w) 
+    {
       writeAs3dVector = w;
     }
 
@@ -275,4 +276,6 @@ namespace AMDiS {
   };
 }
 
+#include "VtkVectorWriter.hh"
+
 #endif // AMDIS_VTKVECTORWRITER_H
diff --git a/AMDiS/src/io/VtkWriter.cc b/AMDiS/src/io/VtkWriter.cc
index 73574c915d141c090cf835bb6a273ce42d3da885..51b333e44ebe17db1a4253b766f96dda602be401 100644
--- a/AMDiS/src/io/VtkWriter.cc
+++ b/AMDiS/src/io/VtkWriter.cc
@@ -25,10 +25,10 @@
 
 #include "VtkWriter.h"
 #include "DataCollector.h"
-#include "DataCollector.hh"
 #include "DOFVector.h"
 #include "SurfaceRegion_ED.h"
 #include "ElementRegion_ED.h"
+#include "AdaptInfo.h"
 
 namespace AMDiS { 
 
diff --git a/AMDiS/src/io/VtkWriter.h b/AMDiS/src/io/VtkWriter.h
index 9ea3428a110a181bb4cafdd6e9bdef99dcc63b31..1e01745752fda504c641fc20ada6564d9b6eeb70 100644
--- a/AMDiS/src/io/VtkWriter.h
+++ b/AMDiS/src/io/VtkWriter.h
@@ -31,7 +31,7 @@
 #include <fstream>
 #include "BasisFunction.h"
 #include "DataCollector.h"
-#include "FileWriter.h"
+#include "FileCompression.h"
 #include "SystemVector.h"
 
 namespace AMDiS {
diff --git a/AMDiS/src/parallel/MeshPartitioner.cc b/AMDiS/src/parallel/MeshPartitioner.cc
index bbaf14ff2ded977a33509eaba57fa113eef1a1f1..7b2dc4e37eb6a270e1010ccfe56efa7ad542a52b 100644
--- a/AMDiS/src/parallel/MeshPartitioner.cc
+++ b/AMDiS/src/parallel/MeshPartitioner.cc
@@ -31,7 +31,7 @@ namespace AMDiS {
     elementInRank.clear();
 
     // Is used in box partitioning mode only. 
-    map<DofEdge, set<int> > vertexElements;
+    map<DofEdge, std::set<int> > vertexElements;
 
     TraverseStack stack;
     ElInfo *elInfo = 
@@ -79,13 +79,13 @@ namespace AMDiS {
       // === to be in the same box.                                         ===
 
       int boxCounter = 0;
-      for (map<DofEdge, set<int> >::iterator it = vertexElements.begin();
+      for (map<DofEdge, std::set<int> >::iterator it = vertexElements.begin();
 	   it != vertexElements.end(); ++it) {
 	TEST_EXIT_DBG(it->second.size() == 6)("Should not happen!\n");
 	
 	boxSplitting[boxCounter] = it->second;
 
-	for (set<int>::iterator elIt = it->second.begin();
+	for (std::set<int>::iterator elIt = it->second.begin();
 	     elIt != it->second.end(); ++elIt)
 	  elInBox[*elIt] = boxCounter;
 
@@ -114,11 +114,11 @@ namespace AMDiS {
 
       int boxPerRank = boxCounter / mpiSize;
 
-      for (map<int, set<int> >::iterator it = boxSplitting.begin();
+      for (map<int, std::set<int> >::iterator it = boxSplitting.begin();
 	   it != boxSplitting.end(); ++it) {
 	int boxInRank = std::min(it->first / boxPerRank, mpiSize - 1);
 
-	for (set<int>::iterator elIt = it->second.begin();
+	for (std::set<int>::iterator elIt = it->second.begin();
 	     elIt != it->second.end(); ++elIt) {
 	  elementInRank[*elIt] = (boxInRank == mpiRank);
 	  partitionMap[*elIt] = boxInRank;