From 4bba651659ac1fd0133c130895128acc8e212615 Mon Sep 17 00:00:00 2001
From: Benedict Geihe <bgeihe@uni-koeln.de>
Date: Mon, 2 Feb 2026 10:50:51 +0100
Subject: [PATCH 1/2] move main out off T8_EXTERN_C region

---
 example/remove/t8_example_empty_trees.cxx | 4 ++--
 example/remove/t8_example_gauss_blob.cxx  | 4 ++--
 example/remove/t8_example_spheres.cxx     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/example/remove/t8_example_empty_trees.cxx b/example/remove/t8_example_empty_trees.cxx
index 6140b292ac..3b21a8c5bd 100644
--- a/example/remove/t8_example_empty_trees.cxx
+++ b/example/remove/t8_example_empty_trees.cxx
@@ -95,6 +95,8 @@ t8_strip_of_quads (t8_gloidx_t num_trees, t8_gloidx_t empty_tree, const char **v
   t8_forest_unref (&forest);
 }
 
+T8_EXTERN_C_END ();
+
 int
 main (int argc, char **argv)
 {
@@ -162,5 +164,3 @@ main (int argc, char **argv)
 
   return 0;
 }
-
-T8_EXTERN_C_END ();
diff --git a/example/remove/t8_example_gauss_blob.cxx b/example/remove/t8_example_gauss_blob.cxx
index fe19a60037..447342c399 100644
--- a/example/remove/t8_example_gauss_blob.cxx
+++ b/example/remove/t8_example_gauss_blob.cxx
@@ -171,6 +171,8 @@ t8_construct_spheres (const int initial_level, const double radius_inner, const
   t8_forest_unref (&forest);
 }
 
+T8_EXTERN_C_END ();
+
 int
 main (int argc, char **argv)
 {
@@ -256,5 +258,3 @@ main (int argc, char **argv)
 
   return 0;
 }
-
-T8_EXTERN_C_END ();
diff --git a/example/remove/t8_example_spheres.cxx b/example/remove/t8_example_spheres.cxx
index c647c50769..f9f0c0cee9 100644
--- a/example/remove/t8_example_spheres.cxx
+++ b/example/remove/t8_example_spheres.cxx
@@ -125,6 +125,8 @@ t8_construct_spheres (const int initial_level, const double radius_inner, const
   t8_forest_unref (&forest);
 }
 
+T8_EXTERN_C_END ();
+
 int
 main (int argc, char **argv)
 {
@@ -206,5 +208,3 @@ main (int argc, char **argv)
 
   return 0;
 }
-
-T8_EXTERN_C_END ();

From 9a3389f0109c9b9e573607a99ed6c36b8a19da0a Mon Sep 17 00:00:00 2001
From: Benedict Geihe <bgeihe@uni-koeln.de>
Date: Fri, 6 Feb 2026 13:42:39 +0100
Subject: [PATCH 2/2] remove T8_EXTERN_C_*

---
 example/remove/t8_example_empty_trees.cxx | 4 ----
 example/remove/t8_example_gauss_blob.cxx  | 4 ----
 example/remove/t8_example_spheres.cxx     | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/example/remove/t8_example_empty_trees.cxx b/example/remove/t8_example_empty_trees.cxx
index 3b21a8c5bd..19da354526 100644
--- a/example/remove/t8_example_empty_trees.cxx
+++ b/example/remove/t8_example_empty_trees.cxx
@@ -29,8 +29,6 @@
 #include <sc_options.h>
 #include <string>
 
-T8_EXTERN_C_BEGIN ();
-
 /** Removes all elements of a local tree if they belong to the corresponding
  *  global trees which is given by the user_data. */
 static int
@@ -95,8 +93,6 @@ t8_strip_of_quads (t8_gloidx_t num_trees, t8_gloidx_t empty_tree, const char **v
   t8_forest_unref (&forest);
 }
 
-T8_EXTERN_C_END ();
-
 int
 main (int argc, char **argv)
 {
diff --git a/example/remove/t8_example_gauss_blob.cxx b/example/remove/t8_example_gauss_blob.cxx
index 447342c399..0cb4b7d979 100644
--- a/example/remove/t8_example_gauss_blob.cxx
+++ b/example/remove/t8_example_gauss_blob.cxx
@@ -27,8 +27,6 @@
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <sc_options.h>
 
-T8_EXTERN_C_BEGIN ();
-
 struct t8_adapt_data
 {
   const int remove_scope;
@@ -171,8 +169,6 @@ t8_construct_spheres (const int initial_level, const double radius_inner, const
   t8_forest_unref (&forest);
 }
 
-T8_EXTERN_C_END ();
-
 int
 main (int argc, char **argv)
 {
diff --git a/example/remove/t8_example_spheres.cxx b/example/remove/t8_example_spheres.cxx
index f9f0c0cee9..5c17c5d025 100644
--- a/example/remove/t8_example_spheres.cxx
+++ b/example/remove/t8_example_spheres.cxx
@@ -27,8 +27,6 @@
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <sc_options.h>
 
-T8_EXTERN_C_BEGIN ();
-
 struct t8_adapt_data
 {
   const int num_spheres;
@@ -125,8 +123,6 @@ t8_construct_spheres (const int initial_level, const double radius_inner, const
   t8_forest_unref (&forest);
 }
 
-T8_EXTERN_C_END ();
-
 int
 main (int argc, char **argv)
 {