diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e8991238..e205b422a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" JFJOCH_VERSION_NUMERIC "${JFJOCH_
 
 PROJECT(jfjoch VERSION ${JFJOCH_VERSION_NUMERIC} LANGUAGES C CXX)
 SET(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+INCLUDE(GNUInstallDirs)
 
 SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index afd91bd2b..ca4cdd7e1 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -1,6 +1,3 @@
-# OpenAPI definition
-INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )
-
 # OpenAPI model
 AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
 ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES})
diff --git a/compression/CMakeLists.txt b/compression/CMakeLists.txt
index 935ee6df9..07c04a32d 100644
--- a/compression/CMakeLists.txt
+++ b/compression/CMakeLists.txt
@@ -19,4 +19,4 @@ ADD_LIBRARY(Compression STATIC
 set_target_properties(Compression PROPERTIES POSITION_INDEPENDENT_CODE ON)
 TARGET_COMPILE_DEFINITIONS(Compression PUBLIC -DZSTD_SUPPORT -DUSE_ZSTD)
 TARGET_LINK_LIBRARIES(Compression libzstd_static)
-TARGET_INCLUDE_DIRECTORIES(Compression PUBLIC . zstd/lib)
+TARGET_INCLUDE_DIRECTORIES(Compression PUBLIC .)
diff --git a/fpga/hls/CMakeLists.txt b/fpga/hls/CMakeLists.txt
index d495cee01..94ab47bd0 100644
--- a/fpga/hls/CMakeLists.txt
+++ b/fpga/hls/CMakeLists.txt
@@ -39,7 +39,7 @@ ADD_LIBRARY( JFJochHLSCores STATIC
         ptp.cpp)
 
 TARGET_COMPILE_DEFINITIONS(JFJochHLSCores PUBLIC -DJFJOCH_HLS_NOSYNTH)
-TARGET_INCLUDE_DIRECTORIES(JFJochHLSCores PUBLIC ../include)
+TARGET_INCLUDE_DIRECTORIES(JFJochHLSCores SYSTEM PUBLIC ../include)
 
 IF(VIVADO_HLS)
     IF(NOT HLS_SOLUTION_NAME)
diff --git a/xds-plugin/CMakeLists.txt b/xds-plugin/CMakeLists.txt
index 8f2540433..7bad18ec2 100644
--- a/xds-plugin/CMakeLists.txt
+++ b/xds-plugin/CMakeLists.txt
@@ -3,10 +3,6 @@ ADD_LIBRARY(jfjoch_xds_plugin SHARED plugin.cpp plugin.h)
 TARGET_LINK_LIBRARIES(jfjoch_xds_plugin JFJochHDF5Wrappers JFJochVersion Compression hdf5-static)
 INSTALL(TARGETS jfjoch_xds_plugin DESTINATION ${CMAKE_INSTALL_LIBDIR}/jfjoch COMPONENT viewer)
 
-target_link_options(jfjoch_xds_plugin PRIVATE
-        "LINKER:--exclude-libs,ALL"
-)
-
 set_target_properties(jfjoch_xds_plugin PROPERTIES
         CXX_VISIBILITY_PRESET hidden
         C_VISIBILITY_PRESET hidden