diff --git a/src/storm-cli-utilities/cli.cpp b/src/storm-cli-utilities/cli.cpp
index cb33c3205..3ff4d4593 100644
--- a/src/storm-cli-utilities/cli.cpp
+++ b/src/storm-cli-utilities/cli.cpp
@@ -64,7 +64,7 @@ namespace storm {
         }
         
         
-        void printHeader(std::string const& name, const int argc, const char* argv[]) {
+        void printHeader(std::string const& name, const int argc, const char** argv) {
             STORM_PRINT(name << " " << storm::utility::StormVersion::shortVersionString() << std::endl << std::endl);
             
             // "Compute" the command line argument string with which storm was invoked.
diff --git a/src/storm-cli-utilities/cli.h b/src/storm-cli-utilities/cli.h
index 4decbb02c..e8d8601e9 100644
--- a/src/storm-cli-utilities/cli.h
+++ b/src/storm-cli-utilities/cli.h
@@ -11,7 +11,7 @@ namespace storm {
          */
         int64_t process(const int argc, const char** argv);
 
-        void printHeader(std::string const& name, const int argc, const char* argv[]);
+        void printHeader(std::string const& name, const int argc, const char** argv);
         
         void printVersion(std::string const& name);
             
@@ -27,7 +27,8 @@ namespace storm {
         bool parseOptions(const int argc, const char* argv[]);
         
         void processOptions();
-        
+
+        void setUrgentOptions();
     }
 }
 
diff --git a/src/storm-dft-cli/CMakeLists.txt b/src/storm-dft-cli/CMakeLists.txt
index b8cdbbd27..152fc5fc7 100644
--- a/src/storm-dft-cli/CMakeLists.txt
+++ b/src/storm-dft-cli/CMakeLists.txt
@@ -6,4 +6,4 @@ set_target_properties(storm-dft-cli PROPERTIES OUTPUT_NAME "storm-dft")
 add_dependencies(binaries storm-dft-cli)
 
 # installation
-install(TARGETS storm-dft-cli RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)
\ No newline at end of file
+install(TARGETS storm-dft-cli RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)
diff --git a/src/storm-dft-cli/storm-dyftee.cpp b/src/storm-dft-cli/storm-dyftee.cpp
index 001adabf4..b6fb0c751 100644
--- a/src/storm-dft-cli/storm-dyftee.cpp
+++ b/src/storm-dft-cli/storm-dyftee.cpp
@@ -28,8 +28,6 @@
 #include "storm-gspn/storm-gspn.h"
 #include "storm/settings/modules/GSPNSettings.h"
 #include "storm/settings/modules/GSPNExportSettings.h"
-#include "storm-cli-utilities/cli.cpp"
-
 
 #include <boost/lexical_cast.hpp>
 #include <memory>
diff --git a/src/storm-pars-cli/CMakeLists.txt b/src/storm-pars-cli/CMakeLists.txt
index bda5ad6c2..9e2f6f315 100644
--- a/src/storm-pars-cli/CMakeLists.txt
+++ b/src/storm-pars-cli/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Create storm-pars.
 add_executable(storm-pars-cli ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/storm-pars.cpp)
-target_link_libraries(storm-pars-cli storm-pars) # Adding headers for xcode
+target_link_libraries(storm-pars-cli storm-pars storm-cli-utilities) # Adding headers for xcode
 set_target_properties(storm-pars-cli PROPERTIES OUTPUT_NAME "storm-pars")
 
 add_dependencies(binaries storm-pars-cli)
diff --git a/src/storm-pars-cli/storm-pars.cpp b/src/storm-pars-cli/storm-pars.cpp
index 5fa744c59..907688ef4 100644
--- a/src/storm-pars-cli/storm-pars.cpp
+++ b/src/storm-pars-cli/storm-pars.cpp
@@ -7,6 +7,7 @@
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
 #include "storm-cli-utilities/cli.h"
+#include "storm-cli-utilities/model-handling.h"
 #include "storm/models/ModelBase.h"
 #include "storm/storage/SymbolicModelDescription.h"
 #include "storm/utility/file.h"
@@ -23,8 +24,6 @@
 #include "storm/exceptions/InvalidSettingsException.h"
 #include "storm/exceptions/NotSupportedException.h"
 
-#include "storm-cli-utilities/cli.cpp"
-
 namespace storm {
     namespace pars {