diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 6cea78a831..728f1c3f7b 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -6,6 +6,7 @@ configure_file( 3d_plugin_dir.h.in 3d_plugin_dir.h @ONLY )
 include_directories(BEFORE ${INC_BEFORE})
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
+    ../include/legacy_wx
     ../pcbnew
     ../polygon
     3d_canvas
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 0bd4b002ba..eb77f6b682 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -7,6 +7,7 @@ add_definitions( -DCVPCB )
 
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
+    ../include/legacy_wx
     ./dialogs
     ../3d-viewer
     ../pcbnew
@@ -149,6 +150,23 @@ target_link_libraries( cvpcb_kiface
     bitmaps
     polygon
     gal
+    legacy_wx
+    pcbcommon
+    pcad2kicadpcb
+    3d-viewer
+    common
+    bitmaps
+    polygon
+    gal
+    legacy_wx
+    pcbcommon
+    pcad2kicadpcb
+    3d-viewer
+    common
+    bitmaps
+    polygon
+    gal
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     )
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 8b5d817d1e..9f76f86a76 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -7,6 +7,7 @@ add_definitions(-DGERBVIEW)
 
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
+    ../include/legacy_wx
     ../pcbnew
     dialogs
     ../3d-viewer
@@ -120,6 +121,7 @@ target_link_libraries( gerbview
     common
     bitmaps
     gal
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     )
 
@@ -145,6 +147,17 @@ target_link_libraries( gerbview_kiface
     polygon
     bitmaps
     gal
+    legacy_wx
+    common
+    polygon
+    bitmaps
+    gal
+    legacy_wx
+    common
+    polygon
+    bitmaps
+    gal
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     )
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index b1fff19280..4e82fab7dd 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -7,6 +7,7 @@ add_definitions(-DPL_EDITOR)
 
 include_directories(BEFORE ${INC_BEFORE})
 include_directories(
+    ../include/legacy_wx
     dialogs
     ../common/dialogs
     ${INC_AFTER}
@@ -82,6 +83,19 @@ target_link_libraries( pl_editor
     common
     bitmaps
     gal
+    legacy_wx
+    common
+    bitmaps
+    gal
+    legacy_wx
+    common
+    bitmaps
+    gal
+    legacy_wx
+    common
+    bitmaps
+    gal
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     )
 
@@ -102,6 +116,17 @@ target_link_libraries( pl_editor_kiface
     polygon
     bitmaps
     gal
+    legacy_wx
+    common
+    polygon
+    bitmaps
+    gal
+    legacy_wx
+    common
+    polygon
+    bitmaps
+    gal
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     )
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index bc170b60d1..2c239164d8 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -35,6 +35,7 @@ endif()
 
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
+    ../include/legacy_wx
     ./dialogs
     ./autorouter
     ../3d-viewer
@@ -663,6 +664,29 @@ set( PCBNEW_KIFACE_LIBRARIES
     gal
     lib_dxf
     idf3
+    legacy_wx
+    3d-viewer
+    pcbcommon
+    pnsrouter
+    pcad2kicadpcb
+    common
+    polygon
+    bitmaps
+    gal
+    lib_dxf
+    idf3
+    legacy_wx
+    3d-viewer
+    pcbcommon
+    pnsrouter
+    pcad2kicadpcb
+    common
+    polygon
+    bitmaps
+    gal
+    lib_dxf
+    idf3
+    legacy_wx
     ${wxWidgets_LIBRARIES}
     ${GITHUB_PLUGIN_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index 8186f137fb..6f711d1b34 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -1339,6 +1339,7 @@ void DIALOG_PAD_PROPERTIES::redraw()
             BOX2I drawbox;
             drawbox.Move( m_dummyPad->GetPosition() );
             drawbox.Inflate( bbox.GetSize().x*2, bbox.GetSize().y*2 );
+            
             view->SetBoundary( drawbox );
 
             // Autozoom
diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index a932b87541..36aa7b6012 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -14,6 +14,6 @@ endif()
 
 add_subdirectory( common )
 add_subdirectory( shape_poly_set_refactor )
-add_subdirectory( pcb_test_window )
-add_subdirectory( polygon_triangulation )
-add_subdirectory( polygon_generator )
\ No newline at end of file
+# add_subdirectory( pcb_test_window )
+# add_subdirectory( polygon_triangulation )
+# add_subdirectory( polygon_generator )
\ No newline at end of file