diff --git a/src/storm/modelchecker/multiobjective/preprocessing/SparseMultiObjectiveRewardAnalysis.cpp b/src/storm/modelchecker/multiobjective/preprocessing/SparseMultiObjectiveRewardAnalysis.cpp
index e534212e99..8e4d80e844 100644
--- a/src/storm/modelchecker/multiobjective/preprocessing/SparseMultiObjectiveRewardAnalysis.cpp
+++ b/src/storm/modelchecker/multiobjective/preprocessing/SparseMultiObjectiveRewardAnalysis.cpp
@@ -3,6 +3,10 @@
 #include <algorithm>
 #include <set>
 
+#include "storm/adapters/RationalNumberAdapter.h"
+#include "storm/exceptions/InvalidPropertyException.h"
+#include "storm/exceptions/NotImplementedException.h"
+#include "storm/exceptions/UnexpectedException.h"
 #include "storm/modelchecker/prctl/helper/BaierUpperRewardBoundsComputer.h"
 #include "storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
 #include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
@@ -16,10 +20,6 @@
 #include "storm/utility/macros.h"
 #include "storm/utility/vector.h"
 
-#include "storm/exceptions/InvalidPropertyException.h"
-#include "storm/exceptions/NotImplementedException.h"
-#include "storm/exceptions/UnexpectedException.h"
-
 namespace storm {
 namespace modelchecker {
 namespace multiobjective {
diff --git a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
index fc2b1d886a..eec6f78705 100644
--- a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.cpp
@@ -1,4 +1,6 @@
-#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+#include "storm/adapters/RationalNumberAdapter.h"  // Must come first
+
+#include "ExplicitQualitativeCheckResult.h"
 
 #include "storm/adapters/JsonAdapter.h"
 #include "storm/exceptions/InvalidOperationException.h"
diff --git a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
index 659ed142de..3bc603216f 100644
--- a/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
+++ b/src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h
@@ -1,6 +1,4 @@
-#ifndef STORM_MODELCHECKER_EXPLICITQUALITATIVECHECKRESULT_H_
-#define STORM_MODELCHECKER_EXPLICITQUALITATIVECHECKRESULT_H_
-
+#pragma once
 #include <boost/variant.hpp>
 #include <functional>
 #include <map>
@@ -76,5 +74,3 @@ class ExplicitQualitativeCheckResult : public QualitativeCheckResult {
 };
 }  // namespace modelchecker
 }  // namespace storm
-
-#endif /* STORM_MODELCHECKER_EXPLICITQUALITATIVECHECKRESULT_H_ */
diff --git a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
index d0bdedebe3..021cf6c4c7 100644
--- a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
+++ b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
@@ -1,4 +1,6 @@
-#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "storm/adapters/RationalNumberAdapter.h"  // Must come first
+
+#include "ExplicitQuantitativeCheckResult.h"
 
 #include "storm/adapters/JsonAdapter.h"
 #include "storm/adapters/RationalFunctionAdapter.h"
diff --git a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
index 843ca00061..ca6ea5fe31 100644
--- a/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
+++ b/src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h
@@ -1,6 +1,4 @@
-#ifndef STORM_MODELCHECKER_EXPLICITQUANTITATIVECHECKRESULT_H_
-#define STORM_MODELCHECKER_EXPLICITQUANTITATIVECHECKRESULT_H_
-
+#pragma once
 #include <boost/optional.hpp>
 #include <boost/variant.hpp>
 #include <map>
@@ -93,5 +91,3 @@ class ExplicitQuantitativeCheckResult : public QuantitativeCheckResult<ValueType
 };
 }  // namespace modelchecker
 }  // namespace storm
-
-#endif /* STORM_MODELCHECKER_EXPLICITQUANTITATIVECHECKRESULT_H_ */