diff --git a/LCS/ApplCommon/include/ApplCommon/StationInfo.h b/LCS/ApplCommon/include/ApplCommon/StationInfo.h
index fba98ff296f7cc55ffbef1323270b715f4b8bf74..2569e63e86585fa8c6bf981837c4a011085cb8af 100644
--- a/LCS/ApplCommon/include/ApplCommon/StationInfo.h
+++ b/LCS/ApplCommon/include/ApplCommon/StationInfo.h
@@ -53,6 +53,17 @@ string	stationRingName();									// Core, Remote, Europe
 string	PVSSDatabaseName(const string&	someName = "");		// hostname w/o CUtype
 string	realHostname(const string&	someName);				// adds 'C' when it is missing.
 
+// Get the ObservationNr from the controllername.
+uint32	getObservationNr (const string&	ObservationName);
+
+// Get the instanceNr from the controllername.
+uint16	getInstanceNr (const string&	ObservationName);
+
+// Construct PS name solving markers line @observation@, @ring@, etc.
+string	createPropertySetName(const string&		propSetMask,
+							  const string&		controllerName,
+							  const string&		realDPname = "REALDPNAME");
+
 string  PVSS2SASname(const string& PVSSname);				// convert PVSS DPname to SAS DPname
 string  SAS2PVSSname(const string& SASname);				// convert SAS DPname to PVSS DPname
 
diff --git a/LCS/ApplCommon/src/StationInfo.cc b/LCS/ApplCommon/src/StationInfo.cc
index f6cbc084553db80ca2528ea2ffef8883bb669e5d..f77212a37763a0a4e900324c695ba5ae53b7e0e5 100644
--- a/LCS/ApplCommon/src/StationInfo.cc
+++ b/LCS/ApplCommon/src/StationInfo.cc
@@ -25,6 +25,7 @@
 
 #include <Common/lofar_string.h>
 #include <Common/LofarTypes.h>
+#include <Common/ParameterSet.h>	// indexValue
 #include <Common/StringUtil.h>
 #include <Common/SystemUtil.h>
 #include <ApplCommon/StationInfo.h>
@@ -138,6 +139,160 @@ string	realHostname(const string&	someName)
 	return (someName+'C');
 }
 
