From c972dd8f3c9d12b8f3c9b18349d91f43655d29e9 Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Fri, 1 Nov 2024 09:14:18 -0700
Subject: [PATCH] Reorganize headers

---
 .../geos/operation/overlayng/EdgeNodingBuilder.h | 16 +---------------
 src/operation/overlayng/EdgeNodingBuilder.cpp    |  9 +++++++++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/geos/operation/overlayng/EdgeNodingBuilder.h b/include/geos/operation/overlayng/EdgeNodingBuilder.h
index aec4d7b41c..9066bff2f8 100644
--- a/include/geos/operation/overlayng/EdgeNodingBuilder.h
+++ b/include/geos/operation/overlayng/EdgeNodingBuilder.h
@@ -19,32 +19,20 @@
 #pragma once
 
 #include <geos/algorithm/LineIntersector.h>
-#include <geos/algorithm/Orientation.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/Envelope.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/GeometryCollection.h>
 #include <geos/geom/LinearRing.h>
 #include <geos/geom/LineString.h>
-#include <geos/geom/MultiLineString.h>
-#include <geos/geom/MultiPolygon.h>
 #include <geos/geom/Polygon.h>
 #include <geos/noding/IntersectionAdder.h>
-#include <geos/noding/MCIndexNoder.h>
 #include <geos/noding/Noder.h>
-#include <geos/noding/NodedSegmentString.h>
 #include <geos/noding/SegmentString.h>
-#include <geos/noding/ValidatingNoder.h>
-#include <geos/noding/snapround/SnapRoundingNoder.h>
 #include <geos/operation/overlayng/Edge.h>
 #include <geos/operation/overlayng/EdgeSourceInfo.h>
-#include <geos/operation/overlayng/InputGeometry.h>
 #include <geos/operation/overlayng/LineLimiter.h>
-#include <geos/operation/overlayng/OverlayUtil.h>
 #include <geos/operation/overlayng/RingClipper.h>
-#include <geos/operation/valid/RepeatedPointRemover.h>
 
 
 #include <geos/export.h>
@@ -54,8 +42,6 @@
 
 using namespace geos::geom;
 using namespace geos::noding;
-using geos::noding::snapround::SnapRoundingNoder;
-using geos::algorithm::LineIntersector;
 
 
 namespace geos {      // geos.
@@ -95,7 +81,7 @@ class GEOS_DLL EdgeNodingBuilder {
     std::unique_ptr<LineLimiter> limiter;
 
     // For use in createFloatingPrecisionNoder()
-    LineIntersector lineInt;
+    algorithm::LineIntersector lineInt;
     IntersectionAdder intAdder;
     std::unique_ptr<Noder> internalNoder;
     std::unique_ptr<Noder> spareInternalNoder;
diff --git a/src/operation/overlayng/EdgeNodingBuilder.cpp b/src/operation/overlayng/EdgeNodingBuilder.cpp
index fd3fd85570..74800020f8 100644
--- a/src/operation/overlayng/EdgeNodingBuilder.cpp
+++ b/src/operation/overlayng/EdgeNodingBuilder.cpp
@@ -16,11 +16,20 @@
  *
  **********************************************************************/
 
+#include <geos/noding/ValidatingNoder.h>
+#include <geos/noding/NodedSegmentString.h>
+#include <geos/noding/MCIndexNoder.h>
+#include <geos/geom/Coordinate.h>
+#include <geos/algorithm/Orientation.h>
+#include <geos/noding/snapround/SnapRoundingNoder.h>
 #include <geos/operation/overlayng/EdgeNodingBuilder.h>
 #include <geos/operation/overlayng/EdgeMerger.h>
+#include <geos/operation/valid/RepeatedPointRemover.h>
+#include <geos/operation/overlayng/OverlayUtil.h>
 #include <geos/util.h>
 
 using geos::operation::valid::RepeatedPointRemover;
+using geos::noding::snapround::SnapRoundingNoder;
 
 namespace geos {      // geos
 namespace operation { // geos.operation