diff --git a/exercises/exercise-basic/2p2cmain.cc b/exercises/exercise-basic/2p2cmain.cc
index 35006564cfdea37fcc34c069e46e198949691111..9bac025585fcd464f8ecfd2479890249bf2ba302 100644
--- a/exercises/exercise-basic/2p2cmain.cc
+++ b/exercises/exercise-basic/2p2cmain.cc
@@ -52,7 +52,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-basic/2pmain.cc b/exercises/exercise-basic/2pmain.cc
index 0a59395d941150eaa431e448cd2bb184c5463141..16d628b5a3b8124915fb9cf7a4c21a3c54509cc7 100644
--- a/exercises/exercise-basic/2pmain.cc
+++ b/exercises/exercise-basic/2pmain.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh
index 47d165c1caf1e16c309ef6dd02c3369562c23c9c..e2985372d68a7785dd45f1363d3914c2e1e0b003 100644
--- a/exercises/exercise-basic/injection2p2cproblem.hh
+++ b/exercises/exercise-basic/injection2p2cproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2P2C_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/binarycoefficients/h2o_n2.hh>
 
diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh
index cddb9195fda5422cccce6e851282f0f7763bca17..b45191f97cf45d4c091f29ccf2c3f607fd09825c 100644
--- a/exercises/exercise-basic/injection2pniproblem.hh
+++ b/exercises/exercise-basic/injection2pniproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh
index 20845f75dba354fc03131a1c044ea1e4f58dd899..ba30b0a578aca6b369f3a814221ea31c8bc82115 100644
--- a/exercises/exercise-basic/injection2pproblem.hh
+++ b/exercises/exercise-basic/injection2pproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh
index c63e6dc7ce3aa953b3aa5fecbda92b75e2e2c670..da6e8daeaa314978eee82e8e4464e5b8f21f8e5c 100644
--- a/exercises/exercise-biomineralization/biominproblem.hh
+++ b/exercises/exercise-biomineralization/biominproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 // TODO: dumux-course-task
diff --git a/exercises/exercise-biomineralization/fluidsystems/biomin.hh b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
index 32330fc0f28488930101e28eac67125cb4f1e780..ae2632fcdeea6997cdab89eed0968449a4ce8996 100644
--- a/exercises/exercise-biomineralization/fluidsystems/biomin.hh
+++ b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
@@ -332,20 +332,14 @@ public:
 
         // assume brine with viscosity effect of Ca for the liquid phase.
         if (phaseIdx == liquidPhaseIdx)
-        {
             return Brine::liquidViscosity(temperature, pressure);
-        }
 
         // assume pure CO2 for the gas phase.
         else if (phaseIdx == gasPhaseIdx)
-        {
             return CO2::gasViscosity(temperature, pressure);
-        }
 
         else
-        {
             DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
-        }
 
     }
 
diff --git a/exercises/exercise-biomineralization/main.cc b/exercises/exercise-biomineralization/main.cc
index 65511439789df7ed0ad4e729fd2a7714b9c2aecd..9aa45302983a3f1de066a4905849e666b6df80e6 100644
--- a/exercises/exercise-biomineralization/main.cc
+++ b/exercises/exercise-biomineralization/main.cc
@@ -54,7 +54,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 47a243eb4f1f6cebc13c3abf706ba351a75831b8..de401b44c0e33f118598c82a7293131e82bf08c9 100644
--- a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 
 #include <dumux/freeflow/navierstokes/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/main.cc b/exercises/exercise-coupling-ff-pm/interface/main.cc
