diff --git a/autotest/postinstall/test_gdal-config.sh b/autotest/postinstall/test_gdal-config.sh
index 19a656ee04ae..e77088e12e7b 100755
--- a/autotest/postinstall/test_gdal-config.sh
+++ b/autotest/postinstall/test_gdal-config.sh
@@ -102,7 +102,7 @@ set -eu
 CXX="${CXX:-c++}"
 echo "Test that we can compile all headers with C++11 using ${CXX}"
 for i in $prefix/include/*.h; do
-  ${CXX} -std=c++11 -c $(${GDAL_CONFIG} --cflags) $i;
+  ${CXX} -Wall -Wpedantic -std=c++11 -c $(${GDAL_CONFIG} --cflags) $i;
 done
 
 echo "$ERRORS tests failed out of $NTESTS"
diff --git a/ogr/ogr_recordbatch.h b/ogr/ogr_recordbatch.h
index 6fcde1405b65..48d1a8d7c874 100644
--- a/ogr/ogr_recordbatch.h
+++ b/ogr/ogr_recordbatch.h
@@ -19,7 +19,8 @@
 // https://github.com/apache/arrow/blob/main/cpp/src/arrow/c/abi.h WARNING: DO
 // NOT MODIFY the content as it would break interoperability !
 
-#pragma once
+#ifndef OGR_RECORDBATCH_H_INCLUDED
+#define OGR_RECORDBATCH_H_INCLUDED
 
 /*! @cond Doxygen_Suppress */
 
@@ -123,3 +124,5 @@ extern "C"
 #endif
 
 /*! @endcond */
+
+#endif  // OGR_RECORDBATCH_H_INCLUDED