Fix some more redundant geos includes in headers

And re-add geos include directory for grass provider

Author: nyalldawson

python/core/qgslabelsearchtree.sip.in

@@ -10,6 +10,7 @@
 
 
 
+
 class QgsLabelSearchTree
 {
 %Docstring

src/analysis/vector/geometry_checker/qgsgeometrycheck.h

@@ -26,7 +26,6 @@
 #include "qgsvectorlayer.h"
 #include "geometry/qgsgeometry.h"
 #include "qgsgeometrycheckerutils.h"
-#include "geos_c.h"
 
 class QgsGeometryCheckError;
 class QgsFeaturePool;

src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp

@@ -17,6 +17,7 @@
 #include "qgsgeometrygapcheck.h"
 #include "qgsgeometrycollection.h"
 #include "qgsfeaturepool.h"
+#include "geos_c.h"
 
 void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
 {

src/core/qgslabelsearchtree.h

@@ -23,13 +23,18 @@
 #include "qgis_sip.h"
 #include <QList>
 #include <QVector>
-#include "pointset.h"
-#include "labelposition.h"
 #include "qgspallabeling.h"
 #include "rtree.hpp"
 
 class QgsPointXY;
 
+#ifndef SIP_RUN
+namespace pal
+{
+  class LabelPosition;
+}
+#endif
+
 /**
  * \ingroup core
  * A class to query the labeling structure at a given point (small wrapper around pal RTree class)

src/providers/grass/CMakeLists.txt

@@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${GDAL_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )