diff --git a/CEP/Calibration/BBSControl/include/BBSControl/CMakeLists.txt b/CEP/Calibration/BBSControl/include/BBSControl/CMakeLists.txt
index d412d43f47397cbb217eb2d53b92d4f4cccd5898..a5b5553a6e061705861a9d20dec0a1b02408205e 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/CMakeLists.txt
+++ b/CEP/Calibration/BBSControl/include/BBSControl/CMakeLists.txt
@@ -62,6 +62,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt b/CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt
index c37ab0190aa806923e91416c12e53831297993c6..7bde594d55ed28de5374897b052fd94cf6ee454a 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt
@@ -89,6 +89,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
index 2b29af087870da1af4357eb172df5d2b2d1c5b93..b6c2295c0e6b35c2c642c4576fe62f2764c3d67b 100644
--- a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
+++ b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
@@ -41,6 +41,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/Imager/MWControl/include/MWControl/CMakeLists.txt b/CEP/Imager/MWControl/include/MWControl/CMakeLists.txt
index 04f83650621c66de74ff935f29cf00fe7f3dcf18..1adba3b44bd3235561a3c6ffc4bf81b7a692617c 100644
--- a/CEP/Imager/MWControl/include/MWControl/CMakeLists.txt
+++ b/CEP/Imager/MWControl/include/MWControl/CMakeLists.txt
@@ -39,6 +39,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/Imager/MWImager/include/MWImager/CMakeLists.txt b/CEP/Imager/MWImager/include/MWImager/CMakeLists.txt
index 028ca6fd56d3184715baa3a0e89febe37b9c7a15..48418428a7129970bb62ae3f75395dfd9755d2fa 100644
--- a/CEP/Imager/MWImager/include/MWImager/CMakeLists.txt
+++ b/CEP/Imager/MWImager/include/MWImager/CMakeLists.txt
@@ -31,5 +31,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
 
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/MS/include/MS/CMakeLists.txt b/CEP/MS/include/MS/CMakeLists.txt
index 68cc7248120e75d07c190b46b9d5377650a8620c..dd49b965675f0f7b0d002fc5ea1d101025c03cd1 100644
--- a/CEP/MS/include/MS/CMakeLists.txt
+++ b/CEP/MS/include/MS/CMakeLists.txt
@@ -30,6 +30,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/MWCommon/include/MWCommon/CMakeLists.txt b/CEP/MWCommon/include/MWCommon/CMakeLists.txt
index 997b281e0efe8db8cbe2f9705f708f0dd3b2161d..713c1338163c615efe73c7e6cab6be224c3508dc 100644
--- a/CEP/MWCommon/include/MWCommon/CMakeLists.txt
+++ b/CEP/MWCommon/include/MWCommon/CMakeLists.txt
@@ -63,6 +63,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/CEP/ParmDB/include/ParmDB/CMakeLists.txt b/CEP/ParmDB/include/ParmDB/CMakeLists.txt
index 9b6865b42d6d6b9a229478eb4b28c58b7f38298a..a647d1b3467ff4f3313d6e5dce543efad1bf3273 100644
--- a/CEP/ParmDB/include/ParmDB/CMakeLists.txt
+++ b/CEP/ParmDB/include/ParmDB/CMakeLists.txt
@@ -49,6 +49,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/ACC/ALC/CMakeLists.txt b/LCS/ACC/ALC/CMakeLists.txt
index f869f45a6848f4eda54cb60393dafd7e00a356f2..4961c604d0b19900d6f096da34fb28c9260d6586 100644
--- a/LCS/ACC/ALC/CMakeLists.txt
+++ b/LCS/ACC/ALC/CMakeLists.txt
@@ -49,4 +49,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/ALC)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/ACC/ALC/include/ALC/CMakeLists.txt b/LCS/ACC/ALC/include/ALC/CMakeLists.txt
index 26b99f2b019429db20a50d7c69c01eebc7da3432..28c7cddcff46b98470c5467d66168ae84c52d9c7 100644
--- a/LCS/ACC/ALC/include/ALC/CMakeLists.txt
+++ b/LCS/ACC/ALC/include/ALC/CMakeLists.txt
@@ -18,6 +18,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/ACC/PLC/CMakeLists.txt b/LCS/ACC/PLC/CMakeLists.txt
index 3dd0e020e8f136c29232b1e69bc3349cb6e3dec5..c21a2c516cc6c2405351a24289ac536148f9c651 100644
--- a/LCS/ACC/PLC/CMakeLists.txt
+++ b/LCS/ACC/PLC/CMakeLists.txt
@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/PLC)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/ACC/PLC/include/PLC/CMakeLists.txt b/LCS/ACC/PLC/include/PLC/CMakeLists.txt
index cee0455bc68e6461097e53748d486fa4cf26a173..29b1ad8d8d7223b3cea465eb1bdf752820bc2431 100644
--- a/LCS/ACC/PLC/include/PLC/CMakeLists.txt
+++ b/LCS/ACC/PLC/include/PLC/CMakeLists.txt
@@ -18,6 +18,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/AMC/AMCBase/CMakeLists.txt b/LCS/AMC/AMCBase/CMakeLists.txt
index 85fe831fce6d09def0a0bb953aa9667220ae4d95..6929520b094c00f812044d1447756abcc85ff081 100644
--- a/LCS/AMC/AMCBase/CMakeLists.txt
+++ b/LCS/AMC/AMCBase/CMakeLists.txt
@@ -49,4 +49,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/AMCBase)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/AMC/AMCBase/include/AMCBase/CMakeLists.txt b/LCS/AMC/AMCBase/include/AMCBase/CMakeLists.txt
index c8f0030cce28d984828e7a4520b46cf5da30119f..da466436418289ed799e7c2d6a83e4da400797a8 100644
--- a/LCS/AMC/AMCBase/include/AMCBase/CMakeLists.txt
+++ b/LCS/AMC/AMCBase/include/AMCBase/CMakeLists.txt
@@ -23,6 +23,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/AMC/AMCImpl/CMakeLists.txt b/LCS/AMC/AMCImpl/CMakeLists.txt
index cdef6d2e3484f55a91a95787490cc91c9d77b7f0..9b7ec92e10c0f8bdad61121190e2db7f0780b78f 100644
--- a/LCS/AMC/AMCImpl/CMakeLists.txt
+++ b/LCS/AMC/AMCImpl/CMakeLists.txt
@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/AMCImpl)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/AMC/AMCImpl/include/AMCImpl/CMakeLists.txt b/LCS/AMC/AMCImpl/include/AMCImpl/CMakeLists.txt
index 7de4a4c413c6ab2bdbf19fc6d877bf2c2eca6cf1..afc2fe98ab776d14111bb399fda4617e58e5f4d3 100644
--- a/LCS/AMC/AMCImpl/include/AMCImpl/CMakeLists.txt
+++ b/LCS/AMC/AMCImpl/include/AMCImpl/CMakeLists.txt
@@ -12,6 +12,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/ApplCommon/CMakeLists.txt b/LCS/ApplCommon/CMakeLists.txt
index ea0fc9c210dea69ee606587d10494f846e3c91e6..2189d9333f86a33bc242df2b3de662917052ae23 100644
--- a/LCS/ApplCommon/CMakeLists.txt
+++ b/LCS/ApplCommon/CMakeLists.txt
@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/ApplCommon)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/ApplCommon/include/ApplCommon/CMakeLists.txt b/LCS/ApplCommon/include/ApplCommon/CMakeLists.txt
index 29086202ee43a9191b923ebaaba2013eece19b14..47218e61de3c987d880413d305465511fe5e72aa 100644
--- a/LCS/ApplCommon/include/ApplCommon/CMakeLists.txt
+++ b/LCS/ApplCommon/include/ApplCommon/CMakeLists.txt
@@ -30,7 +30,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/ApplCommon/src/CMakeLists.txt b/LCS/ApplCommon/src/CMakeLists.txt
index ea8e296a83516e9ab4f927ac86514bc685d0306f..fdd4bedf6c957780c2e22ba483a0c42b8fb074ec 100644
--- a/LCS/ApplCommon/src/CMakeLists.txt
+++ b/LCS/ApplCommon/src/CMakeLists.txt
@@ -22,7 +22,9 @@ include(LofarPackageVersion)
 
 lofar_add_library(applcommon
   Package__Version.cc
-  Observation.cc)
+  Observation.cc
+  StationConfig.cc
+  StationInfo.cc)
 
 lofar_add_bin_program(versionapplcommon versionapplcommon.cc)
 
