diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index 5568b7731..a1be8e65b 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -1885,6 +1885,10 @@ extern "C" {
     GEOSGridIntersectionFractions_r(GEOSContextHandle_t extHandle, const Geometry* g, double xmin, double ymin,
                                     double xmax, double ymax, unsigned nx, unsigned ny, float* buf)
     {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
         return execute(extHandle, 0, [&]() {
             Envelope env(xmin, xmax, ymin, ymax);
             double dx = env.getWidth() / static_cast<double>(nx);
@@ -1900,6 +1904,9 @@ extern "C" {
 
             return 1;
         });
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
     }
 
     Geometry*
diff --git a/include/geos/algorithm/distance/DistanceToPoint.h b/include/geos/algorithm/distance/DistanceToPoint.h
index 108b85506..10f280ade 100644
--- a/include/geos/algorithm/distance/DistanceToPoint.h
+++ b/include/geos/algorithm/distance/DistanceToPoint.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <geos/export.h>
 #include <geos/geom/LineSegment.h> // for composition
 
 namespace geos {
@@ -43,7 +44,7 @@ namespace distance { // geos::algorithm::distance
  *
  * Also computes two points which are separated by the distance.
  */
-class DistanceToPoint {
+class GEOS_DLL DistanceToPoint {
 public:
 
     DistanceToPoint() {}