diff --git a/c_glib/arrow-dataset-glib/enums.c.template b/c_glib/arrow-dataset-glib/enums.c.template
index 8921ab06252d..d1f774a76735 100644
--- a/c_glib/arrow-dataset-glib/enums.c.template
+++ b/c_glib/arrow-dataset-glib/enums.c.template
@@ -23,7 +23,7 @@
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/c_glib/arrow-dataset-glib/enums.h.template b/c_glib/arrow-dataset-glib/enums.h.template
index 8b89a8b031bd..f658f47495cc 100644
--- a/c_glib/arrow-dataset-glib/enums.h.template
+++ b/c_glib/arrow-dataset-glib/enums.h.template
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/c_glib/arrow-glib/enums.c.template b/c_glib/arrow-glib/enums.c.template
index 6806ed194efd..9a5a9ba09c0c 100644
--- a/c_glib/arrow-glib/enums.c.template
+++ b/c_glib/arrow-glib/enums.c.template
@@ -23,7 +23,7 @@
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/c_glib/arrow-glib/enums.h.template b/c_glib/arrow-glib/enums.h.template
index e49b717fb30d..ee1fb5f7a076 100644
--- a/c_glib/arrow-glib/enums.h.template
+++ b/c_glib/arrow-glib/enums.h.template
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/c_glib/gandiva-glib/enums.c.template b/c_glib/gandiva-glib/enums.c.template
index 7ea2ea7b5f52..5f8b80a7702f 100644
--- a/c_glib/gandiva-glib/enums.c.template
+++ b/c_glib/gandiva-glib/enums.c.template
@@ -23,7 +23,7 @@
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/c_glib/gandiva-glib/enums.h.template b/c_glib/gandiva-glib/enums.h.template
index d362e14c1b2c..d07ed4680106 100644
--- a/c_glib/gandiva-glib/enums.h.template
+++ b/c_glib/gandiva-glib/enums.h.template
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index 25e5749335a0..2e5c67e07b6e 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -342,6 +342,10 @@ macro(append_runtime_avx512_src SRCS SRC)
 endmacro()
 
 # Write out compile-time configuration constants
+string(REPLACE "${CMAKE_SOURCE_DIR}" "<CMAKE_SOURCE_DIR>" REDACTED_CXX_FLAGS
+               ${CMAKE_CXX_FLAGS})
+string(REPLACE "${CMAKE_BINARY_DIR}" "<CMAKE_BINARY_DIR>" REDACTED_CXX_FLAGS
+               ${REDACTED_CXX_FLAGS})
 configure_file("util/config.h.cmake" "util/config.h" ESCAPE_QUOTES)
 configure_file("util/config_internal.h.cmake" "util/config_internal.h" ESCAPE_QUOTES)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/util/config.h"
diff --git a/cpp/src/arrow/util/config.h.cmake b/cpp/src/arrow/util/config.h.cmake
index ddff1379b1d3..cf98757c4a8d 100644
--- a/cpp/src/arrow/util/config.h.cmake
+++ b/cpp/src/arrow/util/config.h.cmake
@@ -27,7 +27,6 @@
 
 #define ARROW_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@"
 #define ARROW_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@"
-#define ARROW_CXX_COMPILER_FLAGS "@CMAKE_CXX_FLAGS@"
 
 #define ARROW_BUILD_TYPE "@UPPERCASE_BUILD_TYPE@"
 
diff --git a/cpp/src/arrow/util/config_internal.h.cmake b/cpp/src/arrow/util/config_internal.h.cmake
index e90f7ee12da4..5d96e6fc68a6 100644
--- a/cpp/src/arrow/util/config_internal.h.cmake
+++ b/cpp/src/arrow/util/config_internal.h.cmake
@@ -18,5 +18,7 @@
 // These variables are not exposed as they can make compilation caching
 // and increment builds less efficient.
 
+#define ARROW_CXX_COMPILER_FLAGS "@REDACTED_CXX_FLAGS@"
+
 #define ARROW_GIT_ID "@ARROW_GIT_ID@"
 #define ARROW_GIT_DESCRIPTION "@ARROW_GIT_DESCRIPTION@"