diff --git a/cmake/FindHPX_BLAS.cmake b/cmake/FindHPX_BLAS.cmake
index 512f63952f95..08bfaba1a86e 100644
--- a/cmake/FindHPX_BLAS.cmake
+++ b/cmake/FindHPX_BLAS.cmake
@@ -10,6 +10,6 @@ endif()
 hpx_find_package(BLAS
   LIBRARIES blas libblas
   LIBRARY_PATHS lib64 lib 
-  HEADERS cblas.h bbhutil.h
+  HEADERS cblas.h
   HEADER_PATHS include)
 
diff --git a/cmake/FindHPX_RNPL.cmake b/cmake/FindHPX_RNPL.cmake
index 16de48d146fd..201ee8d6a571 100644
--- a/cmake/FindHPX_RNPL.cmake
+++ b/cmake/FindHPX_RNPL.cmake
@@ -20,7 +20,7 @@ endif()
 hpx_find_package(RNPL
   LIBRARIES bbhutil libbbhutil
   LIBRARY_PATHS lib64 lib
-  HEADERS sdf.h
+  HEADERS bbhutil.h sdf.h
   HEADER_PATHS include)
 
 if(RNPL_FOUND AND NOT HPX_SET_RNPL_MACRO)