index a3318b416a14e1e9b2793d339c3bcab38debc5ad..aa53262270fdf2580014e99593807f2a557f9e62 100644
--- a/exercises/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/exercise-coupling-ff-pm/interface/main.cc
@@ -48,7 +48,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 689e9b61dbeeda4fc614be5ebee0a5c208683312..5c4b8235693ebbdd47b02016b230ffcc1ebb4c64 100644
--- a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 0a4f0b999cb0aa1da7349017a8e0e83e25434f8b..4efa03b99402b2eed4aa841a4c6f45cf8123f0b6 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_STOKES1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/exercise-coupling-ff-pm/models/main.cc b/exercises/exercise-coupling-ff-pm/models/main.cc
index 584a8b301cfabba214e545f4b3f116810250741a..c19c3f9a6d06b8073be9c06d0a57cf540903a064 100644
--- a/exercises/exercise-coupling-ff-pm/models/main.cc
+++ b/exercises/exercise-coupling-ff-pm/models/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 28ebbb515a83179004c10b46d5d6709996a9c645..9d510fd219589ba6ffdb41b14ba73740570bf88e 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/io/gnuplotinterface.hh>
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 109c9a115769dade628658c3b161fb1a960e746f..392a2dc0ba928989326a72ca0a045e4dfca72807 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -24,6 +24,7 @@
 #define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/main.cc b/exercises/exercise-coupling-ff-pm/turbulence/main.cc
index bc17c3796c4d49ff784136c9f2685f546d836282..006688dc9287e6dd9b399fa17eb5b51677eac7aa 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/main.cc
+++ b/exercises/exercise-coupling-ff-pm/turbulence/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 3ec5c40057376ec1060c4ebed25bc59d9776b16d..328b8f0fde47c066182704e723393953e92e0675 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY2P2C_SUBPROBLEM_HH
 
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
diff --git a/exercises/exercise-fluidsystem/2p2cproblem.hh b/exercises/exercise-fluidsystem/2p2cproblem.hh
index 50933e81f26825b47769ea5a7f831750779a8eeb..5a43a26cdb15e798b275383c60008623136d3b3a 100644
--- a/exercises/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/exercise-fluidsystem/2p2cproblem.hh
@@ -26,6 +26,7 @@
 
 // The base porous media box problem
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh
index c9f74c9578ee558085eb63d8ec659ba2eccdd6c4..4786b3e79b62eaf3f3b247d4a519655fe1022855 100644
--- a/exercises/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/exercise-fluidsystem/2pproblem.hh
@@ -26,6 +26,7 @@
 
 // The porous media base problem
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 
 // The water component
