diff --git a/include/geometry/shape_line_chain.h b/include/geometry/shape_line_chain.h
index 250e0e797b..f989e658f2 100644
--- a/include/geometry/shape_line_chain.h
+++ b/include/geometry/shape_line_chain.h
@@ -34,7 +34,7 @@
 #include <math/vector2d.h>
 #include <geometry/shape.h>
 #include <geometry/seg.h>
-#include "clipper.hpp"
+#include <../polygon/clipper.hpp>
 
 /**
  * Class SHAPE_LINE_CHAIN
diff --git a/include/geometry/shape_poly_set.h b/include/geometry/shape_poly_set.h
index f0dabef526..57a6dc9a6f 100644
--- a/include/geometry/shape_poly_set.h
+++ b/include/geometry/shape_poly_set.h
@@ -32,8 +32,6 @@
 #include <geometry/shape.h>
 #include <geometry/shape_line_chain.h>
 
-#include "clipper.hpp"
-
 #include <md5_hash.h>
 
 
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index a425194720..a58dc89bad 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -46,7 +46,6 @@ include_directories(
     ../common/dialogs
     ./exporters
     ../dxflib_qcad
-    ./import_dxf
     ../utils/idftools
     ${GLM_INCLUDE_DIR}
     ./specctra_import_export
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 00b7841c39..184f9ebbfd 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -32,7 +32,6 @@
 #include <id.h>
 #include <pcbnew_id.h>
 #include <confirm.h>
-#include <import_dxf/dialog_dxf_import.h>
 #include <import_gfx/dialog_import_gfx.h>
 
 #include <view/view_group.h>