diff --git a/GaudiHive/CMakeLists.txt b/GaudiHive/CMakeLists.txt
index e722717dd4e70d656708a5a6fed3c64ee43a2721..3c014e5b1634912966e479343a97b64d813ce589 100644
--- a/GaudiHive/CMakeLists.txt
+++ b/GaudiHive/CMakeLists.txt
@@ -10,9 +10,6 @@
 #####################################################################################
 # GaudiHive subdirectory
 
-# Register the header only library (install include/)
-gaudi_add_header_only_library(GaudiHiveHeaders)
-
 # Build the plugin
 gaudi_add_module(GaudiHive
                  SOURCES src/AlgResourcePool.cpp
@@ -37,8 +34,7 @@ gaudi_add_module(GaudiHive
                          src/ThreadPoolSvc.cpp
                          src/TimelineSvc.cpp
                          src/ViewTester.cpp
-                 LINK GaudiHiveHeaders
-                      GaudiKernel
+                 LINK GaudiKernel
                       GaudiAlgLib
                       Boost::headers
                       Boost::system
diff --git a/GaudiHive/src/HiveSlimEventLoopMgr.cpp b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
index c8c728ad395f980173d6581fd8b59144ea0adfe0..9bef7f80b7622ebf40947c8fd423c7645bbf4359 100644
--- a/GaudiHive/src/HiveSlimEventLoopMgr.cpp
+++ b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
@@ -9,7 +9,7 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Local includes
-#include "GaudiHive/HiveSlimEventLoopMgr.h"
+#include "HiveSlimEventLoopMgr.h"
 #include "HistogramAgent.h"
 
 // Framework includes
diff --git a/GaudiHive/include/GaudiHive/HiveSlimEventLoopMgr.h b/GaudiHive/src/HiveSlimEventLoopMgr.h
similarity index 100%
rename from GaudiHive/include/GaudiHive/HiveSlimEventLoopMgr.h
rename to GaudiHive/src/HiveSlimEventLoopMgr.h
diff --git a/GaudiHive/src/HiveTestAlgorithm.cpp b/GaudiHive/src/HiveTestAlgorithm.cpp
index 695d6904e5de510711e38202f0fcdb5e25f9d80b..c3bd940e9a9a1df7f3dfca925a3cd247cce25b87 100644
--- a/GaudiHive/src/HiveTestAlgorithm.cpp
+++ b/GaudiHive/src/HiveTestAlgorithm.cpp
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiHive/HiveTestAlgorithm.h"
+#include "HiveTestAlgorithm.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 
diff --git a/GaudiHive/include/GaudiHive/HiveTestAlgorithm.h b/GaudiHive/src/HiveTestAlgorithm.h
similarity index 100%
rename from GaudiHive/include/GaudiHive/HiveTestAlgorithm.h
rename to GaudiHive/src/HiveTestAlgorithm.h
diff --git a/cmake/tests/testGaudiInstallation.cmake b/cmake/tests/testGaudiInstallation.cmake
index d6af88710a1a36cb761a0a5ad9bb595e1614142b..b23571e94b75eecbe5b9da2defe3e1381420c910 100644
--- a/cmake/tests/testGaudiInstallation.cmake
+++ b/cmake/tests/testGaudiInstallation.cmake
@@ -111,10 +111,6 @@ elseif(DEFINED TEST_GAUDI_INSTALL_FILES_EXIST) # check some files that should be
         message(FATAL_ERROR "Include directory not installed correctly,"
             " Axis.h not found in include/GaudiCommonSvc/")
     endif()
-    if(NOT EXISTS ${GAUDI_INSTALL_DIR}/include/GaudiHive/HiveSlimEventLoopMgr.h)
-        message(FATAL_ERROR "Include directory not installed correctly,"
-            " HiveSlimEventLoopMgr.h not found in include/GaudiHive/")
-    endif()
     if(NOT EXISTS ${GAUDI_INSTALL_DIR}/include/GaudiMP/TESSerializer.h)
         message(FATAL_ERROR "Include directory not installed correctly,"
             " TESSerializer.h not found in include/GaudiMP/")