-file(GLOB ROOT_LEGACY_HEADERS *.h)
-file(GLOB ROOT_LEGACY_HEADERS_PRIVATE thread_mpi.h tmpi.h gmx_hash.h
- gmx_ga2la.h gpu_utils.h pmalloc_cuda.h)
-file(GLOB TYPES_LEGACY_HEADERS types/*.h)
-file(GLOB TYPES_LEGACY_HEADERS_PRIVATE types/commrec.h)
-list(REMOVE_ITEM ROOT_LEGACY_HEADERS ${ROOT_LEGACY_HEADERS_PRIVATE})
-list(REMOVE_ITEM TYPES_LEGACY_HEADERS ${TYPES_LEGACY_HEADERS_PRIVATE})
-gmx_install_headers(legacyheaders ${ROOT_LEGACY_HEADERS})
-gmx_install_headers(legacyheaders/types ${TYPES_LEGACY_HEADERS})
+file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
+list(REMOVE_ITEM HEADERS gmx_hash.h gmx_ga2la.h gpu_utils.h pmalloc_cuda.h)
+gmx_install_headers(${HEADERS})
+
+add_subdirectory(types)