diff --git a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
index 6234f99bc4e26b37241c5b44b94a92d1d1c0e265..a9332aaf99446e651397f87dee5237b37040b455 100644
--- a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
@@ -15,8 +15,7 @@ lofar_add_library(cointerface
   DataFactory.cc
   FinalMetaData.cc
   Stream.cc
-  Parset.cc
-  RSPTimeStamp.cc)
+  Parset.cc)
 
 lofar_add_bin_program(versioncointerface versioncointerface.cc)
 
diff --git a/RTCP/Cobalt/CoInterface/test/CMakeLists.txt b/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
index 0ab67c5e49d1ef5d778194870e20178d2161a44b..6723391c108da8a788141df28003e4eb6176e02f 100644
--- a/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
@@ -5,7 +5,6 @@ include(LofarCTest)
 lofar_add_test(tCorrelatedData tCorrelatedData.cc)
 lofar_add_test(tMultiDimArray tMultiDimArray.cc)
 lofar_add_test(tSparseSet tSparseSet.cc)
-lofar_add_test(tRSPTimeStamp tRSPTimeStamp.cc)
 
 if(UNITTEST++_FOUND)
   lofar_add_test(tParset tParset.cc)
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/Block.h b/RTCP/Cobalt/InputProc/src/Buffer/Block.h
index f1a159e7f901d20e28642a34dc69f0042427eba5..4fe3a4db6c6c487a08a774dcd7c6983bc883c9bf 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/Block.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/Block.h
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include <CoInterface/SubbandMetaData.h>
 
 namespace LOFAR
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h b/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
index b7ae6080da934b7b2302a1a9a99d66a9014b9657..f6b61dcbc188644071412fb421fb548e53e58c71 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
@@ -25,10 +25,10 @@
 #include <string>
 #include <vector>
 
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
 
 #include <InputProc/WallClockTime.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #include <InputProc/Buffer/BufferSettings.h>
 #include <InputProc/Buffer/SampleBuffer.h>
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h b/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
index eb00bb194dbd6bec58a912b522697bfc42c8feb1..53e9bda80777f36b8881e2c44acc45f1adb7a790 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
@@ -27,7 +27,7 @@
 
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Allocator.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include "BufferSettings.h"
 #include "SharedMemory.h"
 #include "Ranges.h"
diff --git a/RTCP/Cobalt/InputProc/src/CMakeLists.txt b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
index 6d54ba88e02d6052aa4bf75f2dc9cce41a20ee71..52149791510db0dc312c34ad6fadc14c0971304c 100644
--- a/RTCP/Cobalt/InputProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
@@ -8,6 +8,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 set(_inputproc_sources
   Package__Version.cc
   RSPBoards.cc
+  RSPTimeStamp.cc
   Buffer/BufferSettings.cc
   Buffer/Ranges.cc
   Buffer/SampleBuffer.cc
diff --git a/RTCP/Cobalt/InputProc/src/Delays/Delays.h b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
index 83d456d8473a2b1fdbe8bfdde97571ddf2f00aa1..0420cae6f7df5349b87af8f4bd2bddd45ac1c7dd 100644
--- a/RTCP/Cobalt/InputProc/src/Delays/Delays.h
+++ b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
@@ -38,8 +38,8 @@
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Parset.h>
 #include <CoInterface/SubbandMetaData.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #ifdef HAVE_CASACORE
 #include <measures/Measures/MeasConvert.h>
diff --git a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
similarity index 97%
rename from RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc
rename to RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
index bb2a85136cc55cea2d10c94e4ec185a52446a469..f140da608041bce5f1e1ecb97aa6d6417c9ef852 100644
--- a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc
+++ b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
@@ -20,7 +20,7 @@
 
 #include <lofar_config.h>
 
-#include <CoInterface/RSPTimeStamp.h>
+#include "RSPTimeStamp.h"
 
 #include <Common/lofar_iostream.h>
 #include <Common/lofar_iomanip.h>
diff --git a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
similarity index 98%
rename from RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h
rename to RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
index f7014887f2c278235a69f239619dfea06d99665e..3ed7c51d7cf556c1af8d0602070620db3193fac1 100644
--- a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h
+++ b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
@@ -18,8 +18,8 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_INTERFACE_RSPTIMESTAMP_H
-#define LOFAR_INTERFACE_RSPTIMESTAMP_H
+#ifndef LOFAR_COBALT_INPUTPROC_RSPTIMESTAMP_H
+#define LOFAR_COBALT_INPUTPROC_RSPTIMESTAMP_H
 
 #include <Common/lofar_iosfwd.h>
 #include <Common/LofarTypes.h>
diff --git a/RTCP/Cobalt/InputProc/src/Station/Generator.h b/RTCP/Cobalt/InputProc/src/Station/Generator.h
index 2f18711adfcf795fc6643f786dddcdad68f13f27..55a9744482f0583ad8d90d99c77d68ac6c3f1bd5 100644
--- a/RTCP/Cobalt/InputProc/src/Station/Generator.h
+++ b/RTCP/Cobalt/InputProc/src/Station/Generator.h
@@ -25,10 +25,10 @@
 #include <vector>
 
 #include <Stream/Stream.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
 
 #include <InputProc/RSPBoards.h>
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Buffer/BufferSettings.h>
 
 #include "PacketFactory.h"
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h b/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
index 2119b17f3ffa839fe8fc686204892516b1595f85..2fee4d44c842db76330fed94ce098dc7551ce2c3 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
@@ -23,7 +23,7 @@
 #define LOFAR_INPUT_PROC_PACKETFACTORY_H
 
 #include <InputProc/Buffer/BufferSettings.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #include "RSP.h"
 
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketStream.h b/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
index fa679c616f8cace2386baaecfee4aa84f804fe1f..0e61ba0eb32a16077ff0335e89bee9818f71a63f 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
@@ -24,7 +24,7 @@
 
 #include <Stream/Stream.h>
 #include <Common/Thread/Cancellation.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include "PacketFactory.h"
 #include "RSP.h"
 
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc b/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
index d9b83f434bdae900ccf5ca578f7929a91dfa4c24..724b8f9a5e5ff5458417f61c49935097e3909d7d 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
@@ -24,7 +24,7 @@
 #include <Common/LofarTypes.h>
 #include <Common/LofarConstants.h>
 #include <Common/LofarLogger.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 namespace LOFAR {
 namespace Cobalt {
diff --git a/RTCP/Cobalt/InputProc/src/Station/RSP.h b/RTCP/Cobalt/InputProc/src/Station/RSP.h
index d23648eac66532cff608eabce8ecda4173cdaaa5..f2ee81a9acafce10485dad349532d22e55c113f2 100644
--- a/RTCP/Cobalt/InputProc/src/Station/RSP.h
+++ b/RTCP/Cobalt/InputProc/src/Station/RSP.h
@@ -25,7 +25,7 @@
 #include <complex>
 
 #include <Common/LofarTypes.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 namespace LOFAR
 {
diff --git a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
index f8411c8dd35d4b175942e992ea9da2d83f48c486..57e91087e456a97047c41f1fd9c5c45b76bfe640 100644
--- a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
@@ -32,7 +32,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/DataConvert.h>
 #include <Stream/FileStream.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 using namespace LOFAR;
 using namespace LOFAR::Cobalt;
diff --git a/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h b/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
index 35033d3c510b1c6700c45fe7f48dfad5f801e472..b6650910ff4ed6e66223d8ba0ec709808b887bca 100644
--- a/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
+++ b/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
@@ -25,10 +25,10 @@
 #include <mpi.h>
 
 #include <Common/LofarTypes.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/SubbandMetaData.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Buffer/Block.h>
 #include <InputProc/Buffer/BufferSettings.h>
 #include "MPIProtocol.h"
diff --git a/RTCP/Cobalt/InputProc/src/WallClockTime.h b/RTCP/Cobalt/InputProc/src/WallClockTime.h
index 5211a3ffc060a7190a1f4e4a13223631bc1bd297..73fece5c1ac82e2192d4dab99390cf958ef7c20a 100644
--- a/RTCP/Cobalt/InputProc/src/WallClockTime.h
+++ b/RTCP/Cobalt/InputProc/src/WallClockTime.h
@@ -28,7 +28,7 @@
 
 #include <Common/Thread/Mutex.h>
 #include <Common/Thread/Condition.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 
 namespace LOFAR
diff --git a/RTCP/Cobalt/InputProc/test/CMakeLists.txt b/RTCP/Cobalt/InputProc/test/CMakeLists.txt
index f6d49a069e4c351d57a28ad9383ac1333ac4c9ee..2f60a691ee1fbbbefddea4f136d8a31aefa494fc 100644
--- a/RTCP/Cobalt/InputProc/test/CMakeLists.txt
+++ b/RTCP/Cobalt/InputProc/test/CMakeLists.txt
@@ -12,6 +12,7 @@ if(UNITTEST++_FOUND)
 endif(UNITTEST++_FOUND)
 
 lofar_add_test(tRSP tRSP.cc)
+lofar_add_test(tRSPTimeStamp tRSPTimeStamp.cc)
 lofar_add_test(tRSPTimeStamp2 tRSPTimeStamp2.cc)
 lofar_add_test(tPacketReader tPacketReader.cc)
 lofar_add_test(tPacketFactory tPacketFactory.cc)
diff --git a/RTCP/Cobalt/InputProc/test/tMPITransfer.cc b/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
index 17e4d49d9744514997dd56bbe7950729cc4d8ba3..7cf6b520009ea4bd92aa17be6a7f43e8f2bf73c0 100644
--- a/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
+++ b/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
@@ -35,10 +35,10 @@
 #include <Common/Thread/Mutex.h>
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Stream.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <Stream/Stream.h>
 #include <Stream/SocketStream.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/OMPThread.h>
 #include <InputProc/SampleType.h>
 #include <InputProc/Buffer/StationID.h>
diff --git a/RTCP/Cobalt/InputProc/test/tRSP.cc b/RTCP/Cobalt/InputProc/test/tRSP.cc
index 24404c358ca6a07c154fc90f627e831f7441c26d..b239096cc113cd4ac8a86ae5f4db344954ea9a9c 100644
--- a/RTCP/Cobalt/InputProc/test/tRSP.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSP.cc
@@ -27,8 +27,8 @@
 #include <Common/LofarLogger.h>
 #include <Common/DataConvert.h>
 #include <Stream/FileStream.h>
-#include <CoInterface/RSPTimeStamp.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Station/RSP.h>
 
 
diff --git a/RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
similarity index 97%
rename from RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc
rename to RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
index 3248a96b41749e196b661cac1a4670e09aad6d1d..0228225e78cc995a536f94e514caec85d267da4a 100644
--- a/RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
@@ -20,12 +20,12 @@
 
 #include <lofar_config.h>
 
-#include <CoInterface/RSPTimeStamp.h>
 
 #include <stdint.h>
 
 #include <Common/LofarLogger.h>
 
+#include <InputProc/RSPTimeStamp.h>
 
 #define SAMPLERATE 195312.5
 // start the test at INT32_MAX * SAMPLERATE
diff --git a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
index 6814361021e5a8c312c75a3acb9e884c617769a2..6b31279119a5ad9a6ba5e4d72c0a9ffb972f2fdc 100644
--- a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
@@ -22,7 +22,7 @@
 
 #include <Common/LofarTypes.h>
 #include <Common/LofarLogger.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 using namespace LOFAR;
 using namespace Cobalt;