diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8333c20be21a86250899fde01db51a8cae44cfb1..9baf6a74602a4603f39b28fc9cd9e2aaa4918635 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,8 +106,6 @@ ENDIF()
 # Prerequisistes for Corryvreckan #
 ###################################
 
-INCLUDE("cmake/corryvreckan.cmake")
-
 # Define the libraries
 SET(CORRYVRECKAN_LIBRARIES "")
 
diff --git a/cmake/corryvreckan.cmake b/cmake/corryvreckan.cmake
index bdc0b66c4211ece5ac5234266877dfeff9634750..17f81a36e831cc847acd076ca7a7a6d32a1d3209 100644
--- a/cmake/corryvreckan.cmake
+++ b/cmake/corryvreckan.cmake
@@ -126,20 +126,20 @@ ENDMACRO()
 MACRO(CORRYVRECKAN_SETUP_ROOT_TARGETS)
 
     #ROOT CXX Flags are a string with quotes, not a list, so we need to convert to a list...
-    STRING(REPLACE " " ";" ALLXPIX_ROOT_CXX_FLAGS ${ROOT_CXX_FLAGS})
+    STRING(REPLACE " " ";" CORRYVRECKAN_ROOT_CXX_FLAGS ${ROOT_CXX_FLAGS})
 
     IF(NOT TARGET ROOT::Core)
         #in ROOT before 6.10 there is no ROOT namespace, so we create ROOT::Core ourselves
         ADD_LIBRARY(ROOT::Core INTERFACE IMPORTED GLOBAL)
         SET_TARGET_PROPERTIES(ROOT::Core
             PROPERTIES
-            INTERFACE_COMPILE_OPTIONS "${ALLXPIX_ROOT_CXX_FLAGS}"
+            INTERFACE_COMPILE_OPTIONS "${CORRYVRECKAN_ROOT_CXX_FLAGS}"
             INTERFACE_INCLUDE_DIRECTORIES ${ROOT_INCLUDE_DIRS}
         )
         # there is also no dependency between the targets
         TARGET_LINK_LIBRARIES(ROOT::Core INTERFACE Core)
         # we list here the targets we use, as later versions of root have the namespace, we do not have to to this for ever
-        FOREACH(LIB Geom GenVector Graf3d RIO MathCore Tree Hist)
+        FOREACH(LIB Minuit Minuit2 Gui GenVector Geom Graf3d RIO MathCore Tree Hist GuiBld)
             IF(TARGET ${LIB})
                 ADD_LIBRARY(ROOT::${LIB} INTERFACE IMPORTED GLOBAL)
                 TARGET_LINK_LIBRARIES(ROOT::${LIB} INTERFACE ${LIB} ROOT::Core)
@@ -149,7 +149,7 @@ MACRO(CORRYVRECKAN_SETUP_ROOT_TARGETS)
         # Root 6.12 exports ROOT::Core, but does not assign include directories to the target
         SET_TARGET_PROPERTIES(ROOT::Core
             PROPERTIES
-            INTERFACE_COMPILE_OPTIONS "${ALLXPIX_ROOT_CXX_FLAGS}"
+            INTERFACE_COMPILE_OPTIONS "${CORRYVRECKAN_ROOT_CXX_FLAGS}"
             INTERFACE_INCLUDE_DIRECTORIES ${ROOT_INCLUDE_DIRS}
         )
     ENDIF()