diff --git a/3rdParty b/3rdParty
index 6a455d042..27827ca9f 160000
--- a/3rdParty
+++ b/3rdParty
@@ -1 +1 @@
-Subproject commit 6a455d042f8759fadc21eefaf7498e9b09da4486
+Subproject commit 27827ca9fb5f9efcdd9d09781ac5e3c76bf6440f
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35b5810e1..6aa5a5115 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,13 +13,10 @@ set(CXX_STANDARD_REQUIRED ON)
 ## Make sure we do not start relying on extensions down the road.
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-## If OMSimulator is being built standalone (not as part of OpenModelica)
+## If OMSimulator is not being built as part of OpenModelica
 ## include the required settings here.
-if(${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
-  set(OMSIMULATOR_STANDALONE ON)
+if(NOT OPENMODELICA_SUPERPROJECT)
   include(OMSimulatorTopLevelSettings)
-else()
-  set(OMSIMULATOR_STANDALONE OFF)
 endif()
 
 
@@ -57,18 +54,23 @@ add_subdirectory(3rdParty)
 
 ##########################
 # Add project modules
+add_subdirectory(include)
 add_subdirectory(src/OMSimulatorLib)
 add_subdirectory(src/OMSimulator)
 add_subdirectory(src/OMSimulatorLua)
 add_subdirectory(src/OMSimulatorPython)
 add_subdirectory(src/OMSimulatorServer)
-add_subdirectory(src/pip)
+
+option(OM_OMS_ENABLE_PIP "create the OMSimulator pip package" OFF)
+if(OM_OMS_ENABLE_PIP)
+  add_subdirectory(src/pip)
+endif()
 
 add_subdirectory(doc)
 
 ## Add the testsuite directory (which adds the target testsuite-depends which in turn depends
 ## on omc-diff and testssuite-resources) only if OMSimulator is being used standalone.
-if(OMSIMULATOR_STANDALONE)
+option(OM_OMS_ENABLE_TESTSUITE "enable the OMSimulator testsuite" OFF)
+if(OM_OMS_ENABLE_TESTSUITE)
   add_subdirectory(testsuite)
 endif()
-
diff --git a/Jenkinsfile b/Jenkinsfile
index b02191682..c6e75b1d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -447,7 +447,7 @@ zip -r "../OMSimulator-win64-`git describe --tags --abbrev=7 --match=v*.* --excl
                 retry(2) { bat """
 set PATH=C:\\bin\\cmake\\bin;%PATH%
 
-cmake -S . -B build/ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/
+cmake -S . -B build/ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -DOM_OMS_ENABLE_TESTSUITE:BOOL=ON
 IF NOT ["%ERRORLEVEL%"]==["0"] GOTO fail
 
 cmake --build build/ --config Release --parallel %NUMBER_OF_PROCESSORS% --target install -v
@@ -696,7 +696,7 @@ void buildOMS() {
      echo export MAKETHREADS=-j%NUMBER_OF_PROCESSORS%
      echo set -ex
      echo git fetch --tags
-     echo cmake -S . -B build/ -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/
+     echo cmake -S . -B build/ -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -DOM_OMS_ENABLE_TESTSUITE:BOOL=ON
      echo cmake --build build/ --parallel %NUMBER_OF_PROCESSORS% --target install -v
      ) > buildOMSimulatorWindows.sh
 
@@ -708,7 +708,7 @@ void buildOMS() {
     echo "running on node: ${env.NODE_NAME}"
     def nproc = numPhysicalCPU()
     sh "git fetch --tags"
-    sh "cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/"
+    sh "cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -DOM_OMS_ENABLE_TESTSUITE:BOOL=ON"
     sh "cmake --build build/ --parallel ${nproc} --target install -v"
   }
 }
diff --git a/config.cmake/OMSimulatorTopLevelSettings.cmake b/config.cmake/OMSimulatorTopLevelSettings.cmake
index 21900509f..56055186f 100644
--- a/config.cmake/OMSimulatorTopLevelSettings.cmake
+++ b/config.cmake/OMSimulatorTopLevelSettings.cmake
@@ -54,4 +54,4 @@ set(CMAKE_INSTALL_MESSAGE LAZY)
 # Don't allow in-source build
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
   message(FATAL_ERROR "No in-source builds supported. Change to 'build' sub-directory and do 'cmake ..'.")
-endif()
\ No newline at end of file
+endif()
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 000000000..e8f8796a4
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(OMSimulatorInclude INTERFACE)
+
+target_include_directories(OMSimulatorInclude
+                            INTERFACE
+                              ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(oms::public_includes ALIAS OMSimulatorInclude)
+install(DIRECTORY OMSimulator TYPE INCLUDE)
diff --git a/src/OMSimulatorLib/OMSimulator.h b/include/OMSimulator/OMSimulator.h
similarity index 99%
rename from src/OMSimulatorLib/OMSimulator.h
rename to include/OMSimulator/OMSimulator.h
index f625fb0b6..6aa4bfd62 100644
--- a/src/OMSimulatorLib/OMSimulator.h
+++ b/include/OMSimulator/OMSimulator.h
@@ -32,7 +32,7 @@
 #ifndef _OMSIMULATOR_H_
 #define _OMSIMULATOR_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 /* define OMSimulatorLib_EXPORTS *only* when building the DLL */
 #if defined(OMS_STATIC)
diff --git a/src/OMSimulatorLib/Types.h b/include/OMSimulator/Types.h
similarity index 100%
rename from src/OMSimulatorLib/Types.h
rename to include/OMSimulator/Types.h
diff --git a/src/OMSimulator/main.cpp b/src/OMSimulator/main.cpp
index b6dd8860a..7db835d92 100644
--- a/src/OMSimulator/main.cpp
+++ b/src/OMSimulator/main.cpp
@@ -29,7 +29,7 @@
  *
  */
 
-#include <OMSimulator.h>
+#include "OMSimulator/OMSimulator.h"
 #include <string>
 
 int main(int argc, char *argv[])
diff --git a/src/OMSimulatorLib/AlgLoop.h b/src/OMSimulatorLib/AlgLoop.h
index ca37ea5fb..f25d945e8 100644
--- a/src/OMSimulatorLib/AlgLoop.h
+++ b/src/OMSimulatorLib/AlgLoop.h
@@ -34,7 +34,7 @@
 
 #include <string>
 #include <vector>
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "DirectedGraph.h"
 
 #include <kinsol/kinsol.h>
diff --git a/src/OMSimulatorLib/BusConnector.h b/src/OMSimulatorLib/BusConnector.h
index 6e89bbee3..fb201107b 100644
--- a/src/OMSimulatorLib/BusConnector.h
+++ b/src/OMSimulatorLib/BusConnector.h
@@ -3,7 +3,7 @@
 
 
 #include "ComRef.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Connector.h"
 #include "ssd/ConnectorGeometry.h"
 
diff --git a/src/OMSimulatorLib/CMakeLists.txt b/src/OMSimulatorLib/CMakeLists.txt
index 22e38ae2c..29b9157b9 100644
--- a/src/OMSimulatorLib/CMakeLists.txt
+++ b/src/OMSimulatorLib/CMakeLists.txt
@@ -81,6 +81,7 @@ target_include_directories(OMSimulatorLib
 
 target_link_libraries(OMSimulatorLib
                         PUBLIC
+                          oms::public_includes
                           oms::3rd::kinsol
                           oms::3rd::cvode
                           oms::3rd::fmi4c
@@ -114,6 +115,7 @@ target_include_directories(OMSimulatorLib_static
 
 target_link_libraries(OMSimulatorLib_static
                         PUBLIC
+                          oms::public_includes
                           oms::3rd::kinsol
                           oms::3rd::cvode
                           oms::3rd::fmi4c
@@ -134,4 +136,3 @@ endif()
 
 install(TARGETS OMSimulatorLib)
 install(TARGETS OMSimulatorLib_static)
-install(FILES OMSimulator.h Types.h TYPE INCLUDE)
diff --git a/src/OMSimulatorLib/Component.h b/src/OMSimulatorLib/Component.h
index 9080e25b4..2439bc278 100644
--- a/src/OMSimulatorLib/Component.h
+++ b/src/OMSimulatorLib/Component.h
@@ -42,7 +42,7 @@
 #include "ResultWriter.h"
 #include "SignalDerivative.h"
 #include "Snapshot.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Values.h"
 
 #include <fmi4c.h>
diff --git a/src/OMSimulatorLib/Connection.h b/src/OMSimulatorLib/Connection.h
index ed64aa82d..5dc6aef3c 100644
--- a/src/OMSimulatorLib/Connection.h
+++ b/src/OMSimulatorLib/Connection.h
@@ -35,7 +35,7 @@
 #include "ComRef.h"
 #include "Connector.h"
 #include "ssd/ConnectionGeometry.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 
diff --git a/src/OMSimulatorLib/Connector.h b/src/OMSimulatorLib/Connector.h
index a14e6fed7..bdab62f90 100644
--- a/src/OMSimulatorLib/Connector.h
+++ b/src/OMSimulatorLib/Connector.h
@@ -34,7 +34,7 @@
 
 #include "ComRef.h"
 #include "ssd/ConnectorGeometry.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 #include <map>
diff --git a/src/OMSimulatorLib/Element.h b/src/OMSimulatorLib/Element.h
index 86956722c..8e3cc47e8 100644
--- a/src/OMSimulatorLib/Element.h
+++ b/src/OMSimulatorLib/Element.h
@@ -39,7 +39,7 @@
 #if !defined(NO_TLM)
 #include "TLMBusConnector.h"
 #endif
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 namespace oms
 {
diff --git a/src/OMSimulatorLib/ExternalModelInfo.h b/src/OMSimulatorLib/ExternalModelInfo.h
index 37fca6d14..98e805805 100644
--- a/src/OMSimulatorLib/ExternalModelInfo.h
+++ b/src/OMSimulatorLib/ExternalModelInfo.h
@@ -32,7 +32,7 @@
 #ifndef _OMS_EXTERNAL_MODEL_INFO_H_
 #define _OMS_EXTERNAL_MODEL_INFO_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 
diff --git a/src/OMSimulatorLib/FMUInfo.h b/src/OMSimulatorLib/FMUInfo.h
index 3a1b76591..f924edb23 100644
--- a/src/OMSimulatorLib/FMUInfo.h
+++ b/src/OMSimulatorLib/FMUInfo.h
@@ -32,7 +32,7 @@
 #ifndef _OMS_FMU_INFO_H_
 #define _OMS_FMU_INFO_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 #include <fmi4c.h>
diff --git a/src/OMSimulatorLib/Flags.cpp b/src/OMSimulatorLib/Flags.cpp
index 1c951299f..90751c1ad 100644
--- a/src/OMSimulatorLib/Flags.cpp
+++ b/src/OMSimulatorLib/Flags.cpp
@@ -35,7 +35,7 @@
 #include "ComRef.h"
 #include "Logging.h"
 #include "Model.h"
-#include "OMSimulator.h"
+#include "OMSimulator/OMSimulator.h"
 #include "Scope.h"
 #include "System.h"
 #include "Util.h"
diff --git a/src/OMSimulatorLib/Flags.h b/src/OMSimulatorLib/Flags.h
index 1a98a6224..9a643f965 100644
--- a/src/OMSimulatorLib/Flags.h
+++ b/src/OMSimulatorLib/Flags.h
@@ -32,7 +32,7 @@
 #ifndef _OMS_FLAGS_H_
 #define _OMS_FLAGS_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/OMSimulatorLib/Logging.cpp b/src/OMSimulatorLib/Logging.cpp
index 682f63bea..34a18ff4a 100644
--- a/src/OMSimulatorLib/Logging.cpp
+++ b/src/OMSimulatorLib/Logging.cpp
@@ -31,7 +31,7 @@
 
 #include "Logging.h"
 #include "Version.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <cstring>
 #include <ctime>
diff --git a/src/OMSimulatorLib/Logging.h b/src/OMSimulatorLib/Logging.h
index 8e669ee44..d3b47f7ea 100644
--- a/src/OMSimulatorLib/Logging.h
+++ b/src/OMSimulatorLib/Logging.h
@@ -32,7 +32,7 @@
 #ifndef _OMS_LOGGING_H_
 #define _OMS_LOGGING_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 #include <fstream>
diff --git a/src/OMSimulatorLib/Model.h b/src/OMSimulatorLib/Model.h
index 87170c146..4246e9f28 100644
--- a/src/OMSimulatorLib/Model.h
+++ b/src/OMSimulatorLib/Model.h
@@ -36,7 +36,7 @@
 #include "ComRef.h"
 #include "Element.h"
 #include "ResultWriter.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Snapshot.h"
 #include "Values.h"
 #include <assert.h>
diff --git a/src/OMSimulatorLib/OMSimulator.cpp b/src/OMSimulatorLib/OMSimulator.cpp
index f0200fc81..0e88d1fb3 100644
--- a/src/OMSimulatorLib/OMSimulator.cpp
+++ b/src/OMSimulatorLib/OMSimulator.cpp
@@ -29,7 +29,7 @@
  *
  */
 
-#include "OMSimulator.h"
+#include "OMSimulator/OMSimulator.h"
 
 #include "Component.h"
 #include "ComRef.h"
@@ -52,7 +52,7 @@
   #include "TLMBusConnector.h"
   #include "ExternalModel.h"
 #endif
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Version.h"
 
 #include <chrono>
diff --git a/src/OMSimulatorLib/Scope.h b/src/OMSimulatorLib/Scope.h
index fb6dd6594..7cecbdf40 100644
--- a/src/OMSimulatorLib/Scope.h
+++ b/src/OMSimulatorLib/Scope.h
@@ -34,7 +34,7 @@
 
 #include "ComRef.h"
 #include "Model.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <map>
 #include <string>
diff --git a/src/OMSimulatorLib/SignalDerivative.h b/src/OMSimulatorLib/SignalDerivative.h
index 1df6d5352..2e43b2c56 100644
--- a/src/OMSimulatorLib/SignalDerivative.h
+++ b/src/OMSimulatorLib/SignalDerivative.h
@@ -32,7 +32,7 @@
 #ifndef _OMS_SIGNAL_DERIVATIVE_H_
 #define _OMS_SIGNAL_DERIVATIVE_H_
 
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include <fmi4c.h>
 #include <string>
 
diff --git a/src/OMSimulatorLib/Snapshot.h b/src/OMSimulatorLib/Snapshot.h
index 49858b54c..20ccfe2b7 100644
--- a/src/OMSimulatorLib/Snapshot.h
+++ b/src/OMSimulatorLib/Snapshot.h
@@ -35,7 +35,7 @@
 #include "ComRef.h"
 #include "OMSFileSystem.h"
 #include "ssd/Tags.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <pugixml.hpp>
 #include <string>
diff --git a/src/OMSimulatorLib/StepSizeConfiguration.h b/src/OMSimulatorLib/StepSizeConfiguration.h
index 073cefa26..d39f603f2 100644
--- a/src/OMSimulatorLib/StepSizeConfiguration.h
+++ b/src/OMSimulatorLib/StepSizeConfiguration.h
@@ -2,7 +2,7 @@
 #define _OMS_STEP_SIZE_CONFIGURATION_H_
 
 #include "ComRef.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include <vector>
 
 namespace oms
diff --git a/src/OMSimulatorLib/System.h b/src/OMSimulatorLib/System.h
index da3a8ca87..481e00fdd 100644
--- a/src/OMSimulatorLib/System.h
+++ b/src/OMSimulatorLib/System.h
@@ -46,7 +46,7 @@
 #if !defined(NO_TLM)
 #include "TLMBusConnector.h"
 #endif
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Values.h"
 
 #include <map>
diff --git a/src/OMSimulatorLib/SystemSC.h b/src/OMSimulatorLib/SystemSC.h
index 6024b5871..28e411107 100644
--- a/src/OMSimulatorLib/SystemSC.h
+++ b/src/OMSimulatorLib/SystemSC.h
@@ -34,7 +34,7 @@
 
 #include "ComRef.h"
 #include "System.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <cvode/cvode.h>                  /* prototypes for CVODE fcts., consts. */
 #include <nvector/nvector_serial.h>       /* serial N_Vector types, fcts., macros */
diff --git a/src/OMSimulatorLib/SystemWC.h b/src/OMSimulatorLib/SystemWC.h
index b500f81ec..052b2416e 100644
--- a/src/OMSimulatorLib/SystemWC.h
+++ b/src/OMSimulatorLib/SystemWC.h
@@ -37,7 +37,7 @@
 #include "SignalDerivative.h"
 #include "StepSizeConfiguration.h"
 #include "System.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <vector>
 
diff --git a/src/OMSimulatorLib/TLM/ExternalModel.cpp b/src/OMSimulatorLib/TLM/ExternalModel.cpp
index 05550db3b..d7b2e5efd 100644
--- a/src/OMSimulatorLib/TLM/ExternalModel.cpp
+++ b/src/OMSimulatorLib/TLM/ExternalModel.cpp
@@ -33,7 +33,7 @@
 #include "Logging.h"
 #include "Element.h"
 #include "ExternalModelInfo.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "ssd/Tags.h"
 
 #include <cstring>
diff --git a/src/OMSimulatorLib/TLM/ExternalModel.h b/src/OMSimulatorLib/TLM/ExternalModel.h
index 56d44969b..b4dc7697f 100644
--- a/src/OMSimulatorLib/TLM/ExternalModel.h
+++ b/src/OMSimulatorLib/TLM/ExternalModel.h
@@ -39,7 +39,7 @@
 #include "Option.h"
 #include "ResultWriter.h"
 #include "Snapshot.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Variable.h"
 #include <vector>
 #include <map>
diff --git a/src/OMSimulatorLib/TLM/SystemTLM.cpp b/src/OMSimulatorLib/TLM/SystemTLM.cpp
index d4da5d1cf..2cd7d668e 100644
--- a/src/OMSimulatorLib/TLM/SystemTLM.cpp
+++ b/src/OMSimulatorLib/TLM/SystemTLM.cpp
@@ -37,7 +37,7 @@
 #include "OMTLMSimulatorLib/OMTLMSimulatorLib.h"
 #include "ssd/Tags.h"
 #include "SystemWC.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <thread>
 #include <algorithm>
diff --git a/src/OMSimulatorLib/TLM/SystemTLM.h b/src/OMSimulatorLib/TLM/SystemTLM.h
index d364216a9..a12b33703 100644
--- a/src/OMSimulatorLib/TLM/SystemTLM.h
+++ b/src/OMSimulatorLib/TLM/SystemTLM.h
@@ -34,7 +34,7 @@
 
 #include "ComRef.h"
 #include "System.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "../../OMTLMSimulator/common/Plugin/PluginImplementer.h"
 
 namespace oms
diff --git a/src/OMSimulatorLib/TLM/TLMBusConnector.h b/src/OMSimulatorLib/TLM/TLMBusConnector.h
index beb9d6939..ae0326a13 100644
--- a/src/OMSimulatorLib/TLM/TLMBusConnector.h
+++ b/src/OMSimulatorLib/TLM/TLMBusConnector.h
@@ -3,7 +3,7 @@
 
 
 #include "ComRef.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 #include "Connector.h"
 #include "ssd/ConnectorGeometry.h"
 #include "../../OMTLMSimulator/common/Plugin/PluginImplementer.h"
diff --git a/src/OMSimulatorLib/Values.h b/src/OMSimulatorLib/Values.h
index 8ec0a2ff6..b2329a736 100644
--- a/src/OMSimulatorLib/Values.h
+++ b/src/OMSimulatorLib/Values.h
@@ -35,7 +35,7 @@
 #include "ComRef.h"
 #include "OMSFileSystem.h"
 #include "Snapshot.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <map>
 #include <pugixml.hpp>
diff --git a/src/OMSimulatorLib/Variable.h b/src/OMSimulatorLib/Variable.h
index e94a58b63..23a6a240a 100644
--- a/src/OMSimulatorLib/Variable.h
+++ b/src/OMSimulatorLib/Variable.h
@@ -34,7 +34,7 @@
 
 #include "ComRef.h"
 #include "Connector.h"
-#include "Types.h"
+#include "OMSimulator/Types.h"
 
 #include <fmi4c.h>
 #include <string>
diff --git a/src/OMSimulatorLib/ssd/ConnectionGeometry.h b/src/OMSimulatorLib/ssd/ConnectionGeometry.h
index 15fa776ca..c93ec0f48 100644
--- a/src/OMSimulatorLib/ssd/ConnectionGeometry.h
+++ b/src/OMSimulatorLib/ssd/ConnectionGeometry.h
@@ -32,7 +32,7 @@
 #ifndef _SSD_CONNECTION_GEOMETRY_H_
 #define _SSD_CONNECTION_GEOMETRY_H_
 
-#include "../Types.h"
+#include "OMSimulator/Types.h"
 
 #include <pugixml.hpp>
 
diff --git a/src/OMSimulatorLib/ssd/ConnectorGeometry.h b/src/OMSimulatorLib/ssd/ConnectorGeometry.h
index b10f0ded3..fc33d83cc 100644
--- a/src/OMSimulatorLib/ssd/ConnectorGeometry.h
+++ b/src/OMSimulatorLib/ssd/ConnectorGeometry.h
@@ -32,7 +32,7 @@
 #ifndef _SSD_CONNECTOR_GEOMETRY_H_
 #define _SSD_CONNECTOR_GEOMETRY_H_
 
-#include "../Types.h"
+#include "OMSimulator/Types.h"
 
 #include <pugixml.hpp>
 
diff --git a/src/OMSimulatorLib/ssd/ElementGeometry.h b/src/OMSimulatorLib/ssd/ElementGeometry.h
index e9ad70050..8266de97d 100644
--- a/src/OMSimulatorLib/ssd/ElementGeometry.h
+++ b/src/OMSimulatorLib/ssd/ElementGeometry.h
@@ -32,7 +32,7 @@
 #ifndef _SSD_ELEMENT_GEOMETRY_H_
 #define _SSD_ELEMENT_GEOMETRY_H_
 
-#include "../Types.h"
+#include "OMSimulator/Types.h"
 
 #include <pugixml.hpp>
 
diff --git a/src/OMSimulatorLib/ssd/SystemGeometry.h b/src/OMSimulatorLib/ssd/SystemGeometry.h
index ee83f7dc3..221e75741 100644
--- a/src/OMSimulatorLib/ssd/SystemGeometry.h
+++ b/src/OMSimulatorLib/ssd/SystemGeometry.h
@@ -32,7 +32,7 @@
 #ifndef _SSD_SYSTEM_GEOMETRY_H_
 #define _SSD_SYSTEM_GEOMETRY_H_
 
-#include "../Types.h"
+#include "OMSimulator/Types.h"
 
 #include <string>
 
diff --git a/src/OMSimulatorLua/OMSimulatorLua.c b/src/OMSimulatorLua/OMSimulatorLua.c
index 74c9976ec..dc8ce8c2b 100644
--- a/src/OMSimulatorLua/OMSimulatorLua.c
+++ b/src/OMSimulatorLua/OMSimulatorLua.c
@@ -3,7 +3,7 @@
 #include <lualib.h>
 #include <stdlib.h>
 
-#include <OMSimulator.h>
+#include "OMSimulator/OMSimulator.h"
 
 #define REGISTER_LUA_CALL(name) lua_register(L, #name, OMSimulatorLua_##name)
 #define REGISTER_LUA_ENUM(name) lua_pushnumber(L, name); lua_setglobal(L, #name)
diff --git a/src/OMSimulatorServer/CMakeLists.txt b/src/OMSimulatorServer/CMakeLists.txt
index dda415c6c..94b539e50 100644
--- a/src/OMSimulatorServer/CMakeLists.txt
+++ b/src/OMSimulatorServer/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(OMSimulatorServer)
 
 # install only if build as part of the OpenModelica super project
-if(NOT OMSIMULATOR_STANDALONE)
+if(OPENMODELICA_SUPERPROJECT)
   install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/OMSimulatorServer.py" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/OMSimulator/scripts)
 endif()