diff --git a/exercises/exercise-fluidsystem/main.cc b/exercises/exercise-fluidsystem/main.cc
index caa371bdb989f448156cb7aa2b4069dc044f63b6..ddbb05f6e84c02f7fa71d450dab0849545d03278 100644
--- a/exercises/exercise-fluidsystem/main.cc
+++ b/exercises/exercise-fluidsystem/main.cc
@@ -56,7 +56,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-fractures/fractureproblem.hh b/exercises/exercise-fractures/fractureproblem.hh
index 1a69ca699d2fddcc5afd021ff2afbf5b92e361e9..b4b3687c7de9c8484878506d44665fe24397f31f 100644
--- a/exercises/exercise-fractures/fractureproblem.hh
+++ b/exercises/exercise-fractures/fractureproblem.hh
@@ -29,6 +29,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-fractures/main.cc b/exercises/exercise-fractures/main.cc
index a50dbc2faab3f12ad52f7fd561495214d770ec8a..12485ac9bb90cebfac354beb7bd8cd3492112e25 100644
--- a/exercises/exercise-fractures/main.cc
+++ b/exercises/exercise-fractures/main.cc
@@ -70,7 +70,7 @@ struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplin
 } // end namespace Dumux
 
 // main program
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-fractures/matrixproblem.hh b/exercises/exercise-fractures/matrixproblem.hh
index ae3076765c9d3de76cd9b6e6a1513b4e744200ca..ca9c07c70278f2df3e29301a18f2338104db51d2 100644
--- a/exercises/exercise-fractures/matrixproblem.hh
+++ b/exercises/exercise-fractures/matrixproblem.hh
@@ -33,6 +33,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-grids/main.cc b/exercises/exercise-grids/main.cc
index 2b9e531e0a377fdb1f6303ce50458f079f414a94..ab18bc538e9b9bbcca6f4b57da2b1eca37d0ba20 100644
--- a/exercises/exercise-grids/main.cc
+++ b/exercises/exercise-grids/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-grids/problem.hh b/exercises/exercise-grids/problem.hh
index b61d5a719cf391da53c496afa2b2f93f3c1d9e1d..a187cdc8c05b92b98858991236d4d6f32b575ceb 100644
--- a/exercises/exercise-grids/problem.hh
+++ b/exercises/exercise-grids/problem.hh
@@ -27,6 +27,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-mainfile/1pproblem.hh b/exercises/exercise-mainfile/1pproblem.hh
index 9f821fa154bca624ffb0d171188f9568e672a679..81c18c9dced15c21730a35863711e5915b717446 100644
--- a/exercises/exercise-mainfile/1pproblem.hh
+++ b/exercises/exercise-mainfile/1pproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-mainfile/exercise1pamain.cc b/exercises/exercise-mainfile/exercise1pamain.cc
index 7b6862d4b9ccc0200a2a4df29f602269a4b0aa0d..d3b3b5d50fe1dd160b2f5b18af2467fea30342a4 100644
--- a/exercises/exercise-mainfile/exercise1pamain.cc
+++ b/exercises/exercise-mainfile/exercise1pamain.cc
@@ -46,7 +46,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-mainfile/exercise1pbmain.cc b/exercises/exercise-mainfile/exercise1pbmain.cc
index 830c71a9435e05091d17be6513756ed938d0128c..eadf97acfef966d1ece656d823f72afb8664674d 100644
--- a/exercises/exercise-mainfile/exercise1pbmain.cc
+++ b/exercises/exercise-mainfile/exercise1pbmain.cc
@@ -47,7 +47,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-mainfile/exercise1pcmain.cc b/exercises/exercise-mainfile/exercise1pcmain.cc
index 20c87d17c794b47715cc5d496fdd6f4188781bac..003677cb2816118f62c33f98d674a142be530455 100644
--- a/exercises/exercise-mainfile/exercise1pcmain.cc
+++ b/exercises/exercise-mainfile/exercise1pcmain.cc
@@ -47,7 +47,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-properties/main.cc b/exercises/exercise-properties/main.cc
index 3b2d4baf3083db366bdf852a314c8e2a189cd53f..2f4b3774e3f611b9c0c017fc0942c3c5695c3ede 100644
--- a/exercises/exercise-properties/main.cc
+++ b/exercises/exercise-properties/main.cc
@@ -83,7 +83,7 @@ void usage(const char *progName, const std::string &errorMsg)
     }
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-properties/problem.hh b/exercises/exercise-properties/problem.hh
index 6e579c9096910641b5239a85c70128ad372c63b7..b71fb4287382d35b465cb1073f854006d3d0ec33 100644
--- a/exercises/exercise-properties/problem.hh
+++ b/exercises/exercise-properties/problem.hh
@@ -25,6 +25,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-runtimeparams/main.cc b/exercises/exercise-runtimeparams/main.cc
index a6cf7bda822e4e74be4bb78cc87ebf916dd90335..c16c2bd6409b531ac91d766400795730808933fb 100644
--- a/exercises/exercise-runtimeparams/main.cc
+++ b/exercises/exercise-runtimeparams/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-runtimeparams/problem.hh b/exercises/exercise-runtimeparams/problem.hh
index 12c72a9ece957d7684e390f74692cf338e8c3026..fb8f501fa49bd30233ad64a983279d1dac45b8d1 100644
--- a/exercises/exercise-runtimeparams/problem.hh
+++ b/exercises/exercise-runtimeparams/problem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-basic/2pnimain.cc b/exercises/solution/exercise-basic/2pnimain.cc
index 79b39ea9e01398d838b7d680a67e9ce6c996110b..df321e505e1177134baea5e013b959ed0f5476c0 100644
--- a/exercises/solution/exercise-basic/2pnimain.cc
+++ b/exercises/solution/exercise-basic/2pnimain.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh
index 282fc2f3d65dcbb62cb2822501e4bae59d83dee5..783fd212bb4b3a4319c5f8690478d1eed2bf2c77 100644
--- a/exercises/solution/exercise-basic/injection2pniproblem.hh
+++ b/exercises/solution/exercise-basic/injection2pniproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh
index 6f8b64a99a0f539c696bf35d6abac4c49640e85c..8cd46b4c93d1419d8b45d6ba77694f5529fdb617 100644
--- a/exercises/solution/exercise-biomineralization/biominproblem.hh
+++ b/exercises/solution/exercise-biomineralization/biominproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 // TODO: dumux-course-task
diff --git a/exercises/solution/exercise-biomineralization/main.cc b/exercises/solution/exercise-biomineralization/main.cc
index 65511439789df7ed0ad4e729fd2a7714b9c2aecd..9aa45302983a3f1de066a4905849e666b6df80e6 100644
--- a/exercises/solution/exercise-biomineralization/main.cc
+++ b/exercises/solution/exercise-biomineralization/main.cc
@@ -54,7 +54,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 311643c4aa2e9ccf2bbadd04c1d488bf049ea917..9f4427e750b60522a9e35bcda4e58ce77b1725f9 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -24,6 +24,7 @@
 #define DUMUX_STOKES_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
