diff --git a/RTCP/Cobalt/OutputProc/scripts/CMakeLists.txt b/RTCP/Cobalt/OutputProc/scripts/CMakeLists.txt
index f41ae226084ad02a936a383e43642bd1d2b183fb..5f21742714f93c57c700beb7c8f0829af22c6292 100644
--- a/RTCP/Cobalt/OutputProc/scripts/CMakeLists.txt
+++ b/RTCP/Cobalt/OutputProc/scripts/CMakeLists.txt
@@ -1,5 +1,3 @@
 # $Id$
 
 lofar_add_sbin_program(udp-copy udp-copy.c common.c)
-lofar_add_sbin_program(tbb-crc-test tbb-crc-test.cc)
-lofar_add_sbin_program(tbb-printframes tbb-printframes.cc)
diff --git a/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt b/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
index 3a021b445eef2a2766ef5a8502b8965d8d12f1d9..91a9bd69c18f446e6682f1f9d170631543506f84 100644
--- a/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
+++ b/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
@@ -27,3 +27,5 @@ lofar_add_bin_program(versiontbbwriter versiontbbwriter.cc)
 lofar_add_bin_program(TBB_Writer TBB_Writer_main.cc)
 
 
+lofar_add_sbin_program(tbb-crc-test tbb-crc-test.cc)
+lofar_add_sbin_program(tbb-printframes tbb-printframes.cc)
diff --git a/RTCP/Cobalt/OutputProc/scripts/tbb-crc-test.cc b/RTCP/Cobalt/TBBWriter/src/tbb-crc-test.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/scripts/tbb-crc-test.cc
rename to RTCP/Cobalt/TBBWriter/src/tbb-crc-test.cc
diff --git a/RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc b/RTCP/Cobalt/TBBWriter/src/tbb-printframes.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc
rename to RTCP/Cobalt/TBBWriter/src/tbb-printframes.cc
diff --git a/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc b/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc
index 2e06e6a5fbc7da6748c2dff7e005cf26e869ae09..e5ed2db0fcd507eefb04d07327580f40b561c86f 100644
--- a/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc
+++ b/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 
 #include <Common/Exceptions.h>
-#include <OutputProc/TBB_StaticMapping.h>
+#include <TBBWriter/TBB_StaticMapping.h>
 
 using namespace std;
 using namespace LOFAR;