diff --git a/src/libYARP_dev/src/CMakeLists.txt b/src/libYARP_dev/src/CMakeLists.txt
index 959ce26d58d..edfb9f89f11 100644
--- a/src/libYARP_dev/src/CMakeLists.txt
+++ b/src/libYARP_dev/src/CMakeLists.txt
@@ -115,6 +115,7 @@ set(YARP_dev_HDRS
   yarp/dev/PolyDriverDescriptor.h
   yarp/dev/PolyDriverList.h
   yarp/dev/RGBDSensorParamParser.h
+  yarp/dev/ReturnValue.h
   yarp/dev/ServiceInterfaces.h
   yarp/dev/WrapperMultiple.h
   yarp/dev/WrapperSingle.h
@@ -223,6 +224,7 @@ set(YARP_dev_SRCS
   yarp/dev/PolyDriver.cpp
   yarp/dev/PolyDriverDescriptor.cpp
   yarp/dev/PolyDriverList.cpp
+  yarp/dev/ReturnValue.cpp
   yarp/dev/RGBDSensorParamParser.cpp
   yarp/dev/WrapperMultiple.cpp
   yarp/dev/WrapperSingle.cpp
diff --git a/src/libYARP_os/src/yarp/os/ReturnValue.cpp b/src/libYARP_dev/src/yarp/dev/ReturnValue.cpp
similarity index 100%
rename from src/libYARP_os/src/yarp/os/ReturnValue.cpp
rename to src/libYARP_dev/src/yarp/dev/ReturnValue.cpp
diff --git a/src/libYARP_os/src/yarp/os/ReturnValue.h b/src/libYARP_dev/src/yarp/dev/ReturnValue.h
similarity index 100%
rename from src/libYARP_os/src/yarp/os/ReturnValue.h
rename to src/libYARP_dev/src/yarp/dev/ReturnValue.h
diff --git a/src/libYARP_dev/tests/CMakeLists.txt b/src/libYARP_dev/tests/CMakeLists.txt
index c06251f2e6a..79305221db5 100644
--- a/src/libYARP_dev/tests/CMakeLists.txt
+++ b/src/libYARP_dev/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ target_sources(harness_dev
   PRIVATE
     MapGrid2DTest.cpp
     PolyDriverTest.cpp
+    ReturnValueTest.cpp
 )
 
 target_link_libraries(harness_dev
diff --git a/src/libYARP_os/tests/ReturnValueTest.cpp b/src/libYARP_dev/tests/ReturnValueTest.cpp
similarity index 100%
rename from src/libYARP_os/tests/ReturnValueTest.cpp
rename to src/libYARP_dev/tests/ReturnValueTest.cpp
diff --git a/src/libYARP_os/src/CMakeLists.txt b/src/libYARP_os/src/CMakeLists.txt
index 9b410c9172a..440c3f186dd 100644
--- a/src/libYARP_os/src/CMakeLists.txt
+++ b/src/libYARP_os/src/CMakeLists.txt
@@ -96,7 +96,6 @@ set(YARP_os_HDRS
   yarp/os/Random.h
   yarp/os/ResourceFinder.h
   yarp/os/ResourceFinderOptions.h
-  yarp/os/ReturnValue.h
   yarp/os/RFModule.h
   yarp/os/RFPlugin.h
   yarp/os/RosNameSpace.h
@@ -211,7 +210,6 @@ set(YARP_os_SRCS
   yarp/os/Random.cpp
   yarp/os/ResourceFinder.cpp
   yarp/os/ResourceFinderOptions.cpp
-  yarp/os/ReturnValue.cpp
   yarp/os/RFModule.cpp
   yarp/os/RFPlugin.cpp
   yarp/os/RosNameSpace.cpp
diff --git a/src/libYARP_os/tests/CMakeLists.txt b/src/libYARP_os/tests/CMakeLists.txt
index 545b92e5d00..95405be88f5 100644
--- a/src/libYARP_os/tests/CMakeLists.txt
+++ b/src/libYARP_os/tests/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(harness_os PRIVATE
   PropertyTest.cpp
   PublisherTest.cpp
   ResourceFinderTest.cpp
-  ReturnValueTest.cpp
   RFModuleTest.cpp
   RouteTest.cpp
   SemaphoreTest.cpp