diff --git a/dune/amdis/Initfile.hpp b/dune/amdis/Initfile.hpp
index a49bcef3ad6a535fbc94e5a4917c698433b853bf..b548e36ec5bef214861035c09c12fbe991dd434b 100644
--- a/dune/amdis/Initfile.hpp
+++ b/dune/amdis/Initfile.hpp
@@ -142,7 +142,9 @@ namespace AMDiS
   std::ostream& operator<<(std::ostream& out, std::list<T,Alloc> const& l)
   {
     auto it = l.begin();
-    out << "["; if (l.size() > 0) out << *it;
+    out << "[";
+    if (l.size() > 0)
+      out << *it;
     for (; it != l.end(); ++it)
       out << ", " << *it;
     out << "]";
@@ -155,7 +157,9 @@ namespace AMDiS
   std::ostream& operator<<(std::ostream& out, std::vector<T,Alloc> const& l)
   {
     auto it = l.begin();
-    out << "["; if (l.size() > 0) out << *it;
+    out << "[";
+    if (l.size() > 0)
+      out << *it;
     for (; it != l.end(); ++it)
       out << ", " << *it;
     out << "]";
diff --git a/dune/amdis/Math.hpp b/dune/amdis/Math.hpp
index 33ce615f4bcdf85d6f7b890a2f59329d556f56b4..71d7585dd45d94a3496d3f149e230c71fa20c692 100644
--- a/dune/amdis/Math.hpp
+++ b/dune/amdis/Math.hpp
@@ -119,19 +119,4 @@ namespace AMDiS
     return !std::isnan(val) && !std::isinf(val);
   }
 
-  // some predefined constants
-  constexpr double m_e = 	2.7182818284590452354;
-  constexpr double m_log2e = 	1.4426950408889634074;
-  constexpr double m_log10e = 	0.43429448190325182765;
-  constexpr double m_ln2 = 	0.69314718055994530942;
-  constexpr double m_ln10 = 	2.30258509299404568402;
-  constexpr double m_pi = 	3.14159265358979323846;
-  constexpr double m_pi_2 = 	1.57079632679489661923;
-  constexpr double m_pi_4 = 	0.78539816339744830962;
-  constexpr double m_1_pi = 	0.31830988618379067154;
-  constexpr double m_2_pi = 	0.63661977236758134308;
-  constexpr double m_2_sqrtpi = 1.12837916709551257390;
-  constexpr double m_sqrt2 = 	1.41421356237309504880;
-  constexpr double m_sqrt1_2 = 	0.70710678118654752440;
-
 } // end namespace AMDiS
diff --git a/dune/amdis/utility/Filesystem.cpp b/dune/amdis/utility/Filesystem.cpp
index 9af080203aef4852fce9f8d71eea64d278d8fb75..2a916832ef49cc827245fa0a02b6f88d74d69b64 100644
--- a/dune/amdis/utility/Filesystem.cpp
+++ b/dune/amdis/utility/Filesystem.cpp
@@ -1,13 +1,5 @@
 #include "Filesystem.hpp"
 
-#include <string>
-#include <fstream>
-#include <stdio.h>  // defines FILENAME_MAX
-#include <cctype>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>    // errno, ENOENT, EEXIST
-
 #ifdef _WIN32
   #include <direct.h>   // _mkdir
   #define GET_CURRENT_DIR _getcwd
@@ -16,6 +8,15 @@
   #define GET_CURRENT_DIR getcwd
 #endif
 
+#include <errno.h>    // errno, ENOENT, EEXIST
+#include <stdio.h>  // defines FILENAME_MAX
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cctype>
+#include <fstream>
+#include <string>
+
 #include <dune/amdis/Output.hpp>
 
 template <class... Args>