diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
index f4e9dd23ef10ce6eb5254ea93e5b38f79f557cfa..8cb03029635547dfbe2b180d26a0146257b76c14 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <tables/Tables/TableIter.h>
#include "BandpassCorrector.h"
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
index e57ae8923d411843a8f20bdd6d76068f9cc0fe42..61d40df97022078d190ac60058b64b0f98a3eeb2 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
@@ -19,9 +19,7 @@
***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
index 74c09737fa4d3e16d0dad0ff4c9c8d9102e82a2d..cf4fc1090d1776be8eac39e7a2b253c8512de639 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
index ecf6e7a222197d342b658b6f114eed7f63516954..ee5f53f1ae5af96faae3d26f89de6e9d28d17531 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
@@ -147,4 +148,4 @@ namespace LOFAR
}
//===============>>> MS_File <<<===============
}; // namespace CS1
-}; // namespace LOFAR
\ No newline at end of file
+}; // namespace LOFAR
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
index 6fad83e8312311023d4d1a15860229bdf837075e..30ea0d2b1fc4a67d0f3c27b880792e5afe32a151 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <scimath/Mathematics/StatAcc.h>
#include <scimath/Mathematics/StatAcc.cc>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
index 6434a9a894707114e30a1aff3669d724abc9d137..47e03d6e280145e015bd3749a9b5c306f6ed7563 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
@@ -19,9 +19,7 @@
***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
index 965eb56e338d335e14e69f376320b674c9da4de5..8c08d434072f08cbf514604bc610b42cb8997aa8 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
index 8199ca7885bbef477996e25fc839e311b1cbe35d..b5060f1c2dfb475755fe8f1ded94181bfda51453 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc b/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
index 7ea02509383487a152f6b0dfe5bf3105f498d072..a94533abfe3d7d1b8302e2c62b83758a40ecee42 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <tables/Tables/TableIter.h>
#include "DFTImager.h"
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc b/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
index a59e5ab2e329c164e18f19b845d76b8fc5522494..88fc2fea2078fcbd81e04260fe5a5aefcd836869 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include<casa/aips.h>
#include <images/Images/PagedImage.h>
#include <images/Images/ImageInfo.h>
@@ -417,4 +418,4 @@ void testArrayofImagesAndAssignmentOperator()
*/
//===============>>> Image_File <<<===============
}
-}
\ No newline at end of file
+}
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc b/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
index 445f23511e47f9c1a47804946ef9a9c2f3f9dc0d..bb5721a1a597828e2be1f72b3fe08693949601f3 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
@@ -19,9 +19,7 @@
***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc b/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
index 5336aa90bebe8c0c72a645df81acb465db166111..b138f46e619d416cbbb933fca560dfa760860e88 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc b/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
index 60272f89f4624ebdf4e01999d687881ecfa03314..e31f1df31600abf70d40ce8f3bdf4448bdbaee73 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
index 34c8f00efa47d26cc42ef4808eb10de2ad26b496..077c7bf87945c776f7c591b41233cd34120364b8 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
//#include <casa/Arrays/ArrayLogical.h>
#include "DataSquasher.h"
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
index a70c2b572818902829a38a3e24ca16e97bd8c3e6..1c27d2870ada3fa334370186150e541c586685a1 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
index 1ac0ce202518d7498c54e9201031d638426321b4..9ebd27f5134000a968f28974e8166609d7574f9c 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
@@ -18,10 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
index 9c068f23580bd44afdcdd129bef297161b0abb41..521796ab23b455c1398d51341eba6f68e7483234 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <string>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc b/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
index a32d7e89fb8bfa37c5b1355d1d069e5f6eebf6cf..db8569c8c6b27f50e7caf3b5051fa681e981c792 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <tables/Tables/TableIter.h>
#include "ComplexMedianFlagger.h"
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
index de83a958788a1202f7cc2d306a6ac437ed91fbe9..e1915910818b0d148d7eaf4a432047164f758525 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
@@ -19,9 +19,7 @@
***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
index 6a25c656d763f3fab16990799c08fc05177c195c..f03bfdd2378052026248e63162db6b561c91ee40 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
index e2bf6e9830c5c6f660bae02eeaee4c672e18b417..ddb935788f2707069d761493dc413fb539884645 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
@@ -17,6 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc b/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
index f578afd287fe58f0b85830b9c4d126426eafd42a..9ca299a8a7cd80317e034b00a1bee79f48df6dde 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <tables/Tables/TableIter.h>
#include "ComplexMedianFlagger2.h"
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc b/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
index d215eea77e2071203b0e848d94106ae5474b685b..c60e12edde6515e2fcdc01feae5cfebaf7e922dd 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
@@ -18,10 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
index 0ed081245ccf70551a12a004fdd5b24592ca32a5..7c6d940658b5157c1a460d4418abd2cebce5599f 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc b/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
index 3f32c23bff66bdb84cd25d2f9706b1d48e097c66..e823789d0a884f8337da456c7f1e8cee314c5cb4 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
index de83a958788a1202f7cc2d306a6ac437ed91fbe9..e1915910818b0d148d7eaf4a432047164f758525 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
@@ -19,9 +19,7 @@
***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
index bb389bfb3dd4de1c9e89299774799eed44e9bcb3..0a0e0a78b0b36dc477cc1f7bb008501a1c7f90ab 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <iostream>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
index cbde4f5c52e73ccfcd30be33747a8714025e3fb3..8c3defc344c4ffcf2de198dc74f67ac8f3fac4e2 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <tables/Tables.h>
#include <tables/Tables/TableIter.h>
#include "FrequencyFlagger.h"
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
index 92968f9ed91fc0314c56ac3d9911a1b7b5548452..1ffbe9771c304d8500b838991c4c4ba8146cba4b 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <casa/BasicMath/Math.h>
#include <casa/Arrays.h>
//#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
index caf8a9bb7c54dd5eba983c6418d84b797ec5b181..88d3a5d198951ece0defbe4e6f2a4178c81ccaed 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
@@ -18,10 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
index 4521d66a8bd390d270e0b4c4021910a470454f6e..973c5a7601542eceede6f3338f6fca3d4d468a91 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include <iostream>
#include <cstdlib>
#include <string>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
index 84df489698789b92cd9262b1b645ec519f48d09a..0c44ea25185a2df34876904cc8db4c384564e540 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <lofar_config.h>
#include "SPWCombine.h"
namespace LOFAR
{
diff --git a/Appl/CEP/CS1/lofarconf.in b/Appl/CEP/CS1/lofarconf.in
index 3d60d2ef36eaaef14d660bb5907eb5f1e6692e79..098729e5bcd31121c5579add60a4bb6140cfdbaa 100644
--- a/Appl/CEP/CS1/lofarconf.in
+++ b/Appl/CEP/CS1/lofarconf.in
@@ -1,7 +1,19 @@
CS1_BGLProc #short description
-CS1_DelayCompensation #short description
-CS1_Flagger #short description
-CS1_Imager #short description
-CS1_IONProc #short description
+CS1_DFTImager #Discrete Fourrier Transform Imager
+CS1_FrequencyFlagger #Frequency Flagger
+CS1_Flagger #Complex Median Imager
+CS1_Flagger2 #Complex Median Imager 2
+CS1_Imager #Wrapper for AIPS++ imager
+CS1_BinningFlagger # Binning Flagger
+CS1_pp_lib # postprocessing library and (I)DPPP
+#CS1_Run #short description
+CS1_BandpassCorrector # bandpass corrector
+#CS1_BBS #wrapper for BBS
+CS1_DataSquasher #Data compression
+CS1_ObserverTool # tool for observers
+CS1_SPWCombine #SPW combiner
+#CS1_IONProc #short description
+#CS1_Generator #short description
CS1_Interface #short description
CS1_Storage #short description
+#CS1_Tools #short description