diff -Naur enblend-enfuse-4.2/src/dynamic_loader/CMakeLists.txt enblend-enfuse-4.2.new/src/dynamic_loader/CMakeLists.txt
--- enblend-enfuse-4.2/src/dynamic_loader/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
+++ enblend-enfuse-4.2.new/src/dynamic_loader/CMakeLists.txt	2016-04-27 10:12:20.701143343 +0200
@@ -0,0 +1,25 @@
+set(DYNAMIC_LOADER_FILES
+    dynamic_loader.h dynamic_loader.cc
+    dynamic_loader_implementation.h dynamic_loader_implementation.cc
+)
+
+if(WIN32)
+  list(APPEND DYNAMIC_LOADER_FILES win32_implementation.h win32_implementation.cc)
+  add_definitions(-DWIN32_DL)
+  set(DL_DEFINITION -DWIN32_DL PARENT_SCOPE)
+else()
+  if(HAVE_DL)
+    list(APPEND DYNAMIC_LOADER_FILES posix_implementation.h posix_implementation.cc)
+    add_definitions(-DPOSIX_DL)
+    set(DL_DEFINITION -DPOSIX_DL PARENT_SCOPE)
+  else()
+    if(HAVE_GMODULE)
+      list(APPEND DYNAMIC_LOADER_FILES gmodule_implementation.h gmodule_implementation.cc)
+      add_definitions(-DGMODULE_DL)
+      set(DL_DEFINITION -DGMODULE_DL PARENT_SCOPE)
+    else()
+      list(APPEND DYNAMIC_LOADER_FILES null_implementation.h)
+    endif()
+  endif()
+endif()
+add_library(dynamic_loader STATIC ${DYNAMIC_LOADER_FILES})
diff -Naur enblend-enfuse-4.2/src/layer_selection/CMakeLists.txt enblend-enfuse-4.2.new/src/layer_selection/CMakeLists.txt
--- enblend-enfuse-4.2/src/layer_selection/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
+++ enblend-enfuse-4.2.new/src/layer_selection/CMakeLists.txt	2016-04-27 10:12:55.735622446 +0200
@@ -0,0 +1,5 @@
+set(LAYER_SELECTION_FILES
+    info.h info.cc layer_selection.h layer_selection.cc
+    selector.h selector.cc
+)
+add_library(layer_selection STATIC ${LAYER_SELECTION_FILES})