diff --git a/amdis/AMDiS.hpp b/amdis/AMDiS.hpp
index cd8f65485f500dd75f3f5971117ba79117529de8..fee6417617a2f5d70133d3643f7782cdec714be9 100644
--- a/amdis/AMDiS.hpp
+++ b/amdis/AMDiS.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include <dune/common/deprecated.hh>
 
diff --git a/amdis/AdaptInfo.cpp b/amdis/AdaptInfo.cpp
index eabe3bfe36a8810782ab1c3a6a587cd9b8b39a7a..b8393e5835cfb1966366febf5a14227828aa3a74 100644
--- a/amdis/AdaptInfo.cpp
+++ b/amdis/AdaptInfo.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "AdaptInfo.hpp"
 
diff --git a/amdis/AdaptInstationary.cpp b/amdis/AdaptInstationary.cpp
index f5c4074e3b387621beb61d720e18667d0d1c5973..f5417deea58ba8206ed073e1f7dd05910987636c 100644
--- a/amdis/AdaptInstationary.cpp
+++ b/amdis/AdaptInstationary.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "AdaptInstationary.hpp"
 
diff --git a/amdis/AdaptStationary.cpp b/amdis/AdaptStationary.cpp
index fb596bdc5958f3896f7adda763d3a645ec4cae78..2f5bb053107d7133ba3e2099d1eeee40536963a4 100644
--- a/amdis/AdaptStationary.cpp
+++ b/amdis/AdaptStationary.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "AdaptStationary.hpp"
 
diff --git a/amdis/Environment.cpp b/amdis/Environment.cpp
index c024e3a4064406d97f193f0d34b67dcbbb274b72..1b8ad00943ccb91db42d3f8ca2efd86e524e7e8a 100644
--- a/amdis/Environment.cpp
+++ b/amdis/Environment.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "Environment.hpp"
 
diff --git a/amdis/Initfile.cpp b/amdis/Initfile.cpp
index 1bae7e2aa0d17ea14fd1aaed1f8d9737dd3222f8..4416b347b96414e403eea0c838dabbfb3132c625 100644
--- a/amdis/Initfile.cpp
+++ b/amdis/Initfile.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "Initfile.hpp"
 
diff --git a/amdis/InitfileParser.cpp b/amdis/InitfileParser.cpp
index 17a99d8f76475135f5f1ebf430192d2cf95340fa..5168fc044cc1b3ef97e629b02d754f183e496aab 100644
--- a/amdis/InitfileParser.cpp
+++ b/amdis/InitfileParser.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "InitfileParser.hpp"
 
diff --git a/amdis/ProblemInstat.cpp b/amdis/ProblemInstat.cpp
index b98790c083e632b13dc0441649ad62326e5b145f..6957ed5bd98affc3c173de04612b183579e5b942 100644
--- a/amdis/ProblemInstat.cpp
+++ b/amdis/ProblemInstat.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "ProblemInstat.hpp"
 
diff --git a/amdis/ProblemInstatBase.cpp b/amdis/ProblemInstatBase.cpp
index cea43009a34e8fe04b493c48944877c4209de9d3..0f6a210c9253e201788511fcbb2dddbfe9b88680 100644
--- a/amdis/ProblemInstatBase.cpp
+++ b/amdis/ProblemInstatBase.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "ProblemInstatBase.hpp"
 
diff --git a/amdis/ProblemStat.cpp b/amdis/ProblemStat.cpp
index d0397978204f5be854d4538fdd6330782e7695c2..4582d1143f0ffd5c2a218055743852976bab37ae 100644
--- a/amdis/ProblemStat.cpp
+++ b/amdis/ProblemStat.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "ProblemStat.hpp"
 
diff --git a/amdis/StandardProblemIteration.cpp b/amdis/StandardProblemIteration.cpp
index 5ab580f6f7351dec0730966b04c1ad01436cd45f..d3161c718e3e08a6f5262cfa3528096b88ad9896 100644
--- a/amdis/StandardProblemIteration.cpp
+++ b/amdis/StandardProblemIteration.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "StandardProblemIteration.hpp"
 
diff --git a/amdis/common/Filesystem.cpp b/amdis/common/Filesystem.cpp
index 6889d955281bb60c335c57167095f0036b5583ff..09a65123a7d8b7cf8b1fb78243ecd7ce07695bd9 100644
--- a/amdis/common/Filesystem.cpp
+++ b/amdis/common/Filesystem.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "Filesystem.hpp"
 
diff --git a/amdis/common/String.cpp b/amdis/common/String.cpp
index 7b70d1d88d17d2e33a4548894a62729566a82747..6efe18571275117b3929e071eede1a3135ffecdb 100644
--- a/amdis/common/String.cpp
+++ b/amdis/common/String.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "String.hpp"
 
diff --git a/amdis/io/FileWriterBase.cpp b/amdis/io/FileWriterBase.cpp
index 3ebe75c262cf93cdde9d925d36c13c7b87e41b23..e62739811186745b8805bcb23af8812088ca1b56 100644
--- a/amdis/io/FileWriterBase.cpp
+++ b/amdis/io/FileWriterBase.cpp
@@ -1,4 +1,5 @@
-#include "config.h"
+#include <config.h>
+
 #include "FileWriterBase.hpp"
 
 #include <amdis/AdaptInfo.hpp>
diff --git a/amdis/linearalgebra/istl/PreconCreator.cpp b/amdis/linearalgebra/istl/PreconCreator.cpp
index f62f069c2e524cf6b471e0199486918dc22f5572..a88de34159cecd97dbf1d1fe7df648b789eb1e3d 100644
--- a/amdis/linearalgebra/istl/PreconCreator.cpp
+++ b/amdis/linearalgebra/istl/PreconCreator.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "PreconCreator.hpp"
 #include "SolverCreator.hpp"
diff --git a/amdis/linearalgebra/istl/SolverCreator.cpp b/amdis/linearalgebra/istl/SolverCreator.cpp
index cdaf92b5b270be3cc052f42ee2f0ca59cf139b74..acf5aabb7a0e038bf195e058805df64fd240c93d 100644
--- a/amdis/linearalgebra/istl/SolverCreator.cpp
+++ b/amdis/linearalgebra/istl/SolverCreator.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "PreconCreator.hpp"
 #include "SolverCreator.hpp"
diff --git a/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp b/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
index 3e453a895ef799ea824652b1e233d85283481822..7920097a51ce51a8dc7cddfe76810cda0e08c806 100644
--- a/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
+++ b/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "Preconditioners.hpp"
 
diff --git a/amdis/linearalgebra/istl/precompiled/Solvers.cpp b/amdis/linearalgebra/istl/precompiled/Solvers.cpp
index 881266a1fcdcb265bce58443ec2cbf9706c32285..7d0c17ab8a2c6f567b7ea80c6116f9532507ab36 100644
--- a/amdis/linearalgebra/istl/precompiled/Solvers.cpp
+++ b/amdis/linearalgebra/istl/precompiled/Solvers.cpp
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include "Solvers.hpp"
 
diff --git a/examples/boundary.cc b/examples/boundary.cc
index 1550062c00790440ce7e21d17f92b87f6faefa0c..bbdda5b8f9760af959192ded2ff9b9a8f4b101bb 100644
--- a/examples/boundary.cc
+++ b/examples/boundary.cc
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
+
 #include <iostream>
 
 #if HAVE_DUNE_SPGRID
diff --git a/examples/convection_diffusion.cc b/examples/convection_diffusion.cc
index 6019b151c47ce7fc6223067de765521cbf72a4e9..cde566071d792da19f81e2cadc65b2a741ea1559 100644
--- a/examples/convection_diffusion.cc
+++ b/examples/convection_diffusion.cc
@@ -1,4 +1,5 @@
-#include "config.h"
+#include <config.h>
+
 #include <iostream>
 
 #include <amdis/AMDiS.hpp>
diff --git a/examples/heat.cc b/examples/heat.cc
index d419d0ddb0c739f754ddbb1c97cbaeaac3b46997..64c63517d218634a4b9cc724e5d1aad7d7ca93bc 100644
--- a/examples/heat.cc
+++ b/examples/heat.cc
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
+
 #include <iostream>
 
 #include <amdis/AMDiS.hpp>
diff --git a/examples/neumann.cc b/examples/neumann.cc
index d6d1c3de9590d3055ec5d89e8da093af0e86deab..6721f2285085e0d06398931eace09afbe141da38 100644
--- a/examples/neumann.cc
+++ b/examples/neumann.cc
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
+
 #include <iostream>
 
 #if HAVE_DUNE_SPGRID
diff --git a/examples/periodic.cc b/examples/periodic.cc
index 82bc88422aabfc6c78a6c885a1a4eac1f8dc56c4..97079e2713af8d681d29e07929a3934c98eca9e7 100644
--- a/examples/periodic.cc
+++ b/examples/periodic.cc
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
+
 #include <iostream>
 
 #if HAVE_DUNE_SPGRID
diff --git a/examples/surface.cc b/examples/surface.cc
index 2f8c8af27514240fb0aa78704caee6b4bd925ab9..2470fb08fb98c4aa9f8360d047fd15c10f7db5ab 100644
--- a/examples/surface.cc
+++ b/examples/surface.cc
@@ -1,4 +1,3 @@
-#include "config.h"
 #include <amdis/AMDiS.hpp>
 #include <amdis/Integrate.hpp>
 #include <amdis/LocalOperators.hpp>
diff --git a/examples/vecellipt.cc b/examples/vecellipt.cc
index 7f18356295fbfcaa4104057c49a2b544e62a1aa4..6f6b2048c5396651cc49a02494f0777b197c7fef 100644
--- a/examples/vecellipt.cc
+++ b/examples/vecellipt.cc
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <iostream>
 
diff --git a/test/AdaptiveGridTest.cpp b/test/AdaptiveGridTest.cpp
index 4436e81e8820601cec2d8ea96304fc83aa95949c..0bd0ccae25887335568e39428dcaa17989d74714 100644
--- a/test/AdaptiveGridTest.cpp
+++ b/test/AdaptiveGridTest.cpp
@@ -1,4 +1,5 @@
-#include "config.h"
+#include <config.h>
+
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/test/gridcheck.hh>
 
diff --git a/test/DOFVectorTest.cpp b/test/DOFVectorTest.cpp
index 5ecfc92b65ff43371668ba704744a7c6ad654490..c786f1306a12116303687d9f76482ed8b23eb2eb 100644
--- a/test/DOFVectorTest.cpp
+++ b/test/DOFVectorTest.cpp
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 
 #include <memory>
 
diff --git a/test/DataTransferTest.hpp b/test/DataTransferTest.hpp
index cf97beaca9681b8aa9c5577497b63076be81fc14..f209984c93a19f9174ebb67c7728c64c56a254d8 100644
--- a/test/DataTransferTest.hpp
+++ b/test/DataTransferTest.hpp
@@ -1,7 +1,4 @@
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include <array>
 #include <cmath>
diff --git a/test/ISTLCommTest.cpp b/test/ISTLCommTest.cpp
index a8b5791202f91a8673e1c2ac0615e87a6ac17672..335c1c14f6fee700ce9b3d3f68d05c10cb780ea7 100644
--- a/test/ISTLCommTest.cpp
+++ b/test/ISTLCommTest.cpp
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 
 #include <array>
 #include <bitset>
diff --git a/test/OperatorsTest.cpp b/test/OperatorsTest.cpp
index da142e9ac42b80d528d63a25e685960a25b077a6..495359dcef60f2a2770dddc4b8cac2034223dd12 100644
--- a/test/OperatorsTest.cpp
+++ b/test/OperatorsTest.cpp
@@ -1,6 +1,3 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-#include "config.h"
 #include <amdis/AMDiS.hpp>
 #include <amdis/ProblemStat.hpp>
 #include <amdis/LocalOperators.hpp>
diff --git a/test/TreeContainerTest.cpp b/test/TreeContainerTest.cpp
index 3c4be151af5eefd2fa093293a73625b688136f18..f3b5d8394cc5ac2ac0c2b166190751d840757bbc 100644
--- a/test/TreeContainerTest.cpp
+++ b/test/TreeContainerTest.cpp
@@ -1,4 +1,5 @@
-#include "config.h"
+#include <config.h>
+
 #include <dune/grid/yaspgrid.hh>
 
 #include <dune/functions/functionspacebases/compositebasis.hh>