From 8185a416b9af8978b71100f26f569d180e909bda Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Thu, 22 Oct 2020 08:36:28 -0400
Subject: [PATCH] Fix broken build on Linux with gcc.

---
 libs/kimath/include/geometry/shape_arc.h    | 2 +-
 libs/kimath/src/geometry/shape_poly_set.cpp | 8 ++++----
 pcbnew/pcb_expr_evaluator.cpp               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/kimath/include/geometry/shape_arc.h b/libs/kimath/include/geometry/shape_arc.h
index 3624179e21..a3fad1e2b9 100644
--- a/libs/kimath/include/geometry/shape_arc.h
+++ b/libs/kimath/include/geometry/shape_arc.h
@@ -27,7 +27,7 @@
 #define __SHAPE_ARC_H
 
 #include <geometry/shape.h>
-#include <include/convert_to_biu.h>
+#include <convert_to_biu.h>
 #include <math/vector2d.h>   // for VECTOR2I
 
 class SHAPE_LINE_CHAIN;
diff --git a/libs/kimath/src/geometry/shape_poly_set.cpp b/libs/kimath/src/geometry/shape_poly_set.cpp
index 9c24bc4ffe..cca3a21b6b 100644
--- a/libs/kimath/src/geometry/shape_poly_set.cpp
+++ b/libs/kimath/src/geometry/shape_poly_set.cpp
@@ -50,10 +50,10 @@
 #include <math/util.h>                       // for KiROUND, rescale
 #include <math/vector2d.h>                   // for VECTOR2I, VECTOR2D, VECTOR2
 #include <md5_hash.h>
-#include <libs/kimath/include/geometry/shape_segment.h>
-#include <libs/kimath/include/geometry/shape_circle.h>
-#include <libs/kimath/include/geometry/shape_simple.h>
-#include <libs/kimath/include/geometry/shape_compound.h>
+#include <geometry/shape_segment.h>
+#include <geometry/shape_circle.h>
+#include <geometry/shape_simple.h>
+#include <geometry/shape_compound.h>
 
 using namespace ClipperLib;
 
diff --git a/pcbnew/pcb_expr_evaluator.cpp b/pcbnew/pcb_expr_evaluator.cpp
index 9841bd64c8..b7d16c57da 100644
--- a/pcbnew/pcb_expr_evaluator.cpp
+++ b/pcbnew/pcb_expr_evaluator.cpp
@@ -34,7 +34,7 @@
 #include <connectivity/from_to_cache.h>
 
 #include <drc/drc_engine.h>
-#include <libs/kimath/include/geometry/shape_circle.h>
+#include <geometry/shape_circle.h>
 
 bool exprFromTo( LIBEVAL::CONTEXT* aCtx, void* self )
 {