diff --git a/LCS/Blob/CMakeLists.txt b/LCS/Blob/CMakeLists.txt
index d27fe9d80165657265566fdd71b2c15a44f72bb8..83fdcd193d6be1744b1280f8f431c585ec69d280 100644
--- a/LCS/Blob/CMakeLists.txt
+++ b/LCS/Blob/CMakeLists.txt
@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/Blob)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/Blob/include/Blob/CMakeLists.txt b/LCS/Blob/include/Blob/CMakeLists.txt
index 365c9969330432ffb644bc4c6c162e6261858b1d..1436b08cf9919e892907befcfd32496f5a4865ee 100644
--- a/LCS/Blob/include/Blob/CMakeLists.txt
+++ b/LCS/Blob/include/Blob/CMakeLists.txt
@@ -60,7 +60,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/Common/CMakeLists.txt b/LCS/Common/CMakeLists.txt
index 6cd2c472115ecb633f38ee174ca61d832a9ce181..2024e08eec891e9b448d6de63009059a436386f9 100644
--- a/LCS/Common/CMakeLists.txt
+++ b/LCS/Common/CMakeLists.txt
@@ -51,4 +51,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/Common)
 add_subdirectory(src)
-add_subdirectory(test)# EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/Stream/CMakeLists.txt b/LCS/Stream/CMakeLists.txt
index 1d7553454c2fb171bfbc8168545957662f2298c0..340ec4a4eddbfcd285ac6a5f08a998df3483b643 100644
--- a/LCS/Stream/CMakeLists.txt
+++ b/LCS/Stream/CMakeLists.txt
@@ -49,4 +49,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/Stream)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/Stream/include/Stream/CMakeLists.txt b/LCS/Stream/include/Stream/CMakeLists.txt
index f2adc7b283c6940b759651a51b4662c5f61ef889..1a922d0c812025eda8262c2190073b600d82b681 100644
--- a/LCS/Stream/include/Stream/CMakeLists.txt
+++ b/LCS/Stream/include/Stream/CMakeLists.txt
@@ -15,6 +15,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/LCS/Transport/CMakeLists.txt b/LCS/Transport/CMakeLists.txt
index 998288d493c33712f098daadf51dd93444515f70..3e091de4aa04ec4d0ba4de464bbc9323b1bc7ab8 100644
--- a/LCS/Transport/CMakeLists.txt
+++ b/LCS/Transport/CMakeLists.txt
@@ -44,4 +44,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/Transport)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/LCS/Transport/include/Transport/CMakeLists.txt b/LCS/Transport/include/Transport/CMakeLists.txt
index 284b7d7fb8891da4b27437e28874637cd94191e2..19dd3646f3fff5ada84f735769604832b236e9da 100644
--- a/LCS/Transport/include/Transport/CMakeLists.txt
+++ b/LCS/Transport/include/Transport/CMakeLists.txt
@@ -25,6 +25,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/MAC/APL/APLCommon/CMakeLists.txt b/MAC/APL/APLCommon/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..21e135cfd1de82c615d53aeabbb951579383102c
--- /dev/null
+++ b/MAC/APL/APLCommon/CMakeLists.txt
@@ -0,0 +1,53 @@
+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+cmake_minimum_required(VERSION 2.6)
+
+## ---------------------------------------------------------------------------
+## Preamble: set compilers
+## ---------------------------------------------------------------------------
+include(LofarInit)
+
+## ---------------------------------------------------------------------------
+## Project characteristics
+## ---------------------------------------------------------------------------
+project(APLCommon)
+include(LofarGeneral)
+
+include(LofarAddPackage)
+lofar_add_package(${PROJECT_NAME} 3.1 DEPENDS Common ApplCommon GCFTM MACIO)
+
+## ---------------------------------------------------------------------------
+## External packages
+## ---------------------------------------------------------------------------
+include(LofarFindPackage)
+lofar_find_package(Boost REQUIRED COMPONENTS regex)
+
+## ---------------------------------------------------------------------------
+## Generate configuration header file.
+## ---------------------------------------------------------------------------
+include(LofarConfig)
+
+## ---------------------------------------------------------------------------
+## Subdirectories
+## ---------------------------------------------------------------------------
+add_subdirectory(include/APL/APLCommon)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/CMakeLists.txt b/MAC/APL/APLCommon/include/APL/APLCommon/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8dc817e674d135408b496f6289b75bd3e4955889
--- /dev/null
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/CMakeLists.txt
@@ -0,0 +1,47 @@
+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# List of header files that will be installed.
+set(inst_HEADERS
+  Package__Version.h
+  AntennaMapper.h
+  APLCommonExceptions.h
+  APL_Defines.h
+  APLUtilities.h
+  bitsetUtil.tcc
+  ControllerDefines.h
+  CTState.h
+  ControllerInfo.h
+  ControllerAdmin.h
+  ChildControl.h
+  ParentControl.h)
+
+# Add definition of include path suffix definition, because the header files
+# reside in a non-standard location. 
+set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX APL/APLCommon
+  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/APL/APLCommon)
+
+# Install header files.
+install(FILES ${inst_HEADERS} DESTINATION include/APL/APLCommon)
diff --git a/MAC/APL/APLCommon/src/CMakeLists.txt b/MAC/APL/APLCommon/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b11fc3979a4e9c4490eb5f00db0443f41c7aaaf2
--- /dev/null
+++ b/MAC/APL/APLCommon/src/CMakeLists.txt
@@ -0,0 +1,57 @@
+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+include(LofarPackageVersion)
+
+# Extra preprocessor definitions
+#add_definitions(-DBOOST_DISABLE_THREADS)
+
+# Add MAC protocols (generates a .ph and .cc file from a .prot file)
+include(MACAddProtocol)
+mac_add_protocol(Controller_Protocol "${MACIO_SOURCE_DIR}/autogen")
+mac_add_protocol(StartDaemon_Protocol "${MACIO_SOURCE_DIR}/autogen")
+
+# Add current source directory to -I path. This is needed because APLCOMMON uses
+# angle brackets for internal header files, instead of quotes.
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+# Add the directory where the generated C++ headers are stored to the -I path.
+#include_directories(${CMAKE_BINARY_DIR}/include/MAC)
+
+lofar_add_library(aplcommon
+  Package__Version.cc
+  StartDaemon_Protocol.cc
+  Controller_Protocol.cc
+  APLUtilities.cc
+  ControllerDefines.cc
+  CTState.cc
+  ControllerAdmin.cc
+  ChildControl.cc
+  ParentControl.cc)
+
+lofar_add_bin_program(versionaplcommon versionaplcommon.cc)
+
+install(PROGRAMS
+  swlevel
+  DESTINATION bin)
+
+install(FILES
+  swlevel.conf
+  DESTINATION etc)
diff --git a/MAC/APL/APLCommon/test/CMakeLists.txt b/MAC/APL/APLCommon/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a37137e376abfbb302606e704480a82c95b28d91
--- /dev/null
+++ b/MAC/APL/APLCommon/test/CMakeLists.txt
@@ -0,0 +1,34 @@
+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+include(LofarCTest)
+
+# Add the directory where the generated C++ headers are stored to the -I path.
+include_directories(${PROJECT_BINARY_DIR}/src)
+
+lofar_add_test(tControllerDefines tControllerDefines.cc)
+lofar_add_test(tAPLUtilities tAPLUtilities.cc)
+lofar_add_test(tbitsetUtil tbitsetUtil.cc)
+lofar_add_test(tOutOfBand tOutOfBand.cc)
+lofar_add_test(tAntennaMapper tAntennaMapper.cc)
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/ResourceAllocatorTest.log_prop.in
+  ${CMAKE_CURRENT_BINARY_DIR}/ResourceAllocatorTest.log_prop)
diff --git a/MAC/APL/CMakeLists.txt b/MAC/APL/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4302ea4f1dde78e8ad36b6fbd909b6f2ef22a873
--- /dev/null
+++ b/MAC/APL/CMakeLists.txt
@@ -0,0 +1,60 @@
+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+cmake_minimum_required(VERSION 2.6)
+
+## ---------------------------------------------------------------------------
+## Preamble: set compilers
+## ---------------------------------------------------------------------------
+include(LofarInit)
+
+## ---------------------------------------------------------------------------
+## Project characteristics
+## ---------------------------------------------------------------------------
+project(APL)
+include(LofarGeneral)
+
+## ---------------------------------------------------------------------------
+## Create directory APL in the binary include directory; it will hold symbolic
+## links to the different subcomponents of APL.
+## ---------------------------------------------------------------------------
+execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
+  ${CMAKE_BINARY_DIR}/include/APL)
+
+## ---------------------------------------------------------------------------
+## Subdirectories
+## ---------------------------------------------------------------------------
+lofar_add_subdirectory(APLCommon)
+lofar_add_subdirectory(CEPCU)
+lofar_add_subdirectory(CUDaemons)
+lofar_add_subdirectory(CURTDBDaemons)
+lofar_add_subdirectory(MainCU)
+lofar_add_subdirectory(PAC)
+lofar_add_subdirectory(PIC)
+lofar_add_subdirectory(RTCCommon)
+lofar_add_subdirectory(RTDBCommon)
+lofar_add_subdirectory(StationCU)
+lofar_add_subdirectory(TestCtlr)
+
+## ---------------------------------------------------------------------------
+## Generate configuration header file.
+## ---------------------------------------------------------------------------
+include(LofarConfig)
+
diff --git a/MAC/CMakeLists.txt b/MAC/CMakeLists.txt
index ddc1307d8fc9fc517cd0b4785ce9d64942f75371..fe22b5b745419b7c8380cd4479f0cc0eb52e0827 100644
--- a/MAC/CMakeLists.txt
+++ b/MAC/CMakeLists.txt
@@ -36,7 +36,7 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 lofar_add_subdirectory(MACIO)       # MAC I/O related functions
 lofar_add_subdirectory(GCF)         # Generic Control Framework
