diff --git a/CMakeLists.txt b/CMakeLists.txt
index abae1fbb..fa1b6f61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,6 @@ set(API_HEADERS
     src/common/inc/libiec61850_common_api.h
     src/common/inc/libiec61850_platform_includes.h
     src/common/inc/linked_list.h
-    src/common/inc/byte_buffer.h
     src/common/inc/string_utilities.h
     src/iec61850/inc/iec61850_client.h
     src/iec61850/inc/iec61850_common.h
diff --git a/Makefile b/Makefile
index 66158026..6504f306 100644
--- a/Makefile
+++ b/Makefile
@@ -89,10 +89,9 @@ LIB_API_HEADER_FILES = hal/inc/hal_time.h
 LIB_API_HEADER_FILES += hal/inc/hal_thread.h
 LIB_API_HEADER_FILES += hal/inc/hal_filesystem.h
 LIB_API_HEADER_FILES += hal/inc/tls_config.h
+LIB_API_HEADER_FILES += hal/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/common/inc/libiec61850_common_api.h
 LIB_API_HEADER_FILES += src/common/inc/linked_list.h
-LIB_API_HEADER_FILES += src/common/inc/byte_buffer.h
-LIB_API_HEADER_FILES += src/common/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_client.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_common.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_server.h