+//
+// getObservationNr(controllerName)
+//
+// Get the ObservationNr from the controllername.
+uint32	getObservationNr (const string&	controllerName)
+{
+	return (indexValue(controllerName, "{}"));
+}
+
+//
+// getInstanceNr(controllername)
+//
+// Get the instanceNr from the controllername.
+uint16	getInstanceNr (const string&	controllerName)
+{
+	string		cntlrName (controllerName);		// destroyable copy
+	rtrim(cntlrName, "{}0123456789");
+	return (indexValue(cntlrName, "[]"));
+}
+
+//
+// createPropertySetName(propSetMask)
+//
+//  A PropSetMask may contain the markers:
+//	@ring@
+//	@station@
+//  @instance@
+//	@observation@
+//	@cabinet@
+//	@subrack@
+//	@RSPboard@
+//	@TBboard@
+//	@rcu@
+//      @bgp@
+//      @midplane@
+//      @ionode@
+//      @osrack@
+//      @ossubcluster@
+//      @storagenode@
+//      @offlinenode@
+//  @inputbuffer@
+//  @adder@
+//  @storage@
+//  @cobaltnode@
+//  @cobaltnic@
+//  @oscobaltnode@
+//  @pscobaltnode@
+//  @cobaltgpuproc@
+//
+string	createPropertySetName(const string&		propSetMask,
+							  const string&		controllerName,
+							  const string&		realDPname)
+{
+	string	psName(propSetMask);		// editable copy
+	string::size_type	pos;
+	// when name contains @ring@_@station@ cut out this marker and prepend hostname
+	// stationname+:  -> LOFAR_ObsSW_@ring@_@station@_CalCtrl_xxx --> CS010:LOFAR_ObsSW_CalCtrl_xxx
+	if ((pos = psName.find("@ring@_@station@_")) != string::npos) {
+		psName.erase(pos, 17);
+		psName = PVSSDatabaseName(myHostname(false)) + ":" + psName;
+	}
+
+	if ((pos = psName.find("@ring@")) != string::npos) {
+		psName.replace(pos, 6, stationRingName());
+	}
+
+	if ((pos = psName.find("@station@")) != string::npos) {
+		psName.replace(pos, 9, PVSSDatabaseName(myHostname(false)));
+	}
+
+	if ((pos = psName.find("@instance@")) != string::npos) {
+		uint16	instanceNr = getInstanceNr(controllerName);
+		if (instanceNr) {
+			psName.replace(pos, 10, lexical_cast<string>(instanceNr));
+		}
+		else {
+			psName.replace(pos, 10, "");	
+		}
+	}
+
+	if ((pos = psName.find("LOFAR_ObsSW_@observation@")) != string::npos) {
+		psName.replace(pos, 25, realDPname);
+	}
+
+	if ((pos = psName.find("@cabinet@")) != string::npos) {
+		psName.replace(pos, 9, string("Cabinet%d"));
+	}
+	if ((pos = psName.find("@subrack@")) != string::npos) {
+		psName.replace(pos, 9, string("Subrack%d"));
+	}
+	if ((pos = psName.find("@RSPBoard@")) != string::npos) {
+		psName.replace(pos, 10, string("RSPBoard%d"));
+	}
+	if ((pos = psName.find("@TBBoard@")) != string::npos) {
+		psName.replace(pos, 9, string("TBBoard%d"));
+	}
+	if ((pos = psName.find("@rcu@")) != string::npos) {
+		psName.replace(pos, 5, string("RCU%d"));
+	}
+	if ((pos = psName.find("@bgp@")) != string::npos) {
+		psName.replace(pos, 5, string("BGP%d"));
+	}
+	if ((pos = psName.find("@midplane@")) != string::npos) {
+		psName.replace(pos, 10, string("Midplane%d"));
+	}
+	if ((pos = psName.find("@ionode@")) != string::npos) {
+		psName.replace(pos, 8, string("IONode%02d"));
+	}
+	if ((pos = psName.find("@osionode@")) != string::npos) {
+		psName.replace(pos, 10, string("OSIONode%02d"));
+	}
+	if ((pos = psName.find("@locusnode@")) != string::npos) {
+		psName.replace(pos, 11, string("LocusNode%03d"));
+	}
+	if ((pos = psName.find("@osrack@")) != string::npos) {
+		psName.replace(pos, 8, string("OSRack%d"));
+	}
+	if ((pos = psName.find("@ossubcluster@")) != string::npos) {
+		psName.replace(pos, 14, string("OSSubcluster%d"));
+	}
+	if ((pos = psName.find("@storagenode@")) != string::npos) {
+		psName.replace(pos, 13, string("StorageNode%d"));
+	}
+	if ((pos = psName.find("@offlinenode@")) != string::npos) {
+		psName.replace(pos, 13, string("OfflineNode%d"));
+	}
+	if ((pos = psName.find("@inputbuffer@")) != string::npos) {
+		psName.replace(pos, 13, string("InputBuffer%d"));
+	}
+	if ((pos = psName.find("@adder@")) != string::npos) {
+		psName.replace(pos, 7, string("Adder%d"));
+	}
+	if ((pos = psName.find("@storage@")) != string::npos) {
+		psName.replace(pos, 9, string("Storage%d"));
+	}
+	if ((pos = psName.find("@cobaltnode@")) != string::npos) {
+		psName.replace(pos, 12, string("CBT%03d"));
+	}
+	if ((pos = psName.find("@cobaltnic@")) != string::npos) {
+		psName.replace(pos, 11, string("CobaltNIC%02d"));
+	}
+	if ((pos = psName.find("@oscobaltnode@")) != string::npos) {
+		psName.replace(pos, 14, string("OSCBT%03d"));
+	}
+	if ((pos = psName.find("@pscobaltnode@")) != string::npos) {
+		psName.replace(pos, 14, string("PSCBT%03d"));
+	}
+	if ((pos = psName.find("@cobaltgpuproc@")) != string::npos) {
+		psName.replace(pos, 15, string("CobaltGPUProc%02d"));
+	}
+		
+	return (psName);
+}
+
 #if defined HAVE_BOOST_REGEX
 
 //
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
index f15072bfd5278f786c4196bc6d116ce673e0fcff..04352c5fed3179687619be457f8865442c11eaa7 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
@@ -106,12 +106,6 @@ string	getExecutable (uint16		cntlrType);
 // return 'shared' bit of controllertype
 bool	isSharedController(uint16		cntrlType) ;
 
