diff --git a/consumer/api/cpp/CMakeLists.txt b/consumer/api/cpp/CMakeLists.txt
index dfc1fd65042bdc0f0f2ce24ab9e5e69303c17305..27936e941f675c140f9742f5e4b9645ad5da05bf 100644
--- a/consumer/api/cpp/CMakeLists.txt
+++ b/consumer/api/cpp/CMakeLists.txt
@@ -26,7 +26,8 @@ target_include_directories(consumer_lib_objects SYSTEM PRIVATE ${LIBFABRIC_INCLU
 if (BUILD_STATIC_CLIENT_LIBS)
     add_library(${TARGET_NAME} STATIC $<TARGET_OBJECTS:consumer_lib_objects>  $<TARGET_OBJECTS:asapo_fabric_objects> $<TARGET_OBJECTS:system_io>
             $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version>  $<TARGET_OBJECTS:curl_http_client> )
-    target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${LIBFABRIC_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
+    target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${LIBFABRIC_INCLUDE_DIR}>)
+    target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../c/include>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ASAPO_CXX_COMMON_INCLUDE_DIR}>)
diff --git a/consumer/libasapo-consumer.pc.in b/consumer/libasapo-consumer.pc.in
index a09c6f780c6e597145526b861b943cf2baba2526..5ae055f45f419a0227a1032f3d79fd8ebd1476ed 100644
--- a/consumer/libasapo-consumer.pc.in
+++ b/consumer/libasapo-consumer.pc.in
@@ -7,5 +7,5 @@ Name: libasapo-consumer
 Description: ASAP::O consumer API
 Version: ${ASAPO_CONSUMER_PROTOCOL}
 Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
-Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-consumer -lasapo-fabric
-Libs.private: -lcurl -lstdc++ -lpthread
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-consumer
+Libs.private: -lcurl -lstdc++ -lpthread -ld
diff --git a/producer/api/cpp/CMakeLists.txt b/producer/api/cpp/CMakeLists.txt
index c6ab194f9621f4ee5accce66b7789d1f04d9425d..31cb8ea73ca6c208564496670acfa13698c78289 100644
--- a/producer/api/cpp/CMakeLists.txt
+++ b/producer/api/cpp/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories(producer_lib_objects SYSTEM PRIVATE ${LIBFABRIC_INCLU
 if (BUILD_STATIC_CLIENT_LIBS)
     add_library(${TARGET_NAME} STATIC $<TARGET_OBJECTS:producer_lib_objects> $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:json_parser>
             $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:request_pool> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version>)
-    target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${CURL_INCLUDE_DIRS})
+    target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ASAPO_CXX_COMMON_INCLUDE_DIR}>)
     target_include_directories(${TARGET_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
diff --git a/producer/libasapo-producer.pc.in b/producer/libasapo-producer.pc.in
index 223d907cf736a768f11823eecfc03fb2de656bf8..8e6b2a70b1eff2f41d8a08a5391a9bb68dd3495a 100644
--- a/producer/libasapo-producer.pc.in
+++ b/producer/libasapo-producer.pc.in
@@ -7,5 +7,5 @@ Name: libasapo-producer
 Description: ASAP::O producer API
 Version: ${ASAPO_PRODUCER_PROTOCOL}
 Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
-Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-producer -lasapo-fabric
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-producer
 Libs.private: -lcurl -lstdc++ -lpthread