index 0cc7c91b7675a2c1c3920494efe44fc12f5d461a..c4ca97b17800968ef5499d5b605936d3015499bd 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
@@ -49,7 +49,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 57d55d0bbc8b72e76e4836f3b02503b8779827a8..9edcfe38578fdbd8ff87b4f363e37b91616a1a9f 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 39b3304b4cffabd6b93bd7fe86733c4ad0279a4d..d453f0bc55f443f44daa263fe5dd765439f319f5 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_STOKES1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/main.cc b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
index 614bec962f2cab22ebd809b22a911c11bcd779b8..7b1adffa52bff3948f0020ef853804b50bd0cc41 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 4c47a9acc62b94c1b3f98bb7a06951d480ec76cc..c07452cd1b1b96b0f9423459eb9a8c34865f4700 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/io/gnuplotinterface.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 891fb1585f1e9a25216b7b7ce9e03bb6cb810f47..f88c64d90ed3d9d010f5ff2a88b386c123941221 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -31,6 +31,7 @@
 
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
index 258be5ba43b90b5a9aee298ca7a93354e70e9020..880c3c29ae680767b9b097546156460d8bd48d3b 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 10f74908c52c0bc4a80e5f8c2fcbb056302e151c..cdf1f4e191d6d51035402dcb2e9103e5cef5fbe1 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY2P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
index 76f1fba56fe98f6388bf9da7c850dd063cf5a954..74a6cb4df2b3176ea93ebb0794c256b7fcab77f0 100644
--- a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
@@ -27,6 +27,7 @@
 // The base porous media box problem
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-fluidsystem/2pproblem.hh b/exercises/solution/exercise-fluidsystem/2pproblem.hh
index 7eac67ffd0f5525be38a5f6844b4c67fa3097734..e34bc3985f4ea70b7f5ab8bac2b4501a8e7f47d7 100644
--- a/exercises/solution/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2pproblem.hh
@@ -27,6 +27,7 @@
 // The porous media base problem
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 // The water component
 #include <dumux/material/components/tabulatedcomponent.hh>