-// Get the ObservationNr from the controllername.
-uint32	getObservationNr (const string&	ObservationName);
-
-// Get the instanceNr from the controllername.
-uint16	getInstanceNr (const string&	ObservationName);
-
 // Get the controllerType from the controllername.
 int32	getControllerType	(const string&	ObservationName);
 
@@ -121,11 +115,6 @@ string 	observationName(int	obsID);
 // Get the name of the parset of the observation.
 string 	observationParset(int	obsID);
 
-// Construct PS name solving markers line @observation@, @ring@, etc.
-string	createPropertySetName(const string&		propSetMask,
-							  const string&		controllerName,
-							  const string&		realDPname = "REALDPNAME");
-
 // Construct a message the matches the given CTState and send it on the port.
 bool sendControlResult(GCF::TM::GCFPortInterface&	port,
 					   uint16						signal,
diff --git a/MAC/APL/APLCommon/src/ControllerDefines.cc b/MAC/APL/APLCommon/src/ControllerDefines.cc
index bc70abd9ca487c8b365e72570ff683fae30ab074..ba80f725ad8bca02ca1a6459749469d1800a5c50 100644
--- a/MAC/APL/APLCommon/src/ControllerDefines.cc
+++ b/MAC/APL/APLCommon/src/ControllerDefines.cc
@@ -27,9 +27,8 @@
 #include <Common/LofarLogger.h>
 #include <Common/StringUtil.h>					// rtrim
 #include <Common/SystemUtil.h>
-#include <Common/ParameterSet.h>					// indexValue
+#include <ApplCommon/LofarDirs.h>
 #include <APL/APLCommon/ControllerDefines.h>
-#include <ApplCommon/StationInfo.h>
 #include "Controller_Protocol.ph"
 
 #include <boost/config.hpp>
@@ -160,26 +159,6 @@ bool	isSharedController(uint16		cntlrType)
 	return (controllerTable[cntlrType].shared);
 }
 
-//
-// getObservationNr(controllerName)
-//
-// Get the ObservationNr from the controllername.
-uint32	getObservationNr (const string&	controllerName)
-{
-	return (indexValue(controllerName, "{}"));
-}
-
-//
-// getInstanceNr(controllername)
-//
-// Get the instanceNr from the controllername.
-uint16	getInstanceNr (const string&	controllerName)
-{
-	string		cntlrName (controllerName);		// destroyable copy
-	rtrim(cntlrName, "{}0123456789");
-	return (indexValue(cntlrName, "[]"));
-}
-
 //
 // getControllerType(controllerName)
 //
@@ -230,140 +209,6 @@ string observationParset(int	obsID)
 	return (formatString("%s/%s", LOFAR_SHARE_LOCATION, observationName(obsID).c_str()));
 }
 
