diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 5634190190..f52a83bd83 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -26,7 +26,6 @@ set(COMMON_ABOUT_DLG_SRCS
 
 set(COMMON_SRCS
     ${COMMON_ABOUT_DLG_SRCS}
-    base_screen.cpp
     base_struct.cpp
     basicframe.cpp
     bezier_curves.cpp
@@ -81,6 +80,7 @@ set(COMMON_SRCS
 add_library(common ${COMMON_SRCS})
 
 set(PCB_COMMON_SRCS
+    base_screen.cpp
     pcbcommon.cpp
     footprint_info.cpp
     class_layer_box_selector.cpp
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index ee3da837b1..22272a1d34 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -75,9 +75,10 @@ endif(APPLE)
 # Create the cvpcb executable
 ###
 add_executable(cvpcb WIN32 MACOSX_BUNDLE
-               ${CVPCB_SRCS}
-               ${CVPCB_DIALOGS}
-               ${CVPCB_RESOURCES})
+    ${CVPCB_SRCS}
+    ${CVPCB_DIALOGS}
+    ${CVPCB_RESOURCES}
+    )
 
 ###
 # Set properties for APPLE on cvpcb target
@@ -89,11 +90,18 @@ endif(APPLE)
 ###
 # Link executable target cvpcb with correct libraries
 ###
-target_link_libraries(cvpcb 3d-viewer pcbcommon common polygon bitmaps kbool
-                      ${OPENGL_LIBRARIES}
-                      ${wxWidgets_LIBRARIES}
-                      ${GDI_PLUS_LIBRARIES}
-                     )
+target_link_libraries(cvpcb
+    3d-viewer
+    pcbcommon
+    common
+    polygon
+    bitmaps
+    kbool
+    ${OPENGL_LIBRARIES}
+    ${wxWidgets_LIBRARIES}
+    ${GDI_PLUS_LIBRARIES}
+    )
+
 ###
 # Add cvpcb as install target
 ###
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 576a14dadf..52c69437cc 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -158,6 +158,7 @@ set(EESCHEMA_SRCS
 
 set(EESCHEMA_COMMON_SRCS
     ../common/dialogs/dialog_page_settings.cpp
+    ../common/base_screen.cpp
     )
 
 
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index f55418c5e3..0b21552259 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -66,9 +66,10 @@ if(APPLE)
         ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries( pcb_calculator common polygon bitmaps
-                        ${wxWidgets_LIBRARIES}
-                        )
+target_link_libraries( pcb_calculator
+    common polygon bitmaps
+    ${wxWidgets_LIBRARIES}
+    )
 
 install(TARGETS pcb_calculator
         DESTINATION ${KICAD_BIN}