diff --git a/MeshGeoToolsLib/MeshNodeSearcher.cpp b/MeshGeoToolsLib/MeshNodeSearcher.cpp
index e9bd5ab8653f08f1775ff33d2c9d073fb0af13c4..68adbfb89a107b79c5059d63102080cf667efb56 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.cpp
+++ b/MeshGeoToolsLib/MeshNodeSearcher.cpp
@@ -8,7 +8,11 @@
  *              http://www.opengeosys.org/LICENSE.txt
  */
 
-#include "MeshGeoToolsLib/MeshNodeSearcher.h"
+#include "MeshNodeSearcher.h"
+#include "HeuristicSearchLength.h"
+#include "MeshNodesAlongPolyline.h"
+#include "MeshNodesAlongSurface.h"
+#include "MeshNodesOnPoint.h"
 
 #include <logog/include/logog.hpp>
 
@@ -21,12 +25,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
 
-// MeshGeoToolsLib
-#include "MeshGeoToolsLib/HeuristicSearchLength.h"
-#include "MeshGeoToolsLib/MeshNodesOnPoint.h"
-#include "MeshGeoToolsLib/MeshNodesAlongPolyline.h"
-#include "MeshGeoToolsLib/MeshNodesAlongSurface.h"
-
 namespace MeshGeoToolsLib
 {
 
diff --git a/MeshGeoToolsLib/MeshNodeSearcher.h b/MeshGeoToolsLib/MeshNodeSearcher.h
index 8957d80d690afc6676bfae9b9dc960457cd645a7..13bddc9428689a86a658002ee16c74e65fb78bd5 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.h
+++ b/MeshGeoToolsLib/MeshNodeSearcher.h
@@ -13,8 +13,6 @@
 #include <memory>
 #include <vector>
 
-#include <boost/optional.hpp>
-
 // GeoLib
 #include "GeoLib/Grid.h"