diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f511fd449b..924599753a 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -88,6 +88,7 @@ add_library( legacy_gal STATIC ${LEGACY_GAL_SRCS} )
 add_library( legacy_wx STATIC ${LEGACY_WX_SRCS} )
 
 target_include_directories( legacy_wx PUBLIC ../include/legacy_wx )
+target_include_directories( legacy_gal PUBLIC ../include/legacy_gal )
 
 target_link_libraries( gal
     ${GLEW_LIBRARIES}
diff --git a/common/legacy_gal/block.cpp b/common/legacy_gal/block.cpp
index 15621610be..b6a6a98bbb 100644
--- a/common/legacy_gal/block.cpp
+++ b/common/legacy_gal/block.cpp
@@ -34,7 +34,7 @@
 #include <macros.h>
 #include <base_struct.h>
 #include <base_screen.h>
-#include <legacy_gal/class_drawpanel.h>
+#include <class_drawpanel.h>
 #include <confirm.h>
 #include <block_commande.h>
 
diff --git a/common/legacy_gal/eda_draw_frame.cpp b/common/legacy_gal/eda_draw_frame.cpp
index 926c25fff1..cd033a84e1 100644
--- a/common/legacy_gal/eda_draw_frame.cpp
+++ b/common/legacy_gal/eda_draw_frame.cpp
@@ -35,7 +35,7 @@
 #include <bitmaps.h>
 #include <macros.h>
 #include <id.h>
-#include <legacy_gal/class_drawpanel.h>
+#include <class_drawpanel.h>
 #include <base_screen.h>
 #include <msgpanel.h>
 #include <draw_frame.h>
diff --git a/common/legacy_gal/other.cpp b/common/legacy_gal/other.cpp
index 918a77a7ac..7fe3938fff 100644
--- a/common/legacy_gal/other.cpp
+++ b/common/legacy_gal/other.cpp
@@ -3,7 +3,7 @@
 #include "base_screen.h"
 #include "common.h"
 #include "macros.h"
-#include "legacy_gal/class_drawpanel.h"
+#include "class_drawpanel.h"
 #include "marker_base.h"
 #include "dialog_display_info_HTML_base.h"
 
@@ -12,5 +12,4 @@
 void MARKER_BASE::DrawMarker( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode,
                               const wxPoint& aOffset )
 {
-   
 }
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 6a3cb88562..2f53e84de1 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
 
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
-    ../include/legacy_gal
     ./dialogs
     ./netlist_exporters
     ./widgets