diff --git a/CMakeLists.txt b/CMakeLists.txt
index 563f583d..8ec3ebf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,13 @@ project(lwIP)
 
 # Example lwIP application
 set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
 
 set (LWIP_DEFINITIONS LWIP_DEBUG=1)
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-  add_subdirectory(${LWIP_CONTRIB_DIR}/ports/win32/example_app)
+  add_subdirectory(${LWIP_DIR}/contrib/ports/win32/example_app)
 else()
-  add_subdirectory(${LWIP_CONTRIB_DIR}/ports/unix/example_app)
+  add_subdirectory(${LWIP_DIR}/contrib/ports/unix/example_app)
 endif()
 
 # Source package generation
diff --git a/contrib/Filelists.cmake b/contrib/Filelists.cmake
index fc9f4741..4e53e924 100644
--- a/contrib/Filelists.cmake
+++ b/contrib/Filelists.cmake
@@ -5,11 +5,13 @@
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()
-# The intention is to provide greater flexibility to users to 
+# The intention is to provide greater flexibility to users to
 # create their own targets using the *_SRCS variables.
 
 include_guard(GLOBAL)
 
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set(lwipcontribexamples_SRCS
     ${LWIP_CONTRIB_DIR}/examples/httpd/fs_example/fs_example.c
     ${LWIP_CONTRIB_DIR}/examples/httpd/ssi_example/ssi_example.c
diff --git a/contrib/ports/unix/Filelists.cmake b/contrib/ports/unix/Filelists.cmake
index 3301dfdf..fb62b678 100644
--- a/contrib/ports/unix/Filelists.cmake
+++ b/contrib/ports/unix/Filelists.cmake
@@ -5,11 +5,13 @@
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()
-# The intention is to provide greater flexibility to users to 
+# The intention is to provide greater flexibility to users to
 # create their own targets using the *_SRCS variables.
 
 include_guard(GLOBAL)
 
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set(lwipcontribportunix_SRCS
     ${LWIP_CONTRIB_DIR}/ports/unix/port/sys_arch.c
     ${LWIP_CONTRIB_DIR}/ports/unix/port/perf.c
diff --git a/contrib/ports/unix/example_app/CMakeLists.txt b/contrib/ports/unix/example_app/CMakeLists.txt
index c77acc34..0e59a52f 100644
--- a/contrib/ports/unix/example_app/CMakeLists.txt
+++ b/contrib/ports/unix/example_app/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set (LWIP_INCLUDE_DIRS
     "${LWIP_DIR}/src/include"
     "${LWIP_CONTRIB_DIR}/"
diff --git a/contrib/ports/win32/Filelists.cmake b/contrib/ports/win32/Filelists.cmake
index dc542523..1660feff 100644
--- a/contrib/ports/win32/Filelists.cmake
+++ b/contrib/ports/win32/Filelists.cmake
@@ -5,11 +5,13 @@
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()
-# The intention is to provide greater flexibility to users to 
+# The intention is to provide greater flexibility to users to
 # create their own targets using the *_SRCS variables.
 
 include_guard(GLOBAL)
 
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set(lwipcontribportwindows_SRCS
     ${LWIP_CONTRIB_DIR}/ports/win32/sys_arch.c
     ${LWIP_CONTRIB_DIR}/ports/win32/sio.c
diff --git a/contrib/ports/win32/example_app/CMakeLists.txt b/contrib/ports/win32/example_app/CMakeLists.txt
index b1d7b109..a7173a3a 100644
--- a/contrib/ports/win32/example_app/CMakeLists.txt
+++ b/contrib/ports/win32/example_app/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set (LWIP_INCLUDE_DIRS
     "${LWIP_DIR}/src/include"
     "${LWIP_CONTRIB_DIR}/"
diff --git a/src/Filelists.cmake b/src/Filelists.cmake
index 5b773597..96a4f8c1 100644
--- a/src/Filelists.cmake
+++ b/src/Filelists.cmake
@@ -10,6 +10,8 @@
 
 include_guard(GLOBAL)
 
+include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
+
 set(LWIP_VERSION_MAJOR    "2")
 set(LWIP_VERSION_MINOR    "2")
 set(LWIP_VERSION_REVISION "0")