-//
-// createPropertySetName(propSetMask)
-//
-//  A PropSetMask may contain the markers:
-//	@ring@
-//	@station@
-//  @instance@
-//	@observation@
-//	@cabinet@
-//	@subrack@
-//	@RSPboard@
-//	@TBboard@
-//	@rcu@
-//      @bgp@
-//      @midplane@
-//      @ionode@
-//      @osrack@
-//      @ossubcluster@
-//      @storagenode@
-//      @offlinenode@
-//  @inputbuffer@
-//  @adder@
-//  @storage@
-//  @cobaltnode@
-//  @cobaltnic@
-//  @oscobaltnode@
-//  @pscobaltnode@
-//  @cobaltgpuproc@
-//
-string	createPropertySetName(const string&		propSetMask,
-							  const string&		controllerName,
-							  const string&		realDPname)
-{
-	string	psName(propSetMask);		// editable copy
-	string::size_type	pos;
-	// when name contains @ring@_@station@ cut out this marker and prepend hostname
-	// stationname+:  -> LOFAR_ObsSW_@ring@_@station@_CalCtrl_xxx --> CS010:LOFAR_ObsSW_CalCtrl_xxx
-	if ((pos = psName.find("@ring@_@station@_")) != string::npos) {
-		psName.erase(pos, 17);
-		psName = PVSSDatabaseName(myHostname(false)) + ":" + psName;
-	}
-
-	if ((pos = psName.find("@ring@")) != string::npos) {
-		psName.replace(pos, 6, stationRingName());
-	}
-
-	if ((pos = psName.find("@station@")) != string::npos) {
-		psName.replace(pos, 9, PVSSDatabaseName(myHostname(false)));
-	}
-
-	if ((pos = psName.find("@instance@")) != string::npos) {
-		uint16	instanceNr = getInstanceNr(controllerName);
-		if (instanceNr) {
-			psName.replace(pos, 10, lexical_cast<string>(instanceNr));
-		}
-		else {
-			psName.replace(pos, 10, "");	
-		}
-	}
-
-	if ((pos = psName.find("LOFAR_ObsSW_@observation@")) != string::npos) {
-		psName.replace(pos, 25, realDPname);
-	}
-
-	if ((pos = psName.find("@cabinet@")) != string::npos) {
-		psName.replace(pos, 9, string("Cabinet%d"));
-	}
-	if ((pos = psName.find("@subrack@")) != string::npos) {
-		psName.replace(pos, 9, string("Subrack%d"));
-	}
-	if ((pos = psName.find("@RSPBoard@")) != string::npos) {
-		psName.replace(pos, 10, string("RSPBoard%d"));
-	}
-	if ((pos = psName.find("@TBBoard@")) != string::npos) {
-		psName.replace(pos, 9, string("TBBoard%d"));
-	}
-	if ((pos = psName.find("@rcu@")) != string::npos) {
-		psName.replace(pos, 5, string("RCU%d"));
-	}
-	if ((pos = psName.find("@bgp@")) != string::npos) {
-		psName.replace(pos, 5, string("BGP%d"));
-	}
-	if ((pos = psName.find("@midplane@")) != string::npos) {
-		psName.replace(pos, 10, string("Midplane%d"));
-	}
-	if ((pos = psName.find("@ionode@")) != string::npos) {
-		psName.replace(pos, 8, string("IONode%02d"));
-	}
-	if ((pos = psName.find("@osionode@")) != string::npos) {
-		psName.replace(pos, 10, string("OSIONode%02d"));
-	}
-	if ((pos = psName.find("@locusnode@")) != string::npos) {
-		psName.replace(pos, 11, string("LocusNode%03d"));
-	}
-	if ((pos = psName.find("@osrack@")) != string::npos) {
-		psName.replace(pos, 8, string("OSRack%d"));
-	}
-	if ((pos = psName.find("@ossubcluster@")) != string::npos) {
-		psName.replace(pos, 14, string("OSSubcluster%d"));
-	}
-	if ((pos = psName.find("@storagenode@")) != string::npos) {
-		psName.replace(pos, 13, string("StorageNode%d"));
-	}
-	if ((pos = psName.find("@offlinenode@")) != string::npos) {
-		psName.replace(pos, 13, string("OfflineNode%d"));
-	}
-	if ((pos = psName.find("@inputbuffer@")) != string::npos) {
-		psName.replace(pos, 13, string("InputBuffer%d"));
-	}
-	if ((pos = psName.find("@adder@")) != string::npos) {
-		psName.replace(pos, 7, string("Adder%d"));
-	}
-	if ((pos = psName.find("@storage@")) != string::npos) {
-		psName.replace(pos, 9, string("Storage%d"));
-	}
-	if ((pos = psName.find("@cobaltnode@")) != string::npos) {
-		psName.replace(pos, 12, string("CBT%03d"));
-	}
-	if ((pos = psName.find("@cobaltnic@")) != string::npos) {
-		psName.replace(pos, 11, string("CobaltNIC%02d"));
-	}
-	if ((pos = psName.find("@oscobaltnode@")) != string::npos) {
-		psName.replace(pos, 14, string("OSCBT%03d"));
-	}
-	if ((pos = psName.find("@pscobaltnode@")) != string::npos) {
-		psName.replace(pos, 14, string("PSCBT%03d"));
-	}
-	if ((pos = psName.find("@cobaltgpuproc@")) != string::npos) {
-		psName.replace(pos, 15, string("CobaltGPUProc%02d"));
-	}
-		
-	return (psName);
-}
-
 //
 // sendControlResult(port, CONTROLsignal, cntlrName, result)
 //
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
index 350d5f831a19f8beededb99096d1d427095e02b1..c37e41339065fd4b93ccf74a5657c0562d72e163 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
@@ -25,14 +25,13 @@
 #include <Common/LofarLocators.h>
 #include <Common/StringUtil.h>
 #include <Common/ParameterSet.h>