-#lofar_add_subdirectory(APL)
+lofar_add_subdirectory(APL)
 #lofar_add_subdirectory(Deployment)
 
 ## ---------------------------------------------------------------------------
diff --git a/RTCP/Interface/include/Interface/CMakeLists.txt b/RTCP/Interface/include/Interface/CMakeLists.txt
index 3a48c378beb4eeb3d8e3c482955bc0e57f433d4a..371993b91238f0b5e00b1d895eebc745666ebb1e 100644
--- a/RTCP/Interface/include/Interface/CMakeLists.txt
+++ b/RTCP/Interface/include/Interface/CMakeLists.txt
@@ -31,7 +31,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/RTCP/Storage/include/Storage/CMakeLists.txt b/RTCP/Storage/include/Storage/CMakeLists.txt
index 188b611a7c0836506a81e1bd15938e7fc9457af2..6af6e94c6d9aa9cb56b5ae6d1ae5fe2cb398fa5e 100644
--- a/RTCP/Storage/include/Storage/CMakeLists.txt
+++ b/RTCP/Storage/include/Storage/CMakeLists.txt
@@ -9,7 +9,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/SAS/OTB/jOTDB2/include/jOTDB2/CMakeLists.txt b/SAS/OTB/jOTDB2/include/jOTDB2/CMakeLists.txt
index e25d0f24a445d15f250413a69c5a74f9a64551a4..e17d26a3b6098e435c10e8ae376c9e2be9dcf064 100644
--- a/SAS/OTB/jOTDB2/include/jOTDB2/CMakeLists.txt
+++ b/SAS/OTB/jOTDB2/include/jOTDB2/CMakeLists.txt
@@ -38,6 +38,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
diff --git a/SAS/OTDB/include/OTDB/CMakeLists.txt b/SAS/OTDB/include/OTDB/CMakeLists.txt
index 05a89867584cada334889fba3fece40279c0becb..4682e330f3c0f9df29b8693b50790b912264e579 100644
--- a/SAS/OTDB/include/OTDB/CMakeLists.txt
+++ b/SAS/OTDB/include/OTDB/CMakeLists.txt
@@ -47,6 +47,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")