diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
index fc19d5e4f2384e17a95365043ea0b4c4f8cbcc3c..b0a40ea93af136401052992e2aaa08f146029626 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
@@ -19,6 +19,6 @@ atlas_add_library( TrigConfHLTData
    TrigConfHLTData/*.h Root/*.cxx
    PUBLIC_HEADERS TrigConfHLTData
    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-   LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfL1Data TrigCompositeUtilsLib )
+   LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfL1Data HLTUtilsLib )
 
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
index b3c066388dd2956c29aadb78cfbfda10cbe969d4..cd7a5a367c2deaf2bcbabc131777ac27531cf8ab 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
@@ -12,11 +12,17 @@ if( NOT XAOD_STANDALONE )
     xAODTrigger )
 endif()
 
-# Add the package's library.
+# Add the package's stand alone library
+atlas_add_library( HLTUtilsLib
+  TrigCompositeUtils/HLTUtils.h Root/HLTUtils.cxx
+  PUBLIC_HEADERS TrigCompositeUtils
+  LINK_LIBRARIES CxxUtils )
+
+# Add the package's dual use library.
 atlas_add_library( TrigCompositeUtilsLib
-  TrigCompositeUtils/*.h TrigCompositeUtils/*.icc Root/*.cxx ${extra_srcs}
+  TrigCompositeUtils/HLTIdentifier.h TrigCompositeUtils/Combinators.h TrigCompositeUtils/TrigCompositeUtils.h TrigCompositeUtils/TrigCompositeUtils.icc Root/HLTIdentifier.cxx Root/Combinators.cxx ${extra_srcs}
   PUBLIC_HEADERS TrigCompositeUtils
-  LINK_LIBRARIES CxxUtils AsgMessagingLib ${extra_libs} )
+  LINK_LIBRARIES HLTUtilsLib CxxUtils AsgMessagingLib ${extra_libs} )
 
 # Install files from the package.
 atlas_install_python_modules( python/*.py )
@@ -24,7 +30,7 @@ atlas_install_python_modules( python/*.py )
 # Executable(s).
 atlas_add_executable( trigconf_string2hash
   util/trigconf_string2hash.cxx
-  LINK_LIBRARIES TrigCompositeUtilsLib )
+  LINK_LIBRARIES HLTUtilsLib )
 
 # Unit test(s).
 if( NOT XAOD_STANDALONE )