diff --git a/CEP/Calibration/BBSControl/src/bbs-controller.cc b/CEP/Calibration/BBSControl/src/bbs-controller.cc
index 8be8f1ab49d152962f3d9f33e00719dc10407232..e645c69d679ba9097e6ca7f28867af38e7c8de4e 100644
--- a/CEP/Calibration/BBSControl/src/bbs-controller.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-controller.cc
@@ -34,6 +34,7 @@
 #include <LMWCommon/VdsDesc.h>
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
+#include <Common/SystemUtil.h>
 #include <casa/BasicMath/Math.h>
 #include <unistd.h>
 
@@ -61,7 +62,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args);
 // Application entry point.
 int main(int argc, char *argv[])
 {
-  const char* progName = basename(argv[0]);
+  const string progName = LOFAR::basename(argv[0]);
   INIT_LOGGER(progName);
   LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));
 
diff --git a/CEP/Calibration/BBSControl/src/bbs-reducer.cc b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
index 5a0cdc5d546da2c6bf529c83009d6d19319222c4..a38379cdda114180a7b3dd54d215d29f5d9f7194 100644
--- a/CEP/Calibration/BBSControl/src/bbs-reducer.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
@@ -36,6 +36,7 @@
 #include <BBSKernel/ParmManager.h>
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
+#include <Common/SystemUtil.h>
 
 #ifdef HAVE_PQXX
 #include <BBSControl/CalSession.h>
@@ -58,7 +59,7 @@ int runDistributed(const ParameterSet &options,
 // Application entry point.
 int main(int argc, char *argv[])
 {
-  const char* progName = basename(argv[0]);
+  const string progName = LOFAR::basename(argv[0]);
   INIT_LOGGER(progName);
   LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));
 
diff --git a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
index 0da96b432f8fc53abe071275b7c3806d1cc92406..23ecf40d253a9d163178d71e479db60dd545e49d 100644
--- a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
@@ -22,6 +22,7 @@
 //# $Id:
 
 #include <lofar_config.h>
+#include <Common/SystemUtil.h>
 #include <BBSControl/Package__Version.h>
 #include <BBSControl/CalSession.h>
 #include <BBSControl/CommandHandlerEstimator.h>
@@ -39,7 +40,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args);
 // Application entry point.
 int main(int argc, char *argv[])
 {
-  const char* progName = basename(argv[0]);
+  const string progName = LOFAR::basename(argv[0]);
   INIT_LOGGER(progName);
   LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));