diff --git a/src/context.h b/lib/rscore/include/rscore/context.h
similarity index 100%
rename from src/context.h
rename to lib/rscore/include/rscore/context.h
diff --git a/src/rscore/device-factory.h b/lib/rscore/include/rscore/device-factory.h
similarity index 100%
rename from src/rscore/device-factory.h
rename to lib/rscore/include/rscore/device-factory.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eddfd8065b..813733a6b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,6 @@ target_sources(${LRS_TARGET}
         "${CMAKE_CURRENT_LIST_DIR}/device.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/device-info.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/device_hub.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/rscore/device-factory.h"
         "${CMAKE_CURRENT_LIST_DIR}/environment.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/error-handling.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/firmware_logger_device.cpp"
@@ -118,7 +117,6 @@ target_sources(${LRS_TARGET}
         "${CMAKE_CURRENT_LIST_DIR}/core/time-service.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/uvc-device.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/uvc-device-info.h"
-        "${CMAKE_CURRENT_LIST_DIR}/context.h"
         "${CMAKE_CURRENT_LIST_DIR}/device.h"
         "${CMAKE_CURRENT_LIST_DIR}/device-info.h"
         "${CMAKE_CURRENT_LIST_DIR}/device_hub.h"
diff --git a/src/backend-device-factory.cpp b/src/backend-device-factory.cpp
index 084f5ee4e7..0c79ba6a7e 100644
--- a/src/backend-device-factory.cpp
+++ b/src/backend-device-factory.cpp
@@ -2,7 +2,7 @@
 // Copyright(c) 2023 Intel Corporation. All Rights Reserved.
 
 #include "backend-device-factory.h"
-#include "context.h"
+#include <rscore/context.h>
 #include "backend.h"
 #include "platform/platform-device-info.h"
 #include "platform/device-watcher.h"
diff --git a/src/context.cpp b/src/context.cpp
index ec330dacbb..7cdf515e55 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1,7 +1,7 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2015 Intel Corporation. All Rights Reserved.
 
-#include "context.h"
+#include <rscore/context.h>
 #include "device-info.h"
 
 #include "backend-device-factory.h"
diff --git a/src/dds/rs-dds-device-info.h b/src/dds/rs-dds-device-info.h
index 55ec3c64aa..e2a10f2842 100644
--- a/src/dds/rs-dds-device-info.h
+++ b/src/dds/rs-dds-device-info.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <src/context.h>
 #include <src/device-info.h>
 
 #include <memory>
diff --git a/src/dds/rsdds-device-factory.cpp b/src/dds/rsdds-device-factory.cpp
index ae58700194..fa10504118 100644
--- a/src/dds/rsdds-device-factory.cpp
+++ b/src/dds/rsdds-device-factory.cpp
@@ -2,7 +2,7 @@
 // Copyright(c) 2023 Intel Corporation. All Rights Reserved.
 
 #include "rsdds-device-factory.h"
-#include "context.h"
+#include <rscore/context.h>
 #include "rs-dds-device-info.h"
 
 #include <librealsense2/h/rs_context.h>  // RS2_PRODUCT_LINE_...
diff --git a/src/device.cpp b/src/device.cpp
index 36e5e004f3..69f8bd2882 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -8,7 +8,7 @@
 #include "core/motion.h"
 #include "core/frame-holder.h"
 #include "sync.h"
-#include "context.h"  // rs2_device_info
+#include <rscore/context.h>  // rs2_device_info
 
 #include <rsutils/string/from.h>
 #include <rsutils/json.h>
diff --git a/src/device_hub.cpp b/src/device_hub.cpp
index 82dadbb183..c494a4565a 100644
--- a/src/device_hub.cpp
+++ b/src/device_hub.cpp
@@ -6,6 +6,8 @@
 #include "core/processing.h"
 #include "proc/synthetic-stream.h"
 #include "device_hub.h"
+#include <rscore/context.h>
+
 
 namespace librealsense
 {
diff --git a/src/device_hub.h b/src/device_hub.h
index 82b14455f1..42d8e201ca 100644
--- a/src/device_hub.h
+++ b/src/device_hub.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "context.h"
 #include "device.h"
 #include <librealsense2/h/rs_context.h>  // RS2_PRODUCT_LINE_...
 
@@ -16,6 +15,8 @@
 
 namespace librealsense
 {
+    class context;
+
     /**
     * device_hub class - encapsulate the handling of connect and disconnect events
     */
diff --git a/src/fw-update/fw-update-device.cpp b/src/fw-update/fw-update-device.cpp
index f9ff9721bf..a8a86edf45 100644
--- a/src/fw-update/fw-update-device.cpp
+++ b/src/fw-update/fw-update-device.cpp
@@ -3,7 +3,6 @@
 
 #include "fw-update-device.h"
 #include "../types.h"
-#include "../context.h"
 #include "../device-info.h"
 #include "ds/d400/d400-private.h"
 
diff --git a/src/pipeline/config.cpp b/src/pipeline/config.cpp
index 2905ee2de6..cb4cf2c663 100644
--- a/src/pipeline/config.cpp
+++ b/src/pipeline/config.cpp
@@ -5,7 +5,7 @@
 #include "pipeline.h"
 #include "platform/platform-device-info.h"
 #include "media/playback/playback-device-info.h"
-#include "context.h"
+#include <rscore/context.h>
 
 
 namespace librealsense
diff --git a/src/proc/colorizer.cpp b/src/proc/colorizer.cpp
index a959b75ff8..21b5995394 100644
--- a/src/proc/colorizer.cpp
+++ b/src/proc/colorizer.cpp
@@ -1,11 +1,10 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2017 Intel Corporation. All Rights Reserved.
 
-#include "../include/librealsense2/hpp/rs_sensor.hpp"
-#include "../include/librealsense2/hpp/rs_processing.hpp"
+#include <librealsense2/hpp/rs_sensor.hpp>
+#include <librealsense2/hpp/rs_processing.hpp>
 
 #include "proc/synthetic-stream.h"
-#include "context.h"
 #include "environment.h"
 #include "option.h"
 #include "colorizer.h"
diff --git a/src/proc/rotation-transform.cpp b/src/proc/rotation-transform.cpp
index 13e8c1e057..b7d38e1e8d 100644
--- a/src/proc/rotation-transform.cpp
+++ b/src/proc/rotation-transform.cpp
@@ -3,9 +3,8 @@
 
 #include "rotation-transform.h"
 
-#include "../include/librealsense2/hpp/rs_sensor.hpp"
-#include "../include/librealsense2/hpp/rs_processing.hpp"
-#include "context.h"
+#include <librealsense2/hpp/rs_sensor.hpp>
+#include <librealsense2/hpp/rs_processing.hpp>
 #include "image.h"
 #include "stream.h"
 
diff --git a/src/proc/threshold.cpp b/src/proc/threshold.cpp
index dbf328c8bd..e67fcbf09f 100644
--- a/src/proc/threshold.cpp
+++ b/src/proc/threshold.cpp
@@ -6,7 +6,6 @@
 
 #include <src/core/depth-frame.h>
 #include "proc/synthetic-stream.h"
-#include "context.h"
 #include "environment.h"
 #include "option.h"
 #include "threshold.h"
diff --git a/src/rs.cpp b/src/rs.cpp
index 189fee9773..a2b8acbded 100644
--- a/src/rs.cpp
+++ b/src/rs.cpp
@@ -5,7 +5,7 @@
 
 #include "api.h"
 #include "log.h"
-#include "context.h"
+#include <rscore/context.h>
 #include "device.h"
 #include "algo.h"
 #include "core/debug.h"
diff --git a/src/stream.h b/src/stream.h
index e63cbb5465..3602571ca5 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -6,7 +6,6 @@
 #include "core/video.h"
 #include "core/motion.h"
 #include "core/stream-profile.h"
-#include "context.h"
 #include "image.h"
 #include "environment.h"
 #include "platform/stream-profile.h"