diff --git a/core/dictgen/res/OptionParser.h b/builtins/optionparser/OptionParser.h
similarity index 99%
rename from core/dictgen/res/OptionParser.h
rename to builtins/optionparser/OptionParser.h
index 207f3c862c79a..e7beeadeeab3f 100644
--- a/core/dictgen/res/OptionParser.h
+++ b/builtins/optionparser/OptionParser.h
@@ -38,8 +38,9 @@
  */
 
 /*
-Danio Piparo - Since we import this parser from tan external source, we keep
-track of the changes:
+Danio Piparo - Since we import this parser from tan external source,
+specifically https://sourceforge.net/projects/optionparser/ at version 1.3,
+we keep track of the changes:
 
 New Features 6-7-12:
  o Added FullArg class from the examples in the header
diff --git a/core/dictgen/CMakeLists.txt b/core/dictgen/CMakeLists.txt
index 3df26f190b2bd..dccbc9b297e38 100644
--- a/core/dictgen/CMakeLists.txt
+++ b/core/dictgen/CMakeLists.txt
@@ -44,6 +44,7 @@ endif()
 target_include_directories(Dictgen PRIVATE
   ${CMAKE_SOURCE_DIR}/core/dictgen/src
   ${CMAKE_SOURCE_DIR}/core/dictgen/res
+  ${CMAKE_SOURCE_DIR}/builtins/optionparser
   ${CMAKE_SOURCE_DIR}/core/foundation/res
   ${CMAKE_SOURCE_DIR}/core/clingutils/res
   ${CMAKE_SOURCE_DIR}/core/base/inc