diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index 5e2497d827eea44eadb1f82f81a310a5d6d86aa2..58e3f6ab9e1d3fae17af3c2cc5854a8beb766a79 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -31,7 +31,7 @@
 #include <GCF/PVSS/PVSSresult.h>
 #include <GCF/RTDB/DP_Protocol.ph>
 #include "KeyValueLogger.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
 
 namespace LOFAR {
   using namespace MACIO;
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
index 50984d344de3bfafc943c8898914718a9d9fc8ae..cd1f19a9626eff80c3a6c8187a1c3b85caa589b5 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
@@ -32,7 +32,7 @@
 #include <GCF/RTDB/DP_Protocol.ph>
 #include <log4cplus/socketappender.h>
 #include "LogProcessor.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
 
 using namespace log4cplus;
 using namespace log4cplus::helpers;
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index 1be5baf92a246adc1c4f1eefb70af2d916ff979d..e5d22c19c22182a988e43de45c2b42bc596f4cb9 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -35,7 +35,7 @@
 #include <OTDB/TreeTypeConv.h>
 #include <OTDB/TreeValue.h>
 #include "SASGateway.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
 
 namespace LOFAR {
   using namespace MACIO;
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
index 01485d93388c65af80502548a3d3bb3aebd7bb05..ff5e5c53dda5a15cd2eb24056719968a92aaecc2 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
@@ -27,7 +27,7 @@
 
 #include <GCF/RTDB/DP_Protocol.ph>
 #include "SoftwareMonitor.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
 
 using namespace LOFAR;
 using namespace LOFAR::GCF;
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 910ac3044ce5d575a73f18c3333d456a046a5aa1..41be0483f13c93fc14532337740fb3e3230ae0dd 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -39,7 +39,7 @@
 
 #include "MACScheduler.h"
 #include "PVSSDatapointDefs.h"
-#include "../Package__Version.h"
+#include <MainCU/Package__Version.h>
 
 using namespace LOFAR::GCF::PVSS;
 using namespace LOFAR::GCF::TM;
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index c296fa1993ff07ed9384981a0a8dcf36c0f03555..b095208b69a19764c49960ddd1b0e7a6a9fd49a0 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -39,7 +39,7 @@
 
 #include "ObservationControl.h"
 #include "PVSSDatapointDefs.h"
-#include "../Package__Version.h"
+#include <MainCU/Package__Version.h>
 
 
 namespace LOFAR {
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index acfdfdc360292bab743b0da75115f7457ca59692..711a2614245cecd9a43c3eea1fc66b20272391c7 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -39,7 +39,7 @@
 
 #include "BeamControl.h"
 #include "PVSSDatapointDefs.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index aecc207dcb978d0d2a7818b3ef79777caffbcf44..a67b663899cfd20085b26ab7b4a3c4ec7c30fa0f 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -36,7 +36,7 @@
 
 #include "CalibrationControl.h"
 #include "PVSSDatapointDefs.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index f810ac038125fe0bb487e53bed362b7591dcd3b3..bc5ead630a873ef371f51ef54258a1bf91ffbacb 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -38,7 +38,7 @@
 #include "ClockControl.h"
 #include "PVSSDatapointDefs.h"
 #include "Clock_Protocol.ph"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
index a3a630aeff6dd151a4760f33d67193347aa85f8a..3ea35f5a1621deb5c7a5cc63aaa6619409b35786 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
@@ -30,7 +30,7 @@
 #include "RSPMonitor.h"
 #include "TBBMonitor.h"
 #include "ECMonitor.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 using namespace LOFAR;
 using namespace LOFAR::GCF;
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 4d0f82e16550b7951df1794236fd87339805b2e3..7fc0f2fbc948d9fdee6c6798e91e9fb86673cead 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -49,7 +49,7 @@
 #include "StationControl.h"
 #include "PVSSDatapointDefs.h"
 #include "Clock_Protocol.ph"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index e655a9bc89b7b8b5547fdef8d6d6ddece87e0f25..4722a4b364cfee6bcbef6abe22a3c4224520a37b 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -38,7 +38,7 @@
 #include <GCF/RTDB/DP_Protocol.ph>
 #include <signal.h>
 #include <APL/RTCCommon/Timestamp.h>
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
 
 //# local includes
 #include <VHECR/TBBTrigger.h>