diff --git a/alg/viewshed.h b/alg/viewshed.h
index 286d203ca12a..8b867050a4e1 100644
--- a/alg/viewshed.h
+++ b/alg/viewshed.h
@@ -30,6 +30,7 @@
 #include <string>
 
 #include "cpl_progress.h"
+#include "gdal_priv.h"
 
 namespace gdal
 {
diff --git a/apps/gdal_viewshed.cpp b/apps/gdal_viewshed.cpp
index 38ea953fe694..da632382d250 100644
--- a/apps/gdal_viewshed.cpp
+++ b/apps/gdal_viewshed.cpp
@@ -25,16 +25,10 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "cpl_conv.h"
-#include "cpl_string.h"
-#include "gdal_version.h"
-#include "gdal.h"
-#include "gdal_alg.h"
-#include "gdal_priv.h"
-#include "ogr_api.h"
-#include "ogr_srs_api.h"
-#include "ogr_spatialref.h"
+#include <limits>
+
 #include "commonutils.h"
+#include "gdal.h"
 #include "gdalargumentparser.h"
 
 #include "viewshed.h"