build: Refactor CMake modules

This moves the CMake build logic out of the source tree and splits it
up into a more modular form. The tests now have a CMakeLists.txt file
in their respective source directory.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

27 files changed, 27 insertions, 1084 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 54fdd8ab..00000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory(lib)
-add_subdirectory(ipcpd)
-add_subdirectory(irmd)
-add_subdirectory(tools)
diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
deleted file mode 100644
index b3b049e3..00000000
--- a/src/ipcpd/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-set(CONNMGR_RCV_TIMEOUT 1000 CACHE STRING
-  "Timeout for the connection manager to wait for OCEP info (ms).")
-set(IPCP_DEBUG_LOCAL FALSE CACHE BOOL
-  "Use PID as address for local debugging")
-set(IPCP_QOS_CUBE_BE_PRIO 50 CACHE STRING
-  "Priority for best effort QoS cube (0-99)")
-set(IPCP_QOS_CUBE_VIDEO_PRIO 90 CACHE STRING
-  "Priority for video QoS cube (0-99)")
-set(IPCP_QOS_CUBE_VOICE_PRIO 99 CACHE STRING
-  "Priority for voice QoS cube (0-99)")
-set(IPCP_MIN_THREADS 4 CACHE STRING
-  "Minimum number of worker threads in the IPCP")
-set(IPCP_ADD_THREADS 4 CACHE STRING
-  "Number of extra threads to start when an IPCP faces thread starvation")
-set(IPCP_SCHED_THR_MUL 2 CACHE STRING
-  "Number of scheduler threads per QoS cube")
-set(DISABLE_CORE_LOCK TRUE CACHE BOOL
-  "Disable locking performance threads to a core")
-set(DHT_ENROLL_SLACK 50 CACHE STRING
-  "DHT enrollment waiting time (0-999, ms)")
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   set(IPCP_LINUX_TIMERSLACK_NS 1000 CACHE STRING
-       "Slack value for high resolution timers on Linux systems.")
-endif ()
-
-if ((IPCP_QOS_CUBE_BE_PRIO LESS 0) OR (IPCP_QOS_CUBE_BE_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for best effort QoS cube")
-endif ()
-
-if ((IPCP_QOS_CUBE_VIDEO_PRIO LESS 0) OR (IPCP_QOS_CUBE_VIDEO_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for video QoS cube")
-endif ()
-
-if ((IPCP_QOS_CUBE_VOICE_PRIO LESS 0) OR (IPCP_QOS_CUBE_VOICE_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for voice QoS cube")
-endif ()
-
-if ((DHT_ENROLL_SLACK LESS 0) OR (DHT_ENROLL_SLACK GREATER 999))
-  message(FATAL_ERROR "Invalid DHT slack value")
-endif ()
-
-
-set(IPCP_SOURCES
-  # Add source files here
-  ${CMAKE_CURRENT_SOURCE_DIR}/ipcp.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/shim-data.c
-  )
-
-set (COMMON_SOURCES
-   ${CMAKE_CURRENT_SOURCE_DIR}/common/enroll.c
-  )
-
-add_subdirectory(local)
-add_subdirectory(eth)
-add_subdirectory(udp)
-add_subdirectory(unicast)
-add_subdirectory(broadcast)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
diff --git a/src/ipcpd/broadcast/CMakeLists.txt b/src/ipcpd/broadcast/CMakeLists.txt
deleted file mode 100644
index d85f335e..00000000
--- a/src/ipcpd/broadcast/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(IPCP_BROADCAST_TARGET ipcpd-broadcast CACHE INTERNAL "")
-set(IPCP_BROADCAST_MPL 60 CACHE STRING
-    "Default maximum packet lifetime for the broadcast IPCP, in seconds")
-
-set(SOURCE_FILES
-  # Add source files here
-  connmgr.c
-  dt.c
-  main.c
-  )
-
-add_executable(ipcpd-broadcast ${SOURCE_FILES} ${IPCP_SOURCES} ${COMMON_SOURCES}
-  ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-broadcast LINK_PUBLIC ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-broadcast -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-broadcast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
diff --git a/src/ipcpd/config.h.in b/src/ipcpd/config.h.in
index d2af6440..61506196 100644
--- a/src/ipcpd/config.h.in
+++ b/src/ipcpd/config.h.in
@@ -47,7 +47,6 @@
 #define QOS_PRIO_VOICE      @IPCP_QOS_CUBE_VOICE_PRIO@
 #define IPCP_SCHED_THR_MUL  @IPCP_SCHED_THR_MUL@
 #define PFT_SIZE            @PFT_SIZE@
-#define DHT_ENROLL_SLACK    @DHT_ENROLL_SLACK@
 #define IPCP_UNICAST_MPL    @IPCP_UNICAST_MPL@
 #define CONNMGR_RCV_TIMEOUT @CONNMGR_RCV_TIMEOUT@
 
diff --git a/src/ipcpd/eth/CMakeLists.txt b/src/ipcpd/eth/CMakeLists.txt
deleted file mode 100644
index 44299a59..00000000
--- a/src/ipcpd/eth/CMakeLists.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-find_path(NETMAP_C_INCLUDE_DIR
-  net/netmap_user.h
-  HINTS /usr/include /usr/local/include)
-
-mark_as_advanced(NETMAP_C_INCLUDE_DIR)
-
-# Check for raw sockets
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(DISABLE_RAW_SOCKETS FALSE CACHE BOOL
-    "Disable raw socket support for Ethernet IPCPs")
-  if (NOT DISABLE_RAW_SOCKETS)
-    message(STATUS "Raw socket support for Ethernet IPCPs enabled")
-    set(HAVE_RAW_SOCKETS TRUE PARENT_SCOPE)
-    set(HAVE_RAW_SOCKETS TRUE)
-    set(HAVE_ETH TRUE)
-  else ()
-    message(STATUS "Raw socket support for Ethernet IPCPs disabled by user")
-    unset(HAVE_RAW_SOCKETS PARENT_SCOPE)
-    unset(HAVE_RAW_SOCKETS)
-  endif ()
-endif ()
-
-# Check for BPF
-if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  find_path(BPF_C_INCLUDE_DIR
-    net/bpf.h
-    HINTS /usr/include /usr/local/include)
-
-  mark_as_advanced(BPF_C_INCLUDE_DIR)
-
-  if (BPF_C_INCLUDE_DIR)
-    set(DISABLE_BPF FALSE CACHE BOOL
-      "Disable Berkeley Packet Filter support for Ethernet IPCPs")
-    if (NOT DISABLE_BPF)
-      message(STATUS "Berkeley Packet Filter support "
-        "for Ethernet IPCPs enabled")
-      set(HAVE_BPF TRUE PARENT_SCOPE)
-      set(HAVE_BPF TRUE)
-      set(HAVE_ETH TRUE)
-    else ()
-      message(STATUS "Berkeley Packet Filter support "
-        "for Ethernet IPCPs disabled by user")
-      unset(HAVE_BPF PARENT_SCOPE)
-      unset(HAVE_BPF)
-    endif ()
-  endif ()
-endif ()
-
-# Check for netmap exclusively
-if (NOT HAVE_RAW_SOCKETS AND NOT HAVE_BPF AND NETMAP_C_INCLUDE_DIR)
-  set(DISABLE_NETMAP FALSE CACHE BOOL
-    "Disable netmap support for ETH IPCPs")
-  if (NOT DISABLE_NETMAP)
-    message(STATUS "Netmap support for Ethernet IPCPs enabled")
-    set(HAVE_NETMAP TRUE PARENT_SCOPE)
-    set(HAVE_ETH TRUE)
-  else ()
-    message(STATUS "Netmap support for Ethernet IPCPs disabled by user")
-    unset(HAVE_NETMAP PARENT_SCOPE)
-  endif ()
-endif ()
-
-if (HAVE_ETH)
-  message(STATUS "Supported raw packet API found, building eth-llc and eth-dix")
-
-  set(IPCP_ETH_RD_THR 1 CACHE STRING
-    "Number of reader threads in Ethernet IPCP")
-  set(IPCP_ETH_WR_THR 1 CACHE STRING
-    "Number of writer threads in Ethernet IPCP")
-  set(IPCP_ETH_QDISC_BYPASS false CACHE BOOL
-    "Bypass the Qdisc in the kernel when using raw sockets")
-  set(IPCP_ETH_LO_MTU 1500 CACHE STRING
-    "Restrict Ethernet MTU over loopback interfaces")
-  set(IPCP_ETH_MPL 100 CACHE STRING
-    "Default maximum packet lifetime for the Ethernet IPCPs, in ms")
-
-  set(ETH_LLC_SOURCES
-    # Add source files here
-    llc.c
-  )
-
-  set(ETH_DIX_SOURCES
-    # Add source files here
-    dix.c
-  )
-
-  set(IPCP_ETH_LLC_TARGET ipcpd-eth-llc CACHE INTERNAL "")
-  set(IPCP_ETH_DIX_TARGET ipcpd-eth-dix CACHE INTERNAL "")
-
-  add_executable(ipcpd-eth-llc ${ETH_LLC_SOURCES} ${IPCP_SOURCES})
-  add_executable(ipcpd-eth-dix ${ETH_DIX_SOURCES} ${IPCP_SOURCES})
-
-  if (HAVE_BPF AND NOT APPLE)
-    target_include_directories(ipcpd-eth-llc PUBLIC ${BPF_C_INCLUDE_DIR})
-    target_include_directories(ipcpd-eth-dix PUBLIC ${BPF_C_INCLUDE_DIR})
-  endif ()
-
-  if (HAVE_NETMAP AND NOT APPLE)
-    set_target_properties(ipcpd-eth-llc PROPERTIES
-        COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-    set_target_properties(ipcpd-eth-dix PROPERTIES
-        COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-    target_include_directories(ipcpd-eth-llc PUBLIC
-      ${NETMAP_C_INCLUDE_DIR})
-    target_include_directories(ipcpd-eth-dix PUBLIC
-      ${NETMAP_C_INCLUDE_DIR})
-  endif ()
-
-  target_link_libraries(ipcpd-eth-llc LINK_PUBLIC ouroboros-dev)
-  target_link_libraries(ipcpd-eth-dix LINK_PUBLIC ouroboros-dev)
-
-  include(AddCompileFlags)
-  if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-    add_compile_flags(ipcpd-eth-llc -DCONFIG_OUROBOROS_DEBUG)
-    add_compile_flags(ipcpd-eth-dix -DCONFIG_OUROBOROS_DEBUG)
-  endif ()
-
-  install(TARGETS ipcpd-eth-llc ipcpd-eth-dix RUNTIME DESTINATION
-    ${CMAKE_INSTALL_SBINDIR})
-endif ()
diff --git a/src/ipcpd/local/CMakeLists.txt b/src/ipcpd/local/CMakeLists.txt
deleted file mode 100644
index f661e9ae..00000000
--- a/src/ipcpd/local/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(IPCP_LOCAL_TARGET ipcpd-local CACHE INTERNAL "")
-set(IPCP_LOCAL_MPL 100 CACHE STRING
-    "Default maximum packet lifetime for the Ethernet IPCPs, in ms")
-
-set(LOCAL_SOURCES
-  # Add source files here
-  ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
-
-add_executable(ipcpd-local ${LOCAL_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-local LINK_PUBLIC ouroboros-common ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-local -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-local RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-# Enable once ipcp-local has tests
-# if(BUILD_TESTS)
-#   add_subdirectory(tests)
-# endif ()
diff --git a/src/ipcpd/udp/CMakeLists.txt b/src/ipcpd/udp/CMakeLists.txt
deleted file mode 100644
index 27e32094..00000000
--- a/src/ipcpd/udp/CMakeLists.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(IPCP_UDP4_TARGET ipcpd-udp4 CACHE INTERNAL "")
-set(IPCP_UDP6_TARGET ipcpd-udp6 CACHE INTERNAL "")
-
-set(UDP4_SOURCES
-  # Add source files here
-  udp4.c
-)
-
-set(UDP6_SOURCES
-  # Add source files here
-  udp6.c
-)
-
-add_executable(ipcpd-udp4 ${UDP4_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-udp4 LINK_PUBLIC ouroboros-dev)
-
-add_executable(ipcpd-udp6 ${UDP6_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-udp6 LINK_PUBLIC ouroboros-dev)
-
-
-# Find the nsupdate executable
-find_program(NSUPDATE_EXECUTABLE
-  NAMES nsupdate
-  DOC "The nsupdate tool that enables DDNS")
-
-# Find the nslookup executable
-find_program(NSLOOKUP_EXECUTABLE
-  NAMES nslookup
-  DOC "The nslookup tool that resolves DNS names")
-
-mark_as_advanced(NSLOOKUP_EXECUTABLE NSUPDATE_EXECUTABLE)
-
-if (NSLOOKUP_EXECUTABLE AND NSUPDATE_EXECUTABLE)
-  set(DISABLE_DDNS FALSE CACHE BOOL "Disable DDNS support")
-  if (NOT DISABLE_DNS)
-    message(STATUS "DDNS support enabled")
-    set(HAVE_DDNS TRUE CACHE INTERNAL "")
-  else ()
-    message(STATUS "DDNS support disabled by user")
-    unset(HAVE_DDNS CACHE)
-  endif ()
-else ()
-  if (NSLOOKUP_EXECUTABLE)
-    message(STATUS "Install nsupdate to enable DDNS support")
-  elseif (NSUPDATE_EXECUTABLE)
-    message(STATUS "Install nslookup to enable DDNS support")
-  else ()
-    message(STATUS "Install nslookup and nsupdate to enable DDNS support")
-  endif ()
-endif ()
-
-set(IPCP_UDP_RD_THR 3 CACHE STRING
-  "Number of reader threads in UDP IPCPs")
-set(IPCP_UDP_WR_THR 3 CACHE STRING
-  "Number of writer threads in UDP IPCPs")
-set(IPCP_UDP_MPL 5000 CACHE STRING
-    "Default maximum packet lifetime for the UDP IPCPs, in ms")
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-udp4 -DCONFIG_OUROBOROS_DEBUG)
-  add_compile_flags(ipcpd-udp6 -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-udp4 RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-install(TARGETS ipcpd-udp6 RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
diff --git a/src/ipcpd/unicast/CMakeLists.txt b/src/ipcpd/unicast/CMakeLists.txt
deleted file mode 100644
index a9155353..00000000
--- a/src/ipcpd/unicast/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(IPCP_UNICAST_TARGET ipcpd-unicast CACHE INTERNAL "")
-set(IPCP_UNICAST_MPL 10000 CACHE STRING
-    "Default maximum packet lifetime for the unicast IPCP, in ms")
-set(DEBUG_PROTO_DHT FALSE CACHE BOOL
-  "Add DHT protocol message output to debug logging")
-set(DEBUG_PROTO_LS FALSE CACHE BOOL
-  "Add link state protocol message output to debug logging")
-
-protobuf_generate_c(DHT_PROTO_SRCS DHT_PROTO_HDRS dir/dht.proto)
-
-math(EXPR PFT_EXPR "1 << 12")
-set(PFT_SIZE ${PFT_EXPR} CACHE STRING
-  "Size of the PDU forwarding table")
-if (HAVE_FUSE)
-  set(IPCP_FLOW_STATS TRUE CACHE BOOL
-    "Enable flow statistics tracking in IPCP")
-    if (IPCP_FLOW_STATS)
-       message(STATUS "IPCP flow statistics enabled")
-    else ()
-       message(STATUS "IPCP flow statistics disabled")
-    endif ()
-endif ()
-
-set(IPCP_UNICAST_SOURCE_FILES
-  # Add source files here
-  addr-auth.c
-  ca.c
-  connmgr.c
-  dir.c
-  dt.c
-  fa.c
-  main.c
-  pff.c
-  routing.c
-  psched.c
-  # Add policies last
-  addr-auth/flat.c
-  ca/mb-ecn.c
-  ca/nop.c
-  dir/dht.c
-  pff/simple.c
-  pff/alternate.c
-  pff/multipath.c
-  pff/pft.c
-  routing/link-state.c
-  routing/graph.c
-  )
-
-add_executable(ipcpd-unicast ${IPCP_UNICAST_SOURCE_FILES} ${IPCP_SOURCES} ${COMMON_SOURCES}
-  ${DHT_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-unicast LINK_PUBLIC ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-unicast -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-unicast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-if(BUILD_TESTS)
-  add_subdirectory(pff/tests)
-  add_subdirectory(routing/tests)
-  add_subdirectory(dir/tests)
-endif ()
diff --git a/src/ipcpd/unicast/dir/tests/CMakeLists.txt b/src/ipcpd/unicast/dir/tests/CMakeLists.txt
index f5f5a74c..bc0f26a4 100644
--- a/src/ipcpd/unicast/dir/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/dir/tests/CMakeLists.txt
@@ -12,6 +12,12 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+# Add includes for ipcp and unicast module files
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd/unicast)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd/unicast)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 
diff --git a/src/ipcpd/unicast/pff/tests/CMakeLists.txt b/src/ipcpd/unicast/pff/tests/CMakeLists.txt
index d224dac0..923d1b27 100644
--- a/src/ipcpd/unicast/pff/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/pff/tests/CMakeLists.txt
@@ -12,6 +12,10 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+# Add includes for ipcp module files
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 
@@ -34,5 +38,5 @@ endif()
 
 foreach (test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(${test_name} ${C_TEST_PATH}/${PARENT_DIR}_test ${test_name})
+  add_test(${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${PARENT_DIR}_test ${test_name})
 endforeach (test)
diff --git a/src/ipcpd/unicast/routing/tests/CMakeLists.txt b/src/ipcpd/unicast/routing/tests/CMakeLists.txt
index 7b549995..fb9c92a6 100644
--- a/src/ipcpd/unicast/routing/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/routing/tests/CMakeLists.txt
@@ -12,6 +12,9 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
deleted file mode 100644
index a9584b85..00000000
--- a/src/irmd/CMakeLists.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(OUROBOROS_CONFIG_DIR /etc/ouroboros CACHE STRING
-  "Configuration directory (should be absolute)")
-
-find_library(LIBTOML_LIBRARIES toml QUIET)
-if (LIBTOML_LIBRARIES)
-  set(DISABLE_CONFIGFILE FALSE CACHE BOOL
-    "Disable configuration file support")
-  if (NOT DISABLE_CONFIGFILE)
-    set(OUROBOROS_CONFIG_FILE irmd.conf CACHE STRING
-      "Name of the IRMd configuration file")
-    set(HAVE_TOML TRUE)
-    message(STATUS "Found TOML C99 library: " ${LIBTOML_LIBRARIES})
-    message(STATUS "Configuration file support enabled")
-    message(STATUS "Configuration directory: ${OUROBOROS_CONFIG_DIR}")
-    set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
-    configure_file("${CMAKE_SOURCE_DIR}/irmd.conf.in"
-      "${CMAKE_BINARY_DIR}/${OUROBOROS_CONFIG_FILE}.example" @ONLY)
-    install(FILES "${CMAKE_BINARY_DIR}/${OUROBOROS_CONFIG_FILE}.example"
-      DESTINATION "${OUROBOROS_CONFIG_DIR}")
-    install(CODE "
-      if (NOT EXISTS \"${OUROBOROS_CONFIG_DIR}/${OUROBOROS_CONFIG_FILE}\")
-        file(WRITE \"${OUROBOROS_CONFIG_DIR}/${OUROBOROS_CONFIG_FILE}\" \"\")
-      endif()
-    ")
-    unset(INSTALL_DIR)
-    find_path(LIBTOML_INCLUDE toml.h)
-    mark_as_advanced(LIBTOML_LIBRARIES LIBTOML_INCLUDE)
-  else ()
-    message(STATUS "Configuration file support disabled by user")
-    unset(OUROBOROS_CONFIG_FILE CACHE)
-    set(HAVE_TOML FALSE)
-  endif ()
-else ()
-  message(STATUS "Install tomlc99 for config file support")
-  message(STATUS "     https://github.com/cktan/tomlc99")
-  set(LIBTOML_LIBRARIES "")
-  unset(DISABLE_CONFIGFILE CACHE)
-  unset(HAVE_TOML)
-endif ()
-
-set(OUROBOROS_SECURITY_DIR "${OUROBOROS_CONFIG_DIR}/security" CACHE STRING
-  "Security directory holding authentication information")
-set(OUROBOROS_CA_CRT_DIR "${OUROBOROS_SECURITY_DIR}/cacert" CACHE STRING
-  "Directory holding trusted CA certificates")
-set(OUROBOROS_SRV_CRT_DIR "${OUROBOROS_SECURITY_DIR}/server" CACHE STRING
-  "Directory holding trusted CA certificates")
-set(OUROBOROS_CLI_CRT_DIR "${OUROBOROS_SECURITY_DIR}/client" CACHE STRING
-  "Directory holding trusted CA certificates")
-set(OUROBOROS_UNTRUSTED_DIR "${OUROBOROS_SECURITY_DIR}/untrusted" CACHE STRING
-  "Directory holding untrusted intermediate certificates")
-
-set(IRMD_REQ_ARR_TIMEOUT 1000 CACHE STRING
-  "Timeout for an application to respond to a new flow (ms)")
-set(BOOTSTRAP_TIMEOUT 5000 CACHE STRING
-  "Timeout for an IPCP to bootstrap (ms)")
-set(ENROLL_TIMEOUT 20000 CACHE STRING
-  "Timeout for an IPCP to enroll (ms)")
-set(REG_TIMEOUT 20000 CACHE STRING
-  "Timeout for registering a name (ms)")
-set(QUERY_TIMEOUT 200 CACHE STRING
-  "Timeout to query a name with an IPCP (ms)")
-set(CONNECT_TIMEOUT 20000 CACHE STRING
-  "Timeout to connect an IPCP to another IPCP (ms)")
-set(FLOW_ALLOC_TIMEOUT 20000 CACHE STRING
-  "Timeout for a flow allocation response (ms)")
-set(IRMD_MIN_THREADS 8 CACHE STRING
-  "Minimum number of worker threads in the IRMd")
-set(IRMD_ADD_THREADS 8 CACHE STRING
-  "Number of extra threads to start when the IRMD faces thread starvation")
-set(IRMD_PKILL_TIMEOUT 30 CACHE STRING
-  "Number of seconds to wait before sending SIGKILL to subprocesses on exit")
-set(IRMD_KILL_ALL_PROCESSES TRUE CACHE BOOL
-  "Kill all processes on exit")
-set(DEBUG_PROTO_OAP FALSE CACHE BOOL
-  "Add Flow allocation protocol message output to IRMd debug logging")
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
-
-set(SOURCE_FILES
-  # Add source files here
-  ipcp.c
-  configfile.c
-  main.c
-  oap.c
-  reg/flow.c
-  reg/ipcp.c
-  reg/proc.c
-  reg/prog.c
-  reg/name.c
-  reg/reg.c
-  )
-
-add_executable (irmd ${SOURCE_FILES})
-
-target_link_libraries (irmd LINK_PUBLIC ouroboros-common
-  ${LIBTOML_LIBRARIES})
-
-if (HAVE_TOML)
-  target_include_directories(irmd PUBLIC ${LIBTOML_INCLUDE})
-endif ()
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(irmd -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-add_subdirectory(reg)
-if(BUILD_TESTS)
-  add_subdirectory(tests)
-endif ()
diff --git a/src/irmd/reg/CMakeLists.txt b/src/irmd/reg/CMakeLists.txt
deleted file mode 100644
index d3844908..00000000
--- a/src/irmd/reg/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-if(BUILD_TESTS)
-  add_subdirectory(tests)
-endif ()
diff --git a/src/irmd/reg/tests/CMakeLists.txt b/src/irmd/reg/tests/CMakeLists.txt
index d2907a93..eb7a1765 100644
--- a/src/irmd/reg/tests/CMakeLists.txt
+++ b/src/irmd/reg/tests/CMakeLists.txt
@@ -1,6 +1,14 @@
 get_filename_component(tmp ".." ABSOLUTE)
 get_filename_component(src_folder "${tmp}" NAME)
 
+# Set include directories for tests
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/irmd)
+include_directories(${CMAKE_BINARY_DIR}/src/irmd)
+
 create_test_sourcelist(${src_folder}_tests test_suite.c
   # Add new tests here
   flow_test.c
@@ -29,5 +37,5 @@ endif()
 
 foreach(test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(irmd/reg/${test_name} ${C_TEST_PATH}/${src_folder}_test ${test_name})
+  add_test(irmd/reg/${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${src_folder}_test ${test_name})
 endforeach(test)
diff --git a/src/irmd/tests/CMakeLists.txt b/src/irmd/tests/CMakeLists.txt
index 5bef0064..a255ca00 100644
--- a/src/irmd/tests/CMakeLists.txt
+++ b/src/irmd/tests/CMakeLists.txt
@@ -8,7 +8,8 @@ create_test_sourcelist(${src_folder}_tests test_suite.c
 )
 
 add_executable(${src_folder}_test ${${src_folder}_tests})
-target_link_libraries(${src_folder}_test ouroboros-common)
+target_link_libraries(${src_folder}_test ouroboros-irm)
+target_include_directories(${src_folder}_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_dependencies(build_tests ${src_folder}_test)
 
@@ -21,7 +22,7 @@ endif()
 
 foreach(test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(irmd/${test_name} ${C_TEST_PATH}/${src_folder}_test ${test_name})
+  add_test(irmd/${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${src_folder}_test ${test_name})
 endforeach(test)
 
 set_property(TEST irmd/oap_test PROPERTY SKIP_RETURN_CODE 1)
diff --git a/src/irmd/tests/oap_test.c b/src/irmd/tests/oap_test.c
index 4e7fb2d1..a5f9c706 100644
--- a/src/irmd/tests/oap_test.c
+++ b/src/irmd/tests/oap_test.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#include "config.h"
-
 #include "oap.c"
 
 #include <ouroboros/random.h>
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
deleted file mode 100644
index 14e89976..00000000
--- a/src/lib/CMakeLists.txt
+++ /dev/null
@@ -1,338 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-protobuf_generate_c(MODEL_PROTO_SRCS MODEL_PROTO_HDRS
-  pb/model.proto)
-protobuf_generate_c(IPCP_CONFIG_PROTO_SRCS IPCP_CONFIG_PROTO_HDRS
-  pb/ipcp_config.proto)
-protobuf_generate_c(ENROLL_PROTO_SRCS ENROLL_PROTO_HDRS
-  pb/enroll.proto)
-protobuf_generate_c(CEP_PROTO_SRCS CEP_PROTO_HDRS
-  pb/cep.proto)
-protobuf_generate_c(IRM_PROTO_SRCS IRM_PROTO_HDRS
-  pb/irm.proto)
-protobuf_generate_c(IPCP_PROTO_SRCS IPCP_PROTO_HDRS
-  pb/ipcp.proto)
-
-if (NOT APPLE)
-  find_library(LIBRT_LIBRARIES rt)
-  if (NOT LIBRT_LIBRARIES)
-    message(FATAL_ERROR "Could not find librt")
-  endif ()
-else ()
-  set(LIBRT_LIBRARIES "")
-endif ()
-
-find_library(LIBPTHREAD_LIBRARIES pthread)
-if (NOT LIBPTHREAD_LIBRARIES)
-  message(FATAL_ERROR "Could not find libpthread")
-endif ()
-
-include(CheckSymbolExists)
-list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200809L)
-list(APPEND CMAKE_REQUIRED_DEFINITIONS -D__XSI_VISIBLE=500)
-list(APPEND CMAKE_REQUIRED_LIBRARIES pthread)
-check_symbol_exists(pthread_mutexattr_setrobust pthread.h HAVE_ROBUST_MUTEX)
-
-if (HAVE_ROBUST_MUTEX)
-  set(DISABLE_ROBUST_MUTEXES FALSE CACHE BOOL "Disable robust mutex support")
-  if (NOT DISABLE_ROBUST_MUTEXES)
-    message(STATUS "Robust mutex support enabled")
-    set(HAVE_ROBUST_MUTEX TRUE)
-  else ()
-    message(STATUS "Robust mutex support disabled by user")
-    unset(HAVE_ROBUST_MUTEX)
-  endif ()
-else()
-  message(STATUS "Robust mutex support not available")
-  unset(HAVE_ROBUST_MUTEX)
-endif ()
-
-find_library(FUSE_LIBRARIES fuse QUIET)
-if (FUSE_LIBRARIES)
-  #FIXME: Check for version >= 2.6
-  set(DISABLE_FUSE FALSE CACHE BOOL "Disable FUSE support")
-  if (NOT DISABLE_FUSE)
-    message(STATUS "FUSE support enabled")
-    set(FUSE_PREFIX "/tmp/ouroboros" CACHE STRING
-    "Mountpoint for RIB filesystem")
-    set(HAVE_FUSE TRUE CACHE INTERNAL "")
-  else ()
-    message(STATUS "FUSE support disabled by user")
-    unset(HAVE_FUSE CACHE)
-  endif ()
-else ()
-  message(STATUS "Install FUSE version > 2.6 to enable RIB access")
-endif ()
-
-if (NOT HAVE_FUSE)
-  set(FUSE_LIBRARIES "")
-  set(FUSE_INCLUDE_DIR "")
-endif ()
-
-mark_as_advanced(FUSE_LIBRARIES)
-
-find_library(LIBGCRYPT_LIBRARIES gcrypt QUIET)
-if (LIBGCRYPT_LIBRARIES)
-  find_path(LIBGCRYPT_INCLUDE_DIR gcrypt.h
-            HINTS /usr/include /usr/local/include)
-  if (LIBGCRYPT_INCLUDE_DIR)
-    file(STRINGS ${LIBGCRYPT_INCLUDE_DIR}/gcrypt.h GCSTR
-      REGEX "^#define GCRYPT_VERSION ")
-    string(REGEX REPLACE "^#define GCRYPT_VERSION \"(.*)\".*$" "\\1"
-      GCVER "${GCSTR}")
-    if (NOT GCVER VERSION_LESS "1.7.0")
-      set(DISABLE_LIBGCRYPT FALSE CACHE BOOL "Disable libgcrypt support")
-      if (NOT DISABLE_LIBGCRYPT)
-        message(STATUS "libgcrypt support enabled")
-        set(HAVE_LIBGCRYPT TRUE CACHE INTERNAL "")
-      else ()
-        message(STATUS "libgcrypt support disabled by user")
-        unset(HAVE_LIBGCRYPT CACHE)
-      endif()
-    else ()
-      message(STATUS "Install version >= \"1.7.0\" to enable libgcrypt support "
-                     "(found version \"${GCVER}\")")
-    endif()
-  endif ()
-endif ()
-
-if (NOT HAVE_LIBGCRYPT)
-  set(LIBGCRYPT_LIBRARIES "")
-  set(LIBGCRYPT_INCLUDE_DIR "")
-endif ()
-
-find_package(OpenSSL QUIET)
-if (OPENSSL_FOUND)
-  set(HAVE_OPENSSL_RNG TRUE)
-  if (OPENSSL_VERSION VERSION_LESS "1.1.0")
-    message(STATUS "Install version >= \"1.1.0\" to enable OpenSSL support "
-                   "(found version \"${OPENSSL_VERSION}\")")
-  else ()
-    set(DISABLE_OPENSSL FALSE CACHE BOOL "Disable OpenSSL support")
-    if (NOT DISABLE_OPENSSL)
-      message(STATUS "OpenSSL support enabled")
-      set(HAVE_OPENSSL TRUE CACHE INTERNAL "")
-    else()
-      message(STATUS "OpenSSL support disabled")
-      unset(HAVE_OPENSSL)
-    endif()
-  endif ()
-  set(OPENSSL_SOURCES crypt/openssl.c)
-else()
-  message(STATUS "Install openSSL version >= \"1.1.0\" to enable OpenSSL support")
-  unset(HAVE_OPENSSL_RNG)
-  unset(HAVE_OPENSSL)
-  set(OPENSSL_INCLUDE_DIR "")
-  set(OPENSSL_LIBRARIES "")
-  set(OPENSSL_CRYPTO_LIBRARY "")
-  set(OPENSSL_SOURCES "")
-endif ()
-
-if (APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-  set(SYS_RND_HDR "")
-else ()
-  find_path(SYS_RND_HDR sys/random.h PATH /usr/include/ /usr/local/include/)
-  if (SYS_RND_HDR)
-    message(STATUS "Found sys/random.h in ${SYS_RND_HDR}")
-    set(HAVE_SYS_RANDOM TRUE)
-  else ()
-    set(SYS_RND_HDR "")
-    unset(HAVE_SYS_RANDOM)
-  endif ()
-endif()
-
-if (NOT ((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR APPLE OR
-  HAVE_SYS_RANDOM OR HAVE_OPENSSL_RNG OR HAVE_LIBGCRYPT))
-  message(FATAL_ERROR "No secure random generator found, "
-                      "please install libgcrypt (> 1.7.0) or OpenSSL")
-endif ()
-
-mark_as_advanced(LIBRT_LIBRARIES LIBPTHREAD_LIBRARIES
-  LIBGCRYPT_LIBRARIES OPENSSL_LIBRARIES OPENSSL_CRYPTO_LIBRARY
-  SYS_RND_INCLUDE_DIR LIBGCRYPT_INCLUDE_DIR SYS_RND_HDR)
-
-set(SHM_BUFFER_SIZE 16384 CACHE STRING
-    "Number of blocks in packet buffer, must be a power of 2")
-set(SHM_RBUFF_SIZE 1024 CACHE STRING
-    "Number of blocks in rbuff buffer, must be a power of 2")
-set(SYS_MAX_FLOWS 10240 CACHE STRING
-  "Maximum number of total flows for this system")
-set(PROG_MAX_FLOWS 4096 CACHE STRING
-  "Maximum number of flows in an application")
-set(PROG_RES_FDS 64 CACHE STRING
-  "Number of reserved flow descriptors per application")
-set(PROG_MAX_FQUEUES 32 CACHE STRING
-  "Maximum number of flow sets per application")
-set(DU_BUFF_HEADSPACE 256 CACHE STRING
-  "Bytes of headspace to reserve for future headers")
-set(DU_BUFF_TAILSPACE 32 CACHE STRING
-  "Bytes of tailspace to reserve for future tails")
-if (NOT APPLE)
-  set(PTHREAD_COND_CLOCK "CLOCK_MONOTONIC" CACHE STRING
-    "Clock to use for condition variable timing")
-else ()
-  set(PTHREAD_COND_CLOCK "CLOCK_REALTIME" CACHE INTERNAL
-    "Clock to use for condition variable timing")
-endif ()
-set(SOCKET_TIMEOUT 500 CACHE STRING
-  "Default timeout for responses from IPCPs (ms)")
-set(SHM_PREFIX "ouroboros" CACHE STRING
-  "String to prepend to POSIX shared memory filenames")
-set(SHM_RBUFF_PREFIX "/${SHM_PREFIX}.rbuff." CACHE INTERNAL
-  "Prefix for rbuff POSIX shared memory filenames")
-set(SHM_LOCKFILE_NAME "/${SHM_PREFIX}.lockfile" CACHE INTERNAL
-  "Filename for the POSIX shared memory lockfile")
-set(SHM_FLOW_SET_PREFIX "/${SHM_PREFIX}.set." CACHE INTERNAL
-  "Prefix for the POSIX shared memory flow set")
-set(SHM_RDRB_NAME "/${SHM_PREFIX}.rdrb" CACHE INTERNAL
-  "Name for the main POSIX shared memory buffer")
-set(SHM_RDRB_BLOCK_SIZE "sysconf(_SC_PAGESIZE)" CACHE STRING
-  "Packet buffer block size, multiple of pagesize for performance")
-set(SHM_RDRB_MULTI_BLOCK TRUE CACHE BOOL
-  "Packet buffer multiblock packet support")
-set(SHM_RBUFF_LOCKLESS FALSE CACHE BOOL
-  "Enable shared memory lockless rbuff support")
-set(QOS_DISABLE_CRC TRUE CACHE BOOL
-  "Ignores ber setting on all QoS cubes")
-set(DELTA_T_MPL 60 CACHE STRING
-  "Maximum packet lifetime (s)")
-set(DELTA_T_ACK 10 CACHE STRING
-  "Maximum time to acknowledge a packet (s)")
-set(DELTA_T_RTX 120 CACHE STRING
-  "Maximum time to retransmit a packet (s)")
-set(FRCT_REORDER_QUEUE_SIZE 256 CACHE STRING
-  "Size of the reordering queue, must be a power of 2")
-set(FRCT_START_WINDOW 64 CACHE STRING
-  "Start window, must be a power of 2")
-set(FRCT_LINUX_RTT_ESTIMATOR TRUE CACHE BOOL
-  "Use Linux RTT estimator formula instead of the TCP RFC formula")
-set(FRCT_RTO_MDEV_MULTIPLIER 2 CACHE STRING
-  "Multiplier for deviation term in the RTO: RTO = sRTT + (mdev << X)")
-set(FRCT_RTO_INC_FACTOR 0 CACHE STRING
-  "Divisor for RTO increase after timeout: RTO += RTX >> X, 0: Karn/Partridge")
-set(FRCT_RTO_MIN 250 CACHE STRING
-  "Minimum Retransmission Timeout (RTO) for FRCT (us)")
-set(FRCT_TICK_TIME 5000 CACHE STRING
-  "Tick time for FRCT activity (retransmission, acknowledgments) (us)")
-set(RXM_BUFFER_ON_HEAP FALSE CACHE BOOL
-  "Store packets for retransmission on the heap instead of in packet buffer")
-set(RXM_BLOCKING TRUE CACHE BOOL
-  "Use blocking writes for retransmission")
-set(RXM_MIN_RESOLUTION 20 CACHE STRING
-  "Minimum retransmission delay (ns), as a power to 2")
-set(RXM_WHEEL_MULTIPLIER 4 CACHE STRING
-  "Factor for retransmission wheel levels as a power to 2")
-set(RXM_WHEEL_LEVELS 3 CACHE STRING
-  "Number of levels in the retransmission wheel")
-set(RXM_WHEEL_SLOTS_PER_LEVEL 256 CACHE STRING
-  "Number of slots per level in the retransmission wheel, must be a power of 2")
-set(ACK_WHEEL_SLOTS 256 CACHE STRING
-  "Number of slots in the acknowledgment wheel, must be a power of 2")
-set(ACK_WHEEL_RESOLUTION 18 CACHE STRING
-  "Minimum acknowledgment delay (ns), as a power to 2")
-set(TPM_DEBUG_REPORT_INTERVAL 0 CACHE STRING
-  "Interval at wich the TPM will report long running threads (s), 0 disables")
-set(TPM_DEBUG_ABORT_TIMEOUT 0 CACHE STRING
-  "TPM abort process after a thread reaches this timeout (s), 0 disables")
-
-if (HAVE_FUSE)
-  set(PROC_FLOW_STATS TRUE CACHE BOOL
-    "Enable flow statistics tracking for application flows")
-    if (PROC_FLOW_STATS)
-       message(STATUS "Application flow statistics enabled")
-    else ()
-       message(STATUS "Application flow statistics disabled")
-    endif ()
-endif ()
-
-set(SOURCE_FILES_DEV
-  # Add source files here
-  cep.c
-  dev.c
-  )
-
-set(SOURCE_FILES_IRM
-  irm.c
-)
-
-set(SOURCE_FILES_COMMON
-  bitmap.c
-  btree.c
-  crc32.c
-  crypt.c
-  hash.c
-  list.c
-  lockfile.c
-  logs.c
-  md5.c
-  notifier.c
-  protobuf.c
-  qoscube.c
-  random.c
-  rib.c
-  serdes-irm.c
-  serdes-oep.c
-  sha3.c
-  shm_flow_set.c
-  shm_rbuff.c
-  shm_rdrbuff.c
-  sockets.c
-  tpm.c
-  utils.c
-)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
-
-add_library(ouroboros-common SHARED ${SOURCE_FILES_COMMON} ${IRM_PROTO_SRCS}
-  ${IPCP_PROTO_SRCS} ${IPCP_CONFIG_PROTO_SRCS} ${MODEL_PROTO_SRCS}
-  ${ENROLL_PROTO_SRCS} ${OPENSSL_SOURCES})
-
-add_library(ouroboros-dev SHARED ${SOURCE_FILES_DEV} ${CEP_PROTO_SRCS})
-
-add_library(ouroboros-irm SHARED ${SOURCE_FILES_IRM})
-
-set_target_properties(ouroboros-common PROPERTIES
-  VERSION ${PACKAGE_VERSION}
-  SOVERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR})
-set_target_properties(ouroboros-dev PROPERTIES
-  VERSION ${PACKAGE_VERSION}
-  SOVERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR})
-set_target_properties(ouroboros-irm PROPERTIES
-  VERSION ${PACKAGE_VERSION}
-  SOVERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR})
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ouroboros-common -DCONFIG_OUROBOROS_DEBUG)
-  add_compile_flags(ouroboros-dev -DCONFIG_OUROBOROS_DEBUG)
-  add_compile_flags(ouroboros-irm -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-target_link_libraries(ouroboros-common ${LIBRT_LIBRARIES}
-  ${LIBPTHREAD_LIBRARIES} ${PROTOBUF_C_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}
-  ${LIBGCRYPT_LIBRARIES} ${FUSE_LIBRARIES})
-
-target_link_libraries(ouroboros-dev ouroboros-common)
-target_link_libraries(ouroboros-irm ouroboros-common)
-
-install(TARGETS ouroboros-common LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(TARGETS ouroboros-dev LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(TARGETS ouroboros-irm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-target_include_directories(ouroboros-common PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
-  ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
-
-target_include_directories(ouroboros-dev PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
-  ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
-
-target_include_directories(ouroboros-irm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
-  ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
-
-if(BUILD_TESTS)
-  add_subdirectory(tests)
-endif ()
diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index 752d9065..8af8e9dd 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 
 foreach (test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(${test_name} ${C_TEST_PATH}/${PARENT_DIR}_test ${test_name})
+  add_test(${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${PARENT_DIR}_test ${test_name})
 endforeach (test)
 
 set_property(TEST auth_test PROPERTY SKIP_RETURN_CODE 1)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
deleted file mode 100644
index 7c40d9ae..00000000
--- a/src/tools/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-add_subdirectory(irm)
-add_subdirectory(ocbr)
-add_subdirectory(oecho)
-add_subdirectory(obc)
-add_subdirectory(oping)
-add_subdirectory(operf)
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_subdirectory(ovpn)
-endif ()
diff --git a/src/tools/irm/CMakeLists.txt b/src/tools/irm/CMakeLists.txt
deleted file mode 100644
index 3c599300..00000000
--- a/src/tools/irm/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(TOOLS_IRM_SOURCE_FILES
-  # Add source files here
-  irm.c
-  irm_bind_program.c
-  irm_bind_process.c
-  irm_bind_ipcp.c
-  irm_ipcp_create.c
-  irm_ipcp_destroy.c
-  irm_ipcp_bootstrap.c
-  irm_ipcp_enroll.c
-  irm_ipcp_list.c
-  irm_ipcp_connect.c
-  irm_ipcp_disconnect.c
-  irm_unbind_program.c
-  irm_unbind_process.c
-  irm_unbind_ipcp.c
-  irm_unbind.c
-  irm_bind.c
-  irm_ipcp.c
-  irm_name.c
-  irm_name_create.c
-  irm_name_destroy.c
-  irm_name_reg.c
-  irm_name_unreg.c
-  irm_name_list.c
-  irm_utils.c
-  )
-
-add_executable(irm ${TOOLS_IRM_SOURCE_FILES})
-
-target_link_libraries(irm LINK_PUBLIC ouroboros-irm)
-
-install(TARGETS irm RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-# enable when we have tests
-# if(BUILD_TESTS)
-#   add_subdirectory(tests)
-# endif ()
diff --git a/src/tools/obc/CMakeLists.txt b/src/tools/obc/CMakeLists.txt
deleted file mode 100644
index db5e999b..00000000
--- a/src/tools/obc/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(SOURCE_FILES
-  # Add source files here
-  obc.c
-  )
-
-add_executable(obc ${SOURCE_FILES})
-
-target_link_libraries(obc LINK_PUBLIC ouroboros-dev)
-
-install(TARGETS obc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/ocbr/CMakeLists.txt b/src/tools/ocbr/CMakeLists.txt
deleted file mode 100644
index f7ba66cd..00000000
--- a/src/tools/ocbr/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-
-set(SOURCE_FILES
-  # Add source files here
-  ocbr.c
-  )
-
-add_executable(ocbr ${SOURCE_FILES})
-
-target_link_libraries(ocbr LINK_PUBLIC ouroboros-dev)
-
-install(TARGETS ocbr RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/oecho/CMakeLists.txt b/src/tools/oecho/CMakeLists.txt
deleted file mode 100644
index 50a66138..00000000
--- a/src/tools/oecho/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(SOURCE_FILES
-  # Add source files here
-  oecho.c
-  )
-
-add_executable(oecho ${SOURCE_FILES})
-
-target_link_libraries(oecho LINK_PUBLIC ouroboros-dev)
-
-install(TARGETS oecho RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/operf/CMakeLists.txt b/src/tools/operf/CMakeLists.txt
deleted file mode 100644
index b6faf04e..00000000
--- a/src/tools/operf/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-
-find_library(LIBM_LIBRARIES m)
-if(NOT LIBM_LIBRARIES)
-  message(FATAL_ERROR "libm not found")
-endif()
-
-set(SOURCE_FILES
-  # Add source files here
-  operf.c
-  )
-
-add_executable(operf ${SOURCE_FILES})
-
-target_link_libraries(operf LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros-dev)
-
-install(TARGETS operf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/operf/operf.c b/src/tools/operf/operf.c
index 10896bd5..3263d3bf 100644
--- a/src/tools/operf/operf.c
+++ b/src/tools/operf/operf.c
@@ -54,7 +54,6 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
-#include <math.h>
 #include <errno.h>
 #include <float.h>
 
diff --git a/src/tools/oping/CMakeLists.txt b/src/tools/oping/CMakeLists.txt
deleted file mode 100644
index 31a4f961..00000000
--- a/src/tools/oping/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-
-find_library(LIBM_LIBRARIES m)
-if(NOT LIBM_LIBRARIES)
-  message(FATAL_ERROR "libm not found")
-endif()
-
-mark_as_advanced(LIBM_LIBRARIES)
-
-set(SOURCE_FILES
-  # Add source files here
-  oping.c
-  )
-
-add_executable(oping ${SOURCE_FILES})
-
-target_link_libraries(oping LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros-dev)
-
-install(TARGETS oping RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/ovpn/CMakeLists.txt b/src/tools/ovpn/CMakeLists.txt
deleted file mode 100644
index f3a2cac8..00000000
--- a/src/tools/ovpn/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-
-set(SOURCE_FILES
-  # Add source files here
-  ovpn.c
-  )
-
-add_executable(ovpn ${SOURCE_FILES})
-
-target_link_libraries(ovpn LINK_PUBLIC ouroboros-dev)
-
-install(TARGETS ovpn RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})