+#include <ApplCommon/StationInfo.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/PVSS/PVSSinfo.h>
 #include <MACIO/MACServiceInfo.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/RTDBCommon/RTDButilities.h>
 #include <GCF/RTDB/DP_Protocol.ph>
-//#include <APL/APLCommon/StationInfo.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>	// usleep
@@ -45,7 +44,6 @@
 #define MAX2(a,b)	((a) > (b)) ? (a) : (b)
 
 namespace LOFAR {
-	using namespace APLCommon;
 	using namespace APL::RTDBCommon;
 	using namespace GCF::TM;
 	using namespace GCF::PVSS;
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
index 20fffaa8bea52424587d96af6f05f636fb337737..3df9e8519bb8f9de5959713b367e5b276178133d 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
@@ -26,14 +26,13 @@
 #include <Common/lofar_vector.h>
 #include <Common/StringUtil.h>
 #include <Common/ParameterSet.h>
+#include <ApplCommon/StationInfo.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/PVSS/PVSSinfo.h>
 #include <MACIO/MACServiceInfo.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/RTDBCommon/RTDButilities.h>
 #include <GCF/RTDB/DP_Protocol.ph>
-//#include <APL/APLCommon/StationInfo.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>	// usleep
@@ -46,7 +45,6 @@
 #define MAX2(a,b)	((a) > (b)) ? (a) : (b)
 
 namespace LOFAR {
-	using namespace APLCommon;
 	using namespace APL::RTDBCommon;
 	using namespace GCF::TM;
 	using namespace GCF::PVSS;
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
index 62a4e0adf208aa382cf222ba2b02b4d783d28a4c..073a02770b22766827d116eba05b274b353031d9 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
@@ -21,11 +21,11 @@
 //#  $Id: PVSSGateway.cc 23417 2012-12-20 14:06:29Z loose $
 
 #include <lofar_config.h>
-#include <ApplCommon/PosixTime.h>
 #include <Common/LofarLogger.h>
 #include <Common/Version.h>
 #include <Common/ParameterSet.h>
-#include <APL/APLCommon/ControllerDefines.h>
+#include <ApplCommon/PosixTime.h>
+#include <ApplCommon/StationInfo.h>
 #include <MACIO/GCF_Event.h>
 #include <MACIO/MACServiceInfo.h>
 #include <MACIO/KVT_Protocol.ph>
@@ -40,7 +40,6 @@
 
 namespace LOFAR {
   using namespace MACIO;
-  using namespace APLCommon;
   namespace GCF {
     using namespace TM;
     using namespace PVSS;
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index 65423c1a9819c24a473a806d47a3c1f706de91ae..c551aec30441add6688fcf238605677d824ae914 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -26,6 +26,7 @@
 
 #include <Common/ParameterSet.h>
 #include <ApplCommon/StationConfig.h>
+#include <ApplCommon/StationInfo.h>
 #include <MACIO/MACServiceInfo.h>
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <APL/APLCommon/APL_Defines.h>
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
index adcc499e5fb0028dd3ebc7f697753ac5fc2ffe09..74ccce3700a704504cbf34aa114726b5e753236d 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
@@ -26,18 +26,17 @@
 #include <Common/LofarConstants.h>
 #include <Common/StringUtil.h>
 #include <Common/hexdump.h>
+#include <ApplCommon/StationInfo.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/PVSS/PVSSinfo.h>
 #include <MACIO/MACServiceInfo.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/APLUtilities.h>
 #include <ApplCommon/StationConfig.h>
 #include <APL/RTDBCommon/RTDButilities.h>
 #include <EC_Protocol.ph>
 #include <GCF/RTDB/DP_Protocol.ph>
 #include <GCF/TM/GCF_RawPort.h>
-//#include <APL/APLCommon/StationInfo.h>
 #include <signal.h>
 
 #include "ECMonitor.h"
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
index 91b483e3cc1bc8af53f888a72c67d9b7be864939..921c4039edb79b9741f31c74f3b0432bef0749fe 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
@@ -25,16 +25,15 @@
 #include <Common/LofarLocators.h>
 #include <Common/StringUtil.h>
 #include <Common/ParameterSet.h>
+#include <ApplCommon/StationInfo.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/PVSS/PVSSinfo.h>
 #include <MACIO/MACServiceInfo.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/AntennaMapper.h>
 #include <APL/RTDBCommon/RTDButilities.h>
 #include <APL/RSP_Protocol/RSP_Protocol.ph>
 #include <GCF/RTDB/DP_Protocol.ph>
-//#include <APL/APLCommon/StationInfo.h>
 #include <signal.h>
 #include <unistd.h>	// usleep
 
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
index e6ecabf756501d1d96282a0b857cf9f2756ddd5f..c7d1c9d0f6292c137ce1639ac93a2c711c9bc87d 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
@@ -23,15 +23,14 @@
 #include <Common/LofarLogger.h>
 #include <Common/LofarConstants.h>
 #include <Common/StringUtil.h>
+#include <ApplCommon/StationInfo.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <MACIO/MACServiceInfo.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/APLUtilities.h>
 #include <APL/RTDBCommon/RTDButilities.h>
 #include <APL/TBB_Protocol/TBB_Protocol.ph>
 #include <GCF/RTDB/DP_Protocol.ph>
-//#include <APL/APLCommon/StationInfo.h>
 #include <signal.h>
 
 #include "TBBMonitor.h"
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
index 524673d378e04ad939d05e874b3863e973fcf496..8323c99fbcc9b179a4ab551cb52624ad1c09c5ff 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
@@ -32,10 +32,10 @@
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
 #include <ApplCommon/StationConfig.h>
+#include <ApplCommon/StationInfo.h>
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/TM/GCF_Protocols.h>
 #include <APL/APLCommon/ChildControl.h>
-#include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/Controller_Protocol.ph>
 #include <GCF/RTDB/DP_Protocol.ph>
 #include "PVSSDatapointDefs.h"