diff --git a/exercises/solution/exercise-fluidsystem/main.cc b/exercises/solution/exercise-fluidsystem/main.cc
index a210b1e27488965093ca1291676c7a51f422dc23..60058a58bfd2986cf8298089a433249d6276499c 100644
--- a/exercises/solution/exercise-fluidsystem/main.cc
+++ b/exercises/solution/exercise-fluidsystem/main.cc
@@ -55,7 +55,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh
index 17740330cb5738be106599922efbb342dc0d696e..9a803e36a436f848a1307eaa5bccd7eb59fbbedd 100644
--- a/exercises/solution/exercise-fractures/fractureproblem.hh
+++ b/exercises/solution/exercise-fractures/fractureproblem.hh
@@ -29,6 +29,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-fractures/main.cc b/exercises/solution/exercise-fractures/main.cc
index 3b6943c667effc9583d54cdcef15570b3d32a9e0..f3d7e80aaca029edffc919dbd8f2ff723518688b 100644
--- a/exercises/solution/exercise-fractures/main.cc
+++ b/exercises/solution/exercise-fractures/main.cc
@@ -70,7 +70,7 @@ struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplin
 } // end namespace Dumux
 
 // main program
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-fractures/matrixproblem.hh b/exercises/solution/exercise-fractures/matrixproblem.hh
index 1e5239d19f7cff357fe4c2f6c4a2db2acab7936d..033e53f96a84aa1bf9e718cb1ef13634a3e78a99 100644
--- a/exercises/solution/exercise-fractures/matrixproblem.hh
+++ b/exercises/solution/exercise-fractures/matrixproblem.hh
@@ -33,6 +33,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-grids/main.cc b/exercises/solution/exercise-grids/main.cc
index edf5bfde4f4ba308e8075d1c85099d08720fb4bd..916d1e79b6b92ea7795c261774e410736a118bfe 100644
--- a/exercises/solution/exercise-grids/main.cc
+++ b/exercises/solution/exercise-grids/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-grids/problem.hh b/exercises/solution/exercise-grids/problem.hh
index ffdac3821f8c23531b444a57fb7e82904f4df502..1cd5cc456c7b74b1f535b6fe449d5b668c6b9908 100644
--- a/exercises/solution/exercise-grids/problem.hh
+++ b/exercises/solution/exercise-grids/problem.hh
@@ -27,6 +27,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-mainfile/1pproblem.hh b/exercises/solution/exercise-mainfile/1pproblem.hh
index deb3f45a0b83cde6ecf8983477a28d61fbf48bcd..f5a5bdbb5685766eafd01bae421f26f6931a117b 100644
--- a/exercises/solution/exercise-mainfile/1pproblem.hh
+++ b/exercises/solution/exercise-mainfile/1pproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc b/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
index ea615c46b1306275a01f72438ab5c205dabd6e92..fb8cb7280f7dbd82d4ade2d9e5d1ca893ed6c9e4 100644
--- a/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
+++ b/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
@@ -48,7 +48,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-properties/main.cc b/exercises/solution/exercise-properties/main.cc
index 7d25d8b4e2c0961b637d0bef57c60df4aecbd9f6..b5616e68b53b26743fe8419c69cd6187a2bdbe6d 100644
--- a/exercises/solution/exercise-properties/main.cc
+++ b/exercises/solution/exercise-properties/main.cc
@@ -84,7 +84,7 @@ void usage(const char *progName, const std::string &errorMsg)
     }
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-properties/problem.hh b/exercises/solution/exercise-properties/problem.hh
index b870dd3cda2de231cf50410c25e5fe61b8440cd0..ec2b921d93029aeb40df48029b4f2bdc927ddcc0 100644
--- a/exercises/solution/exercise-properties/problem.hh
+++ b/exercises/solution/exercise-properties/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/material/components/trichloroethene.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-runtimeparams/main.cc b/exercises/solution/exercise-runtimeparams/main.cc
index a6cf7bda822e4e74be4bb78cc87ebf916dd90335..c16c2bd6409b531ac91d766400795730808933fb 100644
--- a/exercises/solution/exercise-runtimeparams/main.cc
+++ b/exercises/solution/exercise-runtimeparams/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-runtimeparams/problem.hh b/exercises/solution/exercise-runtimeparams/problem.hh
index 55f4e4b282310f1f9589ac454bbfc854e7e1b616..85aba7c169d1407c4383f4f6f194516ad0227593 100644
--- a/exercises/solution/exercise-runtimeparams/problem.hh
+++ b/exercises/solution/exercise-runtimeparams/problem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {