diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
index 0cfb20e30ee9f5d341f0d39477e7f9bef7756410..8bcd551d29b056249daba2c20e69f2e3487edbbf 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
@@ -38,6 +38,8 @@
#include <APL/APLCommon/APL_Defines.h>
#include "CTState.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// Avoid 'using namespace' in headerfiles
namespace LOFAR {
@@ -50,6 +52,8 @@ namespace LOFAR {
using APLCommon::CTState;
namespace APLCommon {
+using boost::posix_time::ptime;
+
// \addtogroup APLCommon
// @{
diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 538726e7f495a9f0f9b0248b2e3d2c061f7f1619..9c9474299629a218623bb0b72d469d97954fc6a2 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -37,6 +37,7 @@
namespace LOFAR {
using namespace GCF::TM;
+ using namespace boost::posix_time;
namespace APLCommon {
typedef struct stateFlow_t {
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 61e13a626d0d398ac93e2aef947eca31050eb38c..8da5578db85ed3e87acd999ab7a5bdfe80b23d1f 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -50,6 +50,7 @@ using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::RTDB;
using namespace std;
+using namespace boost::posix_time;
namespace LOFAR {
using namespace APLCommon;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
index 1c30e3018369f86153a1bf131fe885cb36bf11bb..e771f17c9fd2abf0dd68f168723629f1d5551f48 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
@@ -43,6 +43,8 @@
#include <CEPApplMgr.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// forward declaration
namespace LOFAR {
@@ -56,7 +58,7 @@ using GCF::TM::GCFPortInterface;
using GCF::TM::GCFTask;
using GCF::RTDB::RTDBPropertySet;
using APLCommon::ParentControl;
-
+using boost::posix_time::ptime;
class OnlineControl : public GCFTask,
public CEPApplMgrInterface
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
index 60cdd0b0f9490d54a624a18df6ca438c0e1e1e7e..9fa935bd723bc8ab05211317dd12e71ebacb2340 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
@@ -50,7 +50,10 @@
#include "PythonControl.h"
#include "PVSSDatapointDefs.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
using namespace std;
+using namespace boost::posix_time;
namespace LOFAR {
using namespace APLCommon;
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index fbec88a6e4cefdf1fd23abc7257d2483fdc95fd5..96337bed91b4bc585ff4880ea69685eac0795795 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -36,6 +36,7 @@
#include <OTDB/TreeValue.h>
#include "KeyValueLogger.h"
#include <CURTDBDaemons/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
namespace LOFAR {
using namespace MACIO;
@@ -46,6 +47,8 @@ namespace LOFAR {
using namespace RTDB;
namespace RTDBDaemons {
+using namespace boost::posix_time;
+
//
// CodeloggingProcessor()
//
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index e5d22c19c22182a988e43de45c2b42bc596f4cb9..ef752bda6579d54f8c40247c58dd17ceeb3ff0d5 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -36,6 +36,7 @@
#include <OTDB/TreeValue.h>
#include "SASGateway.h"
#include <CURTDBDaemons/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
namespace LOFAR {
using namespace MACIO;
@@ -46,6 +47,8 @@ namespace LOFAR {
using namespace RTDB;
namespace RTDBDaemons {
+using namespace boost::posix_time;
+
//
// SASGateway()
//
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
index c3b12b9db1808233973140ad54981c1e26e7ea4d..1c611caf5ddcfa5641246c27e867b008df4ca2e9 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
@@ -49,10 +49,12 @@
#include "TriggerControl.h"
#include "PVSSDatapointDefs.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::RTDB;
+using namespace boost::posix_time;
using namespace std;
using namespace LOFAR::StringUtil;
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
index 8de5f6738c003bedaaefb44bbd66153c6ce0c319..25cbec31d68a3c44f905603590aafa89d98a4d20 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
@@ -35,6 +35,8 @@
#include <GCF/RTDB/GCF_RTDBPort.h>
#include <GCF/RTDB/DPservice.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// forward declaration
namespace LOFAR {
@@ -48,6 +50,8 @@ namespace LOFAR {
using GCF::RTDB::GCFRTDBPort;
namespace MainCU {
+using boost::posix_time::ptime;
+
class TriggerControl : public GCFTask
{
public:
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 639fc98adb5a8d199609969d8bfdcc580173b64a..f0311610aa37e54666afa660000e5090c23c1455 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -41,10 +41,13 @@
#include "PVSSDatapointDefs.h"
#include <MainCU/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::RTDB;
using namespace LOFAR::OTDB;
+using namespace boost::posix_time;
using namespace std;
namespace LOFAR {
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
index 280f13b64f6947a4449696d3297c88ae9deed77c..d45b6280b397e95fefae5e66a0ad91454acc0ad1 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
@@ -48,6 +48,8 @@
#include "ObsClaimer.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// forward declaration
namespace LOFAR {
@@ -61,6 +63,8 @@ namespace LOFAR {
using APLCommon::ChildControl;
namespace MainCU {
+using boost::posix_time::ptime;
+using boost::posix_time::min_date_time;
class MACScheduler : public GCFTask
{
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 9cede9a2715854810a00ad25a68bc07a6624eaec..2879b432f5a76a4e3f059b985cfaa8939e578404 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -42,6 +42,9 @@
#include "PVSSDatapointDefs.h"
#include <MainCU/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+using namespace boost::posix_time;
namespace LOFAR {
using namespace APLCommon;
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index fdf19c1c3b7e54fd4faec1c8dd492e690259e852..56b4035db7e2c7d41a3e0394bf087b3f7dd655eb 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -47,6 +47,8 @@
//# ACC Includes
#include <Common/ParameterSet.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// forward declaration
namespace LOFAR {
@@ -64,6 +66,8 @@ namespace LOFAR {
using APLCommon::CTState;
namespace MainCU {
+using boost::posix_time::ptime;
+
class ObservationControl : public GCFTask
{
public:
diff --git a/MAC/APL/StationCU/CMakeLists.txt b/MAC/APL/StationCU/CMakeLists.txt
index e33cd2f466a86670ea65e6c9734013ef8d4802f4..349378323fbd919b378db84129c65cc9897799df 100644
--- a/MAC/APL/StationCU/CMakeLists.txt
+++ b/MAC/APL/StationCU/CMakeLists.txt
@@ -8,6 +8,7 @@ IBS_Protocol CAL_Protocol RSP_Protocol TBB_Protocol VHECR CR_Protocol)
include(LofarFindPackage)
lofar_find_package(Blitz REQUIRED)
+lofar_find_package(Boost REQUIRED date_time)
add_subdirectory(include/APL/ClockProtocol)
add_subdirectory(src)
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index e12b87698223b87085be122a0f8aafeafa655a0f..cc7235dc47f23ef00d2aa6348ccdadb0954c912b 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -44,10 +44,13 @@
#include "PVSSDatapointDefs.h"
#include <StationCU/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::RTDB;
using namespace LOFAR::APL::RTDBCommon;
+using namespace boost::posix_time;
using namespace std;
namespace LOFAR {
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index 1eb17c23ccabe91e837eb8f84149a8ef7ad62133..e95e284a98b9ad85837a2199e9f600294ba0b7ed 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -40,10 +40,13 @@
#include "PVSSDatapointDefs.h"
#include <StationCU/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::RTDB;
using namespace LOFAR::APL::RTDBCommon;
+using namespace boost::posix_time;
namespace LOFAR {
using namespace APLCommon;
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
index ad92bd497cd43f7659f5e85087ec713f5e8b34ba..ee349f83221ea532e5e8fd3f19298c0aa97ba047 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
@@ -39,6 +39,9 @@
#include "RCUConstants.h"
#include "PVSSDatapointDefs.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+using namespace boost::posix_time;
namespace LOFAR {
using namespace GCF::TM;
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 26f69d44602708016157ffdf4039fff306a4d8b7..b98390caf213f819671e61a0717de15144788485 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -54,10 +54,13 @@
#include "Clock_Protocol.ph"
#include <StationCU/Package__Version.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::RTDB;
using namespace LOFAR::APL::RTDBCommon;
+using namespace boost::posix_time;
using namespace std;
namespace LOFAR {
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index e5c517cbdd45ef26fd3fa8d9c0a278997f60737f..14a33bb0c7f105f14dfd22026fd964120edaf447 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -55,7 +55,11 @@
#include "PVSSDatapointDefs.h"
#include "TBBObservation.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+using namespace boost::posix_time;
using namespace std;
+
namespace LOFAR {
using namespace GCF::TM;
using namespace GCF::PVSS;
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.h b/MAC/APL/TestCtlr/src/ControllerMenu.h
index 91fe6a132f7c32b5c4e63fc3cbedf268b3981391..ae3fc9345c11f158e84813e29d050d218951b6a7 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.h
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.h
@@ -44,6 +44,8 @@
//# ACC Includes
#include <Common/ParameterSet.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
// forward declaration
namespace LOFAR {
@@ -56,6 +58,7 @@ using GCF::TM::GCFPort;
using GCF::TM::GCFPortInterface;
using GCF::TM::GCFTask;
using APLCommon::ChildControl;
+using boost::posix_time::ptime;
class ControllerMenu : public GCFTask
{
diff --git a/MAC/APL/VHECR/src/TBBReadCmd.cc b/MAC/APL/VHECR/src/TBBReadCmd.cc
index bb91fd6de83a5b95fec05766e7b8da1a317caaf9..2b6f36209b0359cc962008819fd2d275a59622a7 100644
--- a/MAC/APL/VHECR/src/TBBReadCmd.cc
+++ b/MAC/APL/VHECR/src/TBBReadCmd.cc
@@ -27,10 +27,13 @@
#include <Common/LofarLogger.h>
#include <ApplCommon/PosixTime.h>
#include <VHECR/TBBReadCmd.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
namespace LOFAR {
namespace VHECR {
+using namespace boost::posix_time;
+
//
// TBBReadCmd(...)
//
diff --git a/MAC/Deployment/data/bin/load_OTDB_comps.cc b/MAC/Deployment/data/bin/load_OTDB_comps.cc
index a0f8db51ae6045e9fce87de849f1cc83ce37b46a..fca64ba2b888d954bbc014961e2825217115f7e9 100644
--- a/MAC/Deployment/data/bin/load_OTDB_comps.cc
+++ b/MAC/Deployment/data/bin/load_OTDB_comps.cc
@@ -29,6 +29,7 @@
#include <Common/lofar_fstream.h>
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
+#include <Common/lofar_iomanip.h>
#include <Common/Exception.h>
#include <OTDB/TreeMaintenance.h>