diff --git a/CMakeLists.txt b/CMakeLists.txt
index 920ab0398c0..1845d57d389 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,6 +219,7 @@ cprover_default_properties(
     big-int
     cbmc
     cbmc-lib
+    cli-utils
     cpp
     cprover-api-cpp
     cprover
diff --git a/jbmc/src/janalyzer/CMakeLists.txt b/jbmc/src/janalyzer/CMakeLists.txt
index be7a7c8e196..89e25f49e1b 100644
--- a/jbmc/src/janalyzer/CMakeLists.txt
+++ b/jbmc/src/janalyzer/CMakeLists.txt
@@ -10,6 +10,7 @@ generic_includes(janalyzer-lib)
 target_link_libraries(janalyzer-lib
     ansi-c
     java_bytecode
+    cli-utils
     linking
     big-int
     goto-analyzer-lib
diff --git a/jbmc/src/janalyzer/janalyzer_parse_options.h b/jbmc/src/janalyzer/janalyzer_parse_options.h
index b55e99db4c5..595156e1e5e 100644
--- a/jbmc/src/janalyzer/janalyzer_parse_options.h
+++ b/jbmc/src/janalyzer/janalyzer_parse_options.h
@@ -100,15 +100,14 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H
 #define CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 
-#include <langapi/language.h>
-
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_properties.h>
 
+#include <cli-utils/parse_options.h>
 #include <java_bytecode/java_bytecode_language.h>
+#include <langapi/language.h>
 
 class abstract_goto_modelt;
 class ai_baset;
diff --git a/jbmc/src/java_bytecode/java_bytecode_language.cpp b/jbmc/src/java_bytecode/java_bytecode_language.cpp
index dd19585c248..6be8776f45a 100644
--- a/jbmc/src/java_bytecode/java_bytecode_language.cpp
+++ b/jbmc/src/java_bytecode/java_bytecode_language.cpp
@@ -6,14 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com
 
 \*******************************************************************/
 
+#include "java_bytecode_convert_class.h"
 #include "java_bytecode_language.h"
 
-#include <fstream>
-#include <string>
-
-#include <linking/static_lifetime_init.h>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/expr_iterator.h>
 #include <util/invariant.h>
@@ -23,14 +18,16 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/suffix.h>
 #include <util/symbol_table_builder.h>
 
-#include <json/json_parser.h>
-
 #include <goto-programs/class_hierarchy.h>
 
+#include <cli-utils/cmdline.h>
+#include <json/json_parser.h>
+#include <linking/static_lifetime_init.h>
+
 #include "ci_lazy_methods.h"
 #include "create_array_with_type_intrinsic.h"
+#include "expr2java.h"
 #include "java_bytecode_concurrency_instrumentation.h"
-#include "java_bytecode_convert_class.h"
 #include "java_bytecode_convert_method.h"
 #include "java_bytecode_instrument.h"
 #include "java_bytecode_internal_additions.h"
@@ -44,10 +41,11 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "java_utils.h"
 #include "lambda_synthesis.h"
 #include "lift_clinit_calls.h"
-
-#include "expr2java.h"
 #include "load_method_by_regex.h"
 
+#include <fstream>
+#include <string>
+
 /// Parse options that are java bytecode specific.
 /// \param cmd: Command line
 /// \param [out] options: The options object that will be updated.
diff --git a/jbmc/src/java_bytecode/java_object_factory_parameters.cpp b/jbmc/src/java_bytecode/java_object_factory_parameters.cpp
index 9f44a4773bf..b734d3928ca 100644
--- a/jbmc/src/java_bytecode/java_object_factory_parameters.cpp
+++ b/jbmc/src/java_bytecode/java_object_factory_parameters.cpp
@@ -8,10 +8,11 @@ Author: Daniel Poetzl
 
 #include "java_object_factory_parameters.h"
 
-#include <util/cmdline.h>
 #include <util/exception_utils.h>
 #include <util/options.h>
 
+#include <cli-utils/cmdline.h>
+
 void java_object_factory_parameterst::set(const optionst &options)
 {
   object_factory_parameterst::set(options);
diff --git a/jbmc/src/jbmc/CMakeLists.txt b/jbmc/src/jbmc/CMakeLists.txt
index 44ab557443d..667d01e197d 100644
--- a/jbmc/src/jbmc/CMakeLists.txt
+++ b/jbmc/src/jbmc/CMakeLists.txt
@@ -11,6 +11,7 @@ target_link_libraries(jbmc-lib
     ansi-c
     big-int
     cbmc-lib
+    cli-utils
     goto-checker
     goto-instrument-lib
     goto-programs
diff --git a/jbmc/src/jbmc/jbmc_parse_options.h b/jbmc/src/jbmc/jbmc_parse_options.h
index a7264b9dd5b..481e401c4fd 100644
--- a/jbmc/src/jbmc/jbmc_parse_options.h
+++ b/jbmc/src/jbmc/jbmc_parse_options.h
@@ -12,25 +12,21 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_JBMC_JBMC_PARSE_OPTIONS_H
 #define CPROVER_JBMC_JBMC_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
 
-#include <langapi/language.h>
-
-#include <goto-checker/bmc_util.h>
-
 #include <goto-programs/class_hierarchy.h>
 #include <goto-programs/goto_trace.h>
 #include <goto-programs/show_properties.h>
 
-#include <solvers/strings/string_refinement.h>
-
+#include <cli-utils/parse_options.h>
+#include <goto-checker/bmc_util.h>
 #include <java_bytecode/java_bytecode_language.h>
 #include <java_bytecode/java_trace_validation.h>
-
 #include <json/json_interface.h>
+#include <langapi/language.h>
+#include <solvers/strings/string_refinement.h>
 #include <xmllang/xml_interface.h>
 
 class goto_functiont;
diff --git a/jbmc/src/jdiff/CMakeLists.txt b/jbmc/src/jdiff/CMakeLists.txt
index 7019fb02e19..69b2be89100 100644
--- a/jbmc/src/jdiff/CMakeLists.txt
+++ b/jbmc/src/jdiff/CMakeLists.txt
@@ -10,6 +10,7 @@ generic_includes(jdiff-lib)
 target_link_libraries(jdiff-lib
     ansi-c
     linking
+    cli-utils
     big-int
     pointer-analysis
     goto-diff-lib
diff --git a/jbmc/src/jdiff/jdiff_parse_options.h b/jbmc/src/jdiff/jdiff_parse_options.h
index 492ca7a13e3..9ed4d97def1 100644
--- a/jbmc/src/jdiff/jdiff_parse_options.h
+++ b/jbmc/src/jdiff/jdiff_parse_options.h
@@ -12,12 +12,12 @@ Author: Peter Schrammel
 #ifndef CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H
 #define CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_properties.h>
 
+#include <cli-utils/parse_options.h>
 #include <goto-instrument/cover.h>
 
 class goto_modelt;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51bfee0e30a..957e4478a52 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,6 +107,7 @@ add_subdirectory(linking)
 add_subdirectory(pointer-analysis)
 add_subdirectory(solvers)
 add_subdirectory(statement-list)
+add_subdirectory(cli-utils)
 add_subdirectory(util)
 
 add_subdirectory(cbmc)
diff --git a/src/cbmc/CMakeLists.txt b/src/cbmc/CMakeLists.txt
index 3086b19366c..cd5b0834828 100644
--- a/src/cbmc/CMakeLists.txt
+++ b/src/cbmc/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries(cbmc-lib
     ansi-c
     assembler
     big-int
+    cli-utils
     cpp
     goto-checker
     goto-instrument-lib
diff --git a/src/cbmc/cbmc_parse_options.h b/src/cbmc/cbmc_parse_options.h
index 8ec5b04ffaa..e83afb9c6e5 100644
--- a/src/cbmc/cbmc_parse_options.h
+++ b/src/cbmc/cbmc_parse_options.h
@@ -12,7 +12,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_CBMC_CBMC_PARSE_OPTIONS_H
 #define CPROVER_CBMC_CBMC_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
@@ -22,6 +21,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <ansi-c/ansi_c_language.h>
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <goto-checker/bmc_util.h>
 #include <goto-instrument/cover.h>
 #include <json/json_interface.h>
diff --git a/src/cli-utils/CMakeLists.txt b/src/cli-utils/CMakeLists.txt
new file mode 100644
index 00000000000..7fd6ea26052
--- /dev/null
+++ b/src/cli-utils/CMakeLists.txt
@@ -0,0 +1,10 @@
+file(GLOB_RECURSE sources "*.cpp" "*.h")
+
+add_library(cli-utils
+  ${sources})
+
+add_dependencies(cli-utils util)
+
+generic_includes(cli-utils)
+
+target_link_libraries(cli-utils util)
diff --git a/src/util/cmdline.cpp b/src/cli-utils/cmdline.cpp
similarity index 100%
rename from src/util/cmdline.cpp
rename to src/cli-utils/cmdline.cpp
diff --git a/src/util/cmdline.h b/src/cli-utils/cmdline.h
similarity index 99%
rename from src/util/cmdline.h
rename to src/cli-utils/cmdline.h
index 1d11496fd54..a0130e9e0ae 100644
--- a/src/util/cmdline.h
+++ b/src/cli-utils/cmdline.h
@@ -15,7 +15,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <string>
 #include <vector>
 
-#include "optional.h"
+#include <util/optional.h>
 
 class cmdlinet
 {
diff --git a/src/util/parse_options.cpp b/src/cli-utils/parse_options.cpp
similarity index 100%
rename from src/util/parse_options.cpp
rename to src/cli-utils/parse_options.cpp
diff --git a/src/util/parse_options.h b/src/cli-utils/parse_options.h
similarity index 96%
rename from src/util/parse_options.h
rename to src/cli-utils/parse_options.h
index 5d27d5ec8a2..5eab8738b61 100644
--- a/src/util/parse_options.h
+++ b/src/cli-utils/parse_options.h
@@ -13,8 +13,8 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <string>
 
 #include "cmdline.h"
-#include "message.h"
-#include "ui_message.h"
+#include "util/message.h"
+#include "util/ui_message.h"
 
 class parse_options_baset
 {
diff --git a/src/cprover/CMakeLists.txt b/src/cprover/CMakeLists.txt
index efc757bd34a..b4635c9a97d 100644
--- a/src/cprover/CMakeLists.txt
+++ b/src/cprover/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(cprover-lib
     assembler
     big-int
     cpp
+    cli-utils
     goto-checker
     goto-instrument-lib
     goto-programs
diff --git a/src/cprover/cprover_parse_options.cpp b/src/cprover/cprover_parse_options.cpp
index bd6ebc4d7c3..04a5dc84e2a 100644
--- a/src/cprover/cprover_parse_options.cpp
+++ b/src/cprover/cprover_parse_options.cpp
@@ -16,11 +16,12 @@ Author: Daniel Kroening, dkr@amazon.com
 #include <util/exit_codes.h>
 #include <util/help_formatter.h>
 #include <util/options.h>
-#include <util/parse_options.h>
 #include <util/signal_catcher.h>
 #include <util/ui_message.h>
 #include <util/version.h>
 
+#include <cli-utils/parse_options.h>
+
 #ifdef _WIN32
 #  include <util/unicode.h>
 #endif
diff --git a/src/crangler/CMakeLists.txt b/src/crangler/CMakeLists.txt
index 613b479301b..16470cf419a 100644
--- a/src/crangler/CMakeLists.txt
+++ b/src/crangler/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(crangler-lib
     big-int
     util
     json
+    cli-utils
 )
 
 # Executable
diff --git a/src/crangler/crangler_parse_options.h b/src/crangler/crangler_parse_options.h
index fa813436e25..1a572caa571 100644
--- a/src/crangler/crangler_parse_options.h
+++ b/src/crangler/crangler_parse_options.h
@@ -12,7 +12,7 @@ Author: Daniel Kroening, dkr@amazon.com
 #ifndef CPROVER_CRANGLER_CRANGLER_PARSE_OPTIONS_H
 #define CPROVER_CRANGLER_CRANGLER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
+#include <cli-utils/parse_options.h>
 
 class crangler_parse_optionst : public parse_options_baset
 {
diff --git a/src/goto-analyzer/CMakeLists.txt b/src/goto-analyzer/CMakeLists.txt
index 8486733a795..d778b4aec54 100644
--- a/src/goto-analyzer/CMakeLists.txt
+++ b/src/goto-analyzer/CMakeLists.txt
@@ -10,6 +10,7 @@ generic_includes(goto-analyzer-lib)
 target_link_libraries(goto-analyzer-lib
     ansi-c
     cpp
+    cli-utils
     linking
     big-int
     goto-checker
diff --git a/src/goto-analyzer/goto_analyzer_parse_options.h b/src/goto-analyzer/goto_analyzer_parse_options.h
index beda0d3a2d3..fcb39c252ad 100644
--- a/src/goto-analyzer/goto_analyzer_parse_options.h
+++ b/src/goto-analyzer/goto_analyzer_parse_options.h
@@ -89,7 +89,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H
 #define CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
@@ -100,6 +99,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <analyses/variable-sensitivity/variable_sensitivity_domain.h>
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <langapi/language.h>
 
 class optionst;
diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt
index 3547589b683..cfd735e7cef 100644
--- a/src/goto-cc/CMakeLists.txt
+++ b/src/goto-cc/CMakeLists.txt
@@ -11,6 +11,7 @@ target_link_libraries(goto-cc-lib
     big-int
     goto-programs
     util
+    cli-utils
     json
     linking
     ansi-c
diff --git a/src/goto-cc/as_mode.cpp b/src/goto-cc/as_mode.cpp
index d811a757bc2..0e88a8c2c8b 100644
--- a/src/goto-cc/as_mode.cpp
+++ b/src/goto-cc/as_mode.cpp
@@ -19,7 +19,6 @@ Author: Michael Tautschnig
 #include <sysexits.h>
 #endif
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
@@ -27,6 +26,8 @@ Author: Michael Tautschnig
 #include <util/tempdir.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"
diff --git a/src/goto-cc/compile.cpp b/src/goto-cc/compile.cpp
index 613e17bd94a..455b390773d 100644
--- a/src/goto-cc/compile.cpp
+++ b/src/goto-cc/compile.cpp
@@ -13,11 +13,6 @@ Date: June 2006
 
 #include "compile.h"
 
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
@@ -28,6 +23,12 @@ Date: June 2006
 #include <util/tempfile.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
+#include <cstring>
+#include <fstream>
+#include <iostream>
+
 #ifdef _MSC_VER
 #  include <util/unicode.h>
 #endif
diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp
index 5459ad361c1..5f57e904f1f 100644
--- a/src/goto-cc/gcc_mode.cpp
+++ b/src/goto-cc/gcc_mode.cpp
@@ -19,7 +19,6 @@ Author: CM Wintersteiger, 2006
 #include <sysexits.h>
 #endif
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
@@ -30,6 +29,8 @@ Author: CM Wintersteiger, 2006
 #include <util/tempdir.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"
diff --git a/src/goto-cc/goto_cc_cmdline.h b/src/goto-cc/goto_cc_cmdline.h
index e446de32352..346dab33b0e 100644
--- a/src/goto-cc/goto_cc_cmdline.h
+++ b/src/goto-cc/goto_cc_cmdline.h
@@ -14,7 +14,7 @@ Date:   April 2010
 #ifndef CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H
 #define CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H
 
-#include <util/cmdline.h>
+#include <cli-utils/cmdline.h>
 
 class goto_cc_cmdlinet:public cmdlinet
 {
diff --git a/src/goto-cc/goto_cc_mode.cpp b/src/goto-cc/goto_cc_mode.cpp
index 73f65ff95da..c0fc70c8ef5 100644
--- a/src/goto-cc/goto_cc_mode.cpp
+++ b/src/goto-cc/goto_cc_mode.cpp
@@ -23,9 +23,10 @@ Author: CM Wintersteiger, 2006
 
 #include <util/exception_utils.h>
 #include <util/message.h>
-#include <util/parse_options.h>
 #include <util/version.h>
 
+#include <cli-utils/parse_options.h>
+
 #include "goto_cc_cmdline.h"
 
 /// constructor
diff --git a/src/goto-cc/ld_mode.cpp b/src/goto-cc/ld_mode.cpp
index b443a4ef033..e28471340bf 100644
--- a/src/goto-cc/ld_mode.cpp
+++ b/src/goto-cc/ld_mode.cpp
@@ -19,21 +19,22 @@ Author: CM Wintersteiger, 2006
 #include <sysexits.h>
 #endif
 
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/invariant.h>
 #include <util/run.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"
 #include "linker_script_merge.h"
 
+#include <cstring>
+#include <fstream>
+#include <iostream>
+
 static std::string
 linker_name(const cmdlinet &cmdline, const std::string &base_name)
 {
diff --git a/src/goto-cc/linker_script_merge.cpp b/src/goto-cc/linker_script_merge.cpp
index c5210821505..f14b38f6af9 100644
--- a/src/goto-cc/linker_script_merge.cpp
+++ b/src/goto-cc/linker_script_merge.cpp
@@ -10,7 +10,6 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2017
 
 #include <util/arith_tools.h>
 #include <util/c_types.h>
-#include <util/cmdline.h>
 #include <util/expr_initializer.h>
 #include <util/magic.h>
 #include <util/pointer_expr.h>
@@ -21,6 +20,7 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2017
 #include <goto-programs/goto_model.h>
 #include <goto-programs/read_goto_binary.h>
 
+#include <cli-utils/cmdline.h>
 #include <json/json_parser.h>
 #include <linking/static_lifetime_init.h>
 
diff --git a/src/goto-checker/solver_factory.cpp b/src/goto-checker/solver_factory.cpp
index 4e43d5185c6..9c96d0fd1f8 100644
--- a/src/goto-checker/solver_factory.cpp
+++ b/src/goto-checker/solver_factory.cpp
@@ -11,7 +11,6 @@ Author: Daniel Kroening, Peter Schrammel
 
 #include "solver_factory.h"
 
-#include <util/cmdline.h>
 #include <util/exception_utils.h>
 #include <util/exit_codes.h>
 #include <util/make_unique.h>
@@ -19,6 +18,8 @@ Author: Daniel Kroening, Peter Schrammel
 #include <util/options.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
 #include <iostream>
 
 #ifdef _MSC_VER
diff --git a/src/goto-diff/CMakeLists.txt b/src/goto-diff/CMakeLists.txt
index 20e656c69ff..278f75b6e2e 100644
--- a/src/goto-diff/CMakeLists.txt
+++ b/src/goto-diff/CMakeLists.txt
@@ -11,6 +11,7 @@ target_link_libraries(goto-diff-lib
     ansi-c
     cpp
     linking
+    cli-utils
     big-int
     pointer-analysis
     goto-instrument-lib
diff --git a/src/goto-diff/goto_diff_parse_options.h b/src/goto-diff/goto_diff_parse_options.h
index c0518775a64..37639668a6f 100644
--- a/src/goto-diff/goto_diff_parse_options.h
+++ b/src/goto-diff/goto_diff_parse_options.h
@@ -12,7 +12,6 @@ Author: Peter Schrammel
 #ifndef CPROVER_GOTO_DIFF_GOTO_DIFF_PARSE_OPTIONS_H
 #define CPROVER_GOTO_DIFF_GOTO_DIFF_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 
@@ -20,6 +19,7 @@ Author: Peter Schrammel
 #include <goto-programs/show_properties.h>
 
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <goto-instrument/cover.h>
 
 class goto_modelt;
diff --git a/src/goto-harness/CMakeLists.txt b/src/goto-harness/CMakeLists.txt
index 25bd5f582f5..c1c5f001a03 100644
--- a/src/goto-harness/CMakeLists.txt
+++ b/src/goto-harness/CMakeLists.txt
@@ -4,6 +4,7 @@ generic_includes(goto-harness)
 
 target_link_libraries(goto-harness
   util
+  cli-utils
   goto-programs
   goto-instrument-lib
   json
diff --git a/src/goto-harness/goto_harness_parse_options.h b/src/goto-harness/goto_harness_parse_options.h
index 9a6887b3188..ea19174ff11 100644
--- a/src/goto-harness/goto_harness_parse_options.h
+++ b/src/goto-harness/goto_harness_parse_options.h
@@ -9,14 +9,14 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_GOTO_HARNESS_GOTO_HARNESS_PARSE_OPTIONS_H
 #define CPROVER_GOTO_HARNESS_GOTO_HARNESS_PARSE_OPTIONS_H
 
-#include <string>
-
-#include <util/parse_options.h>
+#include <cli-utils/parse_options.h>
 
 #include "function_harness_generator_options.h"
 #include "goto_harness_generator_factory.h"
 #include "memory_snapshot_harness_generator_options.h"
 
+#include <string>
+
 // clang-format off
 #define GOTO_HARNESS_OPTIONS                                                   \
   "(version)"                                                                  \
diff --git a/src/goto-inspect/CMakeLists.txt b/src/goto-inspect/CMakeLists.txt
index 846ee4b3cf5..da088ad385e 100644
--- a/src/goto-inspect/CMakeLists.txt
+++ b/src/goto-inspect/CMakeLists.txt
@@ -9,6 +9,7 @@ generic_includes(goto-inspect)
 target_link_libraries(goto-inspect
   util
   goto-programs
+  cli-utils
 )
 
 install(TARGETS goto-inspect DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/goto-inspect/goto_inspect_parse_options.h b/src/goto-inspect/goto_inspect_parse_options.h
index ae2b711c194..1049cb73e0c 100644
--- a/src/goto-inspect/goto_inspect_parse_options.h
+++ b/src/goto-inspect/goto_inspect_parse_options.h
@@ -3,7 +3,7 @@
 #ifndef CPROVER_GOTO_INSPECT_GOTO_INSPECT_PARSE_OPTIONS_H
 #define CPROVER_GOTO_INSPECT_GOTO_INSPECT_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
+#include <cli-utils/parse_options.h>
 
 // clang-format off
 #define GOTO_INSPECT_OPTIONS                                                   \
diff --git a/src/goto-instrument/CMakeLists.txt b/src/goto-instrument/CMakeLists.txt
index a1edca91f9a..87116384780 100644
--- a/src/goto-instrument/CMakeLists.txt
+++ b/src/goto-instrument/CMakeLists.txt
@@ -10,6 +10,7 @@ generic_includes(goto-instrument-lib)
 target_link_libraries(goto-instrument-lib
     ansi-c
     cpp
+    cli-utils
     linking
     big-int
     goto-programs
diff --git a/src/goto-instrument/cover.cpp b/src/goto-instrument/cover.cpp
index 1447191158c..fc5a873e099 100644
--- a/src/goto-instrument/cover.cpp
+++ b/src/goto-instrument/cover.cpp
@@ -13,14 +13,15 @@ Date: May 2016
 
 #include "cover.h"
 
-#include <util/message.h>
 #include <util/make_unique.h>
-#include <util/cmdline.h>
+#include <util/message.h>
 #include <util/options.h>
 
 #include <goto-programs/goto_model.h>
 #include <goto-programs/remove_skip.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "cover_basic_blocks.h"
 
 /// Applies instrumenters to given goto program
diff --git a/src/goto-instrument/goto_instrument_parse_options.h b/src/goto-instrument/goto_instrument_parse_options.h
index 07c0dfd9e1c..bde2de68ea3 100644
--- a/src/goto-instrument/goto_instrument_parse_options.h
+++ b/src/goto-instrument/goto_instrument_parse_options.h
@@ -13,7 +13,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #define CPROVER_GOTO_INSTRUMENT_GOTO_INSTRUMENT_PARSE_OPTIONS_H
 
 #include <util/config.h>
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
@@ -27,6 +26,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <ansi-c/ansi_c_language.h>
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <pointer-analysis/goto_program_dereference.h>
 
 #include "aggressive_slicer.h"
diff --git a/src/goto-instrument/nondet_volatile.cpp b/src/goto-instrument/nondet_volatile.cpp
index 5423c25b61e..5e3ab29f8ea 100644
--- a/src/goto-instrument/nondet_volatile.cpp
+++ b/src/goto-instrument/nondet_volatile.cpp
@@ -13,7 +13,6 @@ Date: September 2011
 
 #include "nondet_volatile.h"
 
-#include <util/cmdline.h>
 #include <util/fresh_symbol.h>
 #include <util/options.h>
 #include <util/pointer_expr.h>
@@ -23,6 +22,8 @@ Date: September 2011
 
 #include <goto-programs/goto_model.h>
 
+#include <cli-utils/cmdline.h>
+
 class nondet_volatilet
 {
 public:
diff --git a/src/goto-programs/restrict_function_pointers.cpp b/src/goto-programs/restrict_function_pointers.cpp
index 1fa3c6f94be..05346dd709a 100644
--- a/src/goto-programs/restrict_function_pointers.cpp
+++ b/src/goto-programs/restrict_function_pointers.cpp
@@ -8,15 +8,14 @@ Author: Diffblue Ltd.
 
 #include "restrict_function_pointers.h"
 
-#include <ansi-c/expr2c.h>
-
-#include <json/json_parser.h>
-
-#include <util/cmdline.h>
 #include <util/options.h>
 #include <util/pointer_expr.h>
 #include <util/string_utils.h>
 
+#include <ansi-c/expr2c.h>
+#include <cli-utils/cmdline.h>
+#include <json/json_parser.h>
+
 #include "goto_model.h"
 #include "remove_function_pointers.h"
 
diff --git a/src/goto-symex/path_storage.cpp b/src/goto-symex/path_storage.cpp
index 39134334753..4f74005178e 100644
--- a/src/goto-symex/path_storage.cpp
+++ b/src/goto-symex/path_storage.cpp
@@ -8,12 +8,13 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>
 
 #include "path_storage.h"
 
-#include <sstream>
-
-#include <util/cmdline.h>
 #include <util/exit_codes.h>
 #include <util/make_unique.h>
 
+#include <cli-utils/cmdline.h>
+
+#include <sstream>
+
 nondet_symbol_exprt symex_nondet_generatort::
 operator()(typet type, source_locationt location)
 {
diff --git a/src/goto-synthesizer/CMakeLists.txt b/src/goto-synthesizer/CMakeLists.txt
index fb4d06cc985..620e615894d 100644
--- a/src/goto-synthesizer/CMakeLists.txt
+++ b/src/goto-synthesizer/CMakeLists.txt
@@ -10,6 +10,7 @@ generic_includes(goto-synthesizer-lib)
 target_link_libraries(goto-synthesizer-lib
     ansi-c
     cpp
+    cli-utils
     big-int
     goto-checker
     goto-instrument-lib
diff --git a/src/goto-synthesizer/goto_synthesizer_parse_options.h b/src/goto-synthesizer/goto_synthesizer_parse_options.h
index 94af3d87e6f..2cd0c594a3b 100644
--- a/src/goto-synthesizer/goto_synthesizer_parse_options.h
+++ b/src/goto-synthesizer/goto_synthesizer_parse_options.h
@@ -11,10 +11,10 @@ Author: Qinheping Hu
 
 #include <util/config.h>
 #include <util/options.h>
-#include <util/parse_options.h>
 
 #include <goto-programs/goto_model.h>
 
+#include <cli-utils/parse_options.h>
 #include <goto-checker/solver_factory.h>
 #include <goto-instrument/contracts/contracts.h>
 
diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt
index 1454d78bece..33237f8df23 100644
--- a/src/json/CMakeLists.txt
+++ b/src/json/CMakeLists.txt
@@ -10,4 +10,4 @@ add_library(json
 
 generic_includes(json)
 
-target_link_libraries(json util)
+target_link_libraries(json util cli-utils)
diff --git a/src/json/json_interface.cpp b/src/json/json_interface.cpp
index da9eb512dd2..54d69a7387d 100644
--- a/src/json/json_interface.cpp
+++ b/src/json/json_interface.cpp
@@ -11,11 +11,12 @@ Author: Peter Schrammel
 
 #include "json_interface.h"
 
-#include <util/cmdline.h>
 #include <util/exception_utils.h>
 #include <util/json.h>
 #include <util/message.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "json_parser.h"
 
 #include <iostream>
diff --git a/src/libcprover-cpp/api.cpp b/src/libcprover-cpp/api.cpp
index 8b606818d79..a4d6a67bccf 100644
--- a/src/libcprover-cpp/api.cpp
+++ b/src/libcprover-cpp/api.cpp
@@ -2,7 +2,6 @@
 
 #include "api.h"
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/invariant.h>
 #include <util/message.h>
@@ -22,6 +21,7 @@
 #include <ansi-c/cprover_library.h>
 #include <ansi-c/gcc_version.h>
 #include <assembler/remove_asm.h>
+#include <cli-utils/cmdline.h>
 #include <goto-checker/all_properties_verifier_with_trace_storage.h>
 #include <goto-checker/multi_path_symex_checker.h>
 #include <langapi/mode.h>
diff --git a/src/libcprover-cpp/api_options.cpp b/src/libcprover-cpp/api_options.cpp
index d11e01785ac..0051953ec76 100644
--- a/src/libcprover-cpp/api_options.cpp
+++ b/src/libcprover-cpp/api_options.cpp
@@ -2,11 +2,11 @@
 
 #include "api_options.h"
 
-#include <util/cmdline.h>
 #include <util/make_unique.h>
 #include <util/options.h>
 
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/cmdline.h>
 #include <goto-checker/solver_factory.h>
 
 api_optionst api_optionst::create()
diff --git a/src/memory-analyzer/CMakeLists.txt b/src/memory-analyzer/CMakeLists.txt
index bbceb52c556..588441268e1 100644
--- a/src/memory-analyzer/CMakeLists.txt
+++ b/src/memory-analyzer/CMakeLists.txt
@@ -9,6 +9,7 @@ generic_includes(memory-analyzer-lib)
 
 target_link_libraries(memory-analyzer-lib
     ansi-c
+    cli-utils
     goto-programs
     util
 )
diff --git a/src/memory-analyzer/memory_analyzer_parse_options.h b/src/memory-analyzer/memory_analyzer_parse_options.h
index 9250add523f..55b59816a1c 100644
--- a/src/memory-analyzer/memory_analyzer_parse_options.h
+++ b/src/memory-analyzer/memory_analyzer_parse_options.h
@@ -14,7 +14,8 @@ Author: Malte Mues <mail.mues@gmail.com>
 #define CPROVER_MEMORY_ANALYZER_MEMORY_ANALYZER_PARSE_OPTIONS_H
 
 #include <util/message.h>
-#include <util/parse_options.h>
+
+#include <cli-utils/parse_options.h>
 
 // clang-format off
 #define MEMORY_ANALYZER_OPTIONS \
diff --git a/src/symtab2gb/CMakeLists.txt b/src/symtab2gb/CMakeLists.txt
index 8a4b1f5ea24..cfbd6ac53df 100644
--- a/src/symtab2gb/CMakeLists.txt
+++ b/src/symtab2gb/CMakeLists.txt
@@ -8,6 +8,7 @@ generic_includes(symtab2gb)
 target_link_libraries(symtab2gb
         util
         ansi-c
+        cli-utils
         goto-programs
         json-symtab-language)
 
diff --git a/src/symtab2gb/symtab2gb_parse_options.h b/src/symtab2gb/symtab2gb_parse_options.h
index 61f482460c4..744b61f4f96 100644
--- a/src/symtab2gb/symtab2gb_parse_options.h
+++ b/src/symtab2gb/symtab2gb_parse_options.h
@@ -9,7 +9,7 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_SYMTAB2GB_SYMTAB2GB_PARSE_OPTIONS_H
 #define CPROVER_SYMTAB2GB_SYMTAB2GB_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
+#include <cli-utils/parse_options.h>
 
 #define SYMTAB2GB_OUT_FILE_OPT "out"
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 6d693238a2a..5bbc2aa98c1 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -48,7 +48,7 @@ add_dependencies(util generate_version_cpp)
 
 generic_includes(util)
 
-target_link_libraries(util big-int langapi)
+target_link_libraries(util big-int langapi cli-utils)
 if(WIN32)
   target_link_libraries(util dbghelp)
 endif()
diff --git a/src/util/config.cpp b/src/util/config.cpp
index 5aab9d07ea8..3515320ea1b 100644
--- a/src/util/config.cpp
+++ b/src/util/config.cpp
@@ -8,8 +8,9 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "config.h"
 
+#include <cli-utils/cmdline.h>
+
 #include "arith_tools.h"
-#include "cmdline.h"
 #include "cprover_prefix.h"
 #include "exception_utils.h"
 #include "namespace.h"
diff --git a/src/util/object_factory_parameters.cpp b/src/util/object_factory_parameters.cpp
index 9926f6e86d9..5862bc71306 100644
--- a/src/util/object_factory_parameters.cpp
+++ b/src/util/object_factory_parameters.cpp
@@ -8,9 +8,10 @@ Author: Diffblue Ltd
 
 #include "object_factory_parameters.h"
 
-#include <util/cmdline.h>
 #include <util/options.h>
 
+#include <cli-utils/cmdline.h>
+
 void object_factory_parameterst::set(const optionst &options)
 {
   if(options.is_set("max-nondet-array-length"))
diff --git a/src/util/ui_message.cpp b/src/util/ui_message.cpp
index 13204451ead..80dc56c580f 100644
--- a/src/util/ui_message.cpp
+++ b/src/util/ui_message.cpp
@@ -8,7 +8,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "ui_message.h"
 
-#include "cmdline.h"
+#include <cli-utils/cmdline.h>
+
 #include "cout_message.h"
 #include "json.h"
 #include "json_irep.h"
diff --git a/src/xmllang/CMakeLists.txt b/src/xmllang/CMakeLists.txt
index 318e90b8017..6ca3edcccfc 100644
--- a/src/xmllang/CMakeLists.txt
+++ b/src/xmllang/CMakeLists.txt
@@ -10,4 +10,4 @@ add_library(xml
 
 generic_includes(xml)
 
-target_link_libraries(xml util)
+target_link_libraries(xml util cli-utils)
diff --git a/src/xmllang/xml_interface.cpp b/src/xmllang/xml_interface.cpp
index c578a4c7bdf..40d6f4814f9 100644
--- a/src/xmllang/xml_interface.cpp
+++ b/src/xmllang/xml_interface.cpp
@@ -11,14 +11,14 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "xml_interface.h"
 
-#include <iostream>
-
-#include <util/cmdline.h>
 #include <util/exception_utils.h>
 #include <util/message.h>
 
+#include <cli-utils/cmdline.h>
 #include <xmllang/xml_parser.h>
 
+#include <iostream>
+
 /// Parse commandline options from \p xml into \p cmdline
 static void get_xml_options(const xmlt &xml, cmdlinet &cmdline)
 {
diff --git a/unit/CMakeLists.txt b/unit/CMakeLists.txt
index 9e9985a9b61..bc48c21ef56 100644
--- a/unit/CMakeLists.txt
+++ b/unit/CMakeLists.txt
@@ -84,6 +84,7 @@ target_link_libraries(
         unit
         testing-utils
         ansi-c
+        cli-utils
         solvers
         goto-cc-lib
         goto-checker
diff --git a/unit/compound_block_locations.cpp b/unit/compound_block_locations.cpp
index d607d37ddd7..98829474682 100644
--- a/unit/compound_block_locations.cpp
+++ b/unit/compound_block_locations.cpp
@@ -8,7 +8,6 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2018
 
 #include "compound_block_locations.h"
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/options.h>
 #include <util/std_code.h>
@@ -18,6 +17,7 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2018
 
 #include <ansi-c/ansi_c_language.h>
 #include <cbmc/cbmc_parse_options.h>
+#include <cli-utils/cmdline.h>
 #include <goto-instrument/goto_program2code.h>
 #include <langapi/mode.h>
 #include <testing-utils/use_catch.h>
diff --git a/unit/json_symbol_table.cpp b/unit/json_symbol_table.cpp
index b26b0b8bbe4..f73035724e7 100644
--- a/unit/json_symbol_table.cpp
+++ b/unit/json_symbol_table.cpp
@@ -2,18 +2,17 @@
 
 /// \file json symbol table read/write consistency
 
-#include <goto-programs/goto_model.h>
-#include <goto-programs/show_symbol_table.h>
-
-#include <json-symtab-language/json_symbol_table.h>
-#include <json/json_parser.h>
-
-#include <util/cmdline.h>
 #include <util/json_stream.h>
 #include <util/message.h>
 #include <util/symbol_table.h>
 #include <util/ui_message.h>
 
+#include <goto-programs/goto_model.h>
+#include <goto-programs/show_symbol_table.h>
+
+#include <cli-utils/cmdline.h>
+#include <json-symtab-language/json_symbol_table.h>
+#include <json/json_parser.h>
 #include <testing-utils/get_goto_model_from_c.h>
 #include <testing-utils/message.h>
 #include <testing-utils/use_catch.h>
diff --git a/unit/path_strategies.cpp b/unit/path_strategies.cpp
index 3bdc97c2fd2..e38440e5d27 100644
--- a/unit/path_strategies.cpp
+++ b/unit/path_strategies.cpp
@@ -6,31 +6,24 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2018
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
-
-#include <path_strategies.h>
-
-#include <fstream>
-#include <functional>
-#include <string>
+#include <util/config.h>
+#include <util/tempfile.h>
 
 #include <ansi-c/ansi_c_language.h>
-
 #include <cbmc/cbmc_parse_options.h>
-
+#include <cli-utils/cmdline.h>
 #include <goto-checker/bmc_util.h>
 #include <goto-checker/goto_symex_property_decider.h>
 #include <goto-checker/symex_bmc.h>
-
-#include <goto-symex/path_storage.h>
-
 #include <goto-instrument/unwindset.h>
-
+#include <goto-symex/path_storage.h>
 #include <langapi/mode.h>
+#include <testing-utils/use_catch.h>
 
-#include <util/cmdline.h>
-#include <util/config.h>
-#include <util/tempfile.h>
+#include <fstream>
+#include <functional>
+#include <path_strategies.h>
+#include <string>
 
 // The actual test suite.
 //
diff --git a/unit/testing-utils/CMakeLists.txt b/unit/testing-utils/CMakeLists.txt
index d385ef87937..0a48c66a570 100644
--- a/unit/testing-utils/CMakeLists.txt
+++ b/unit/testing-utils/CMakeLists.txt
@@ -2,6 +2,7 @@ file(GLOB_RECURSE sources "*.cpp" "*.h")
 add_library(testing-utils ${sources})
 target_link_libraries(testing-utils
     util
+    cli-utils
 )
 target_include_directories(testing-utils
     PUBLIC
diff --git a/unit/testing-utils/free_form_cmdline.h b/unit/testing-utils/free_form_cmdline.h
index f20b823c84e..c4a03b3f68d 100644
--- a/unit/testing-utils/free_form_cmdline.h
+++ b/unit/testing-utils/free_form_cmdline.h
@@ -9,7 +9,7 @@ Author: Diffblue Limited.
 #ifndef CPROVER_TESTING_UTILS_FREE_FORM_CMDLINE_H
 #define CPROVER_TESTING_UTILS_FREE_FORM_CMDLINE_H
 
-#include <util/cmdline.h>
+#include <cli-utils/cmdline.h>
 
 /// An implementation of cmdlinet to be used in tests. It does not require
 /// specifying exactly what flags are supported and instead allows setting any
diff --git a/unit/testing-utils/get_goto_model_from_c.cpp b/unit/testing-utils/get_goto_model_from_c.cpp
index e9437bacc80..68eb74f8c9e 100644
--- a/unit/testing-utils/get_goto_model_from_c.cpp
+++ b/unit/testing-utils/get_goto_model_from_c.cpp
@@ -8,20 +8,18 @@ Author: Daniel Poetzl
 
 #include "get_goto_model_from_c.h"
 
-#include <ansi-c/ansi_c_language.h>
-
-#include <goto-programs/goto_convert_functions.h>
-
-#include <langapi/language_file.h>
-#include <langapi/mode.h>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/exception_utils.h>
 #include <util/invariant.h>
 #include <util/message.h>
 #include <util/symbol_table.h>
 
+#include <goto-programs/goto_convert_functions.h>
+
+#include <ansi-c/ansi_c_language.h>
+#include <cli-utils/cmdline.h>
+#include <langapi/language_file.h>
+#include <langapi/mode.h>
 #include <testing-utils/message.h>
 
 goto_modelt get_goto_model_from_c(std::istream &in)
diff --git a/unit/util/cmdline.cpp b/unit/util/cmdline.cpp
index eebd48b4881..07e89668a32 100644
--- a/unit/util/cmdline.cpp
+++ b/unit/util/cmdline.cpp
@@ -6,9 +6,10 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <array>
+#include <cli-utils/cmdline.h>
 #include <testing-utils/use_catch.h>
-#include <util/cmdline.h>
+
+#include <array>
 
 TEST_CASE("cmdlinet::has_option", "[core][util][cmdline]")
 {
diff --git a/unit/util/lower_byte_operators.cpp b/unit/util/lower_byte_operators.cpp
index 59c384b24c4..608f927ac5a 100644
--- a/unit/util/lower_byte_operators.cpp
+++ b/unit/util/lower_byte_operators.cpp
@@ -9,7 +9,6 @@
 #include <util/arith_tools.h>
 #include <util/byte_operators.h>
 #include <util/c_types.h>
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/expr_util.h>
 #include <util/namespace.h>
@@ -20,6 +19,7 @@
 #include <util/string_constant.h>
 #include <util/symbol_table.h>
 
+#include <cli-utils/cmdline.h>
 #include <testing-utils/use_catch.h>
 
 TEST_CASE("byte extract and bits", "[core][util][lowering][byte_extract]")
diff --git a/unit/util/parse_options.cpp b/unit/util/parse_options.cpp
index 603671fdf3f..b0351a64b0d 100644
--- a/unit/util/parse_options.cpp
+++ b/unit/util/parse_options.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \******************************************************************/
 
+#include <cli-utils/parse_options.h>
 #include <testing-utils/use_catch.h>
-#include <util/parse_options.h>
 
 TEST_CASE("align_center_with_border", "[core][util]")
 {
diff --git a/unit/util/pointer_offset_size.cpp b/unit/util/pointer_offset_size.cpp
index a091f1c7f42..70b3ef6fabc 100644
--- a/unit/util/pointer_offset_size.cpp
+++ b/unit/util/pointer_offset_size.cpp
@@ -6,18 +6,18 @@ Author: Michael Tautschnig
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
-
 #include <util/arith_tools.h>
 #include <util/byte_operators.h>
 #include <util/c_types.h>
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/namespace.h>
 #include <util/pointer_offset_size.h>
 #include <util/std_expr.h>
 #include <util/symbol_table.h>
 
+#include <cli-utils/cmdline.h>
+#include <testing-utils/use_catch.h>
+
 TEST_CASE("Build subexpression to access element at offset into array")
 {
   // this test does require a proper architecture to be set so that byte extract
diff --git a/unit/util/simplify_expr.cpp b/unit/util/simplify_expr.cpp
index 756666240a6..e3f3305df9d 100644
--- a/unit/util/simplify_expr.cpp
+++ b/unit/util/simplify_expr.cpp
@@ -6,13 +6,10 @@ Author: Michael Tautschnig
 
 \*******************************************************************/
 
-#include <testing-utils/use_catch.h>
-
 #include <util/arith_tools.h>
 #include <util/bitvector_expr.h>
 #include <util/byte_operators.h>
 #include <util/c_types.h>
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/namespace.h>
 #include <util/pointer_expr.h>
@@ -22,6 +19,9 @@ Author: Michael Tautschnig
 #include <util/std_expr.h>
 #include <util/symbol_table.h>
 
+#include <cli-utils/cmdline.h>
+#include <testing-utils/use_catch.h>
+
 TEST_CASE("Simplify pointer_offset(address of array index)", "[core][util]")
 {
   config.set_arch("none");