diff --git a/src/core/Environment.cpp b/src/core/Environment.cpp
index 17f2e990b7bb6a73d2dd71df3d9487fdef4edcfc..b39a0b304c58ebe65356a587ec4264c7fe3c2754 100644
--- a/src/core/Environment.cpp
+++ b/src/core/Environment.cpp
@@ -31,7 +31,6 @@
 #include "core/uid/SUID.h"
 
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
 
 #include <algorithm>
 #include <functional>
diff --git a/src/core/cell/CellInterval.cpp b/src/core/cell/CellInterval.cpp
index 78f4501f0e1b6fb6db813b81b7ab4cf132f1091b..83ab0e33df531b98fc0505d05213e31ed3066457 100644
--- a/src/core/cell/CellInterval.cpp
+++ b/src/core/cell/CellInterval.cpp
@@ -23,8 +23,6 @@
 #include "CellSet.h"
 #include "CellVector.h"
 
-#include <boost/foreach.hpp>
-
 
 namespace walberla {
 namespace cell {
@@ -51,7 +49,7 @@ bool CellInterval::overlaps( const CellVector& cellVector ) const
    if( empty() )
       return false;
 
-   BOOST_FOREACH( const Cell & cell, cellVector )
+   for( const Cell & cell : cellVector )
    {
       if( this->contains( cell ) )
          return true;
diff --git a/src/core/config/ConfigToBoostPropertyTree.cpp b/src/core/config/ConfigToBoostPropertyTree.cpp
index 7fcc13247d9a7770e386469e69dc290aa9411a41..e3b5e6b40bc0ead8cd49fce3aba4c432f407d710 100644
--- a/src/core/config/ConfigToBoostPropertyTree.cpp
+++ b/src/core/config/ConfigToBoostPropertyTree.cpp
@@ -21,7 +21,6 @@
 
 #include "ConfigToBoostPropertyTree.h"
 
-#include <boost/foreach.hpp>
 #include <boost/property_tree/ptree.hpp>
 
 
@@ -39,7 +38,7 @@ boost::property_tree::iptree configBlockHandleToBoostPropertyTree( const Config:
 	Config::Blocks blocks;
 	blockHandle.getBlocks(blocks);
 
-	BOOST_FOREACH( const Config::BlockHandle & handle, blocks )
+	for( const Config::BlockHandle & handle : blocks )
 		propTree.add_child( handle.getKey(), configBlockHandleToBoostPropertyTree( handle ) );
 
 	return propTree;
diff --git a/tests/geometry/VoxelFileTest.cpp b/tests/geometry/VoxelFileTest.cpp
index 3d6d18fa1654edfacffe3637801e0f4274576557..e93b1cfa157ae4c023c8fe1bcbf330d2e3ac8775 100644
--- a/tests/geometry/VoxelFileTest.cpp
+++ b/tests/geometry/VoxelFileTest.cpp
@@ -53,7 +53,7 @@
 #include "core/mpi/MPIManager.h"
 
 #include "core/Filesystem.h"
-#include <boost/foreach.hpp>
+
 #include <random>
 
 #ifdef _MSC_VER