--- src/include/mpi.h.in.orig	2024-07-05 09:57:10.000000000 -0500
+++ src/include/mpi.h.in	2024-07-05 09:58:12.000000000 -0500
@@ -336,6 +336,18 @@
 #define MPI_WIN_CREATE_FLAVOR 0x66000007
 #define MPI_WIN_MODEL         0x66000009

+/* Definitions that are determined by configure. */
+typedef @MPI_AINT@ MPI_Aint;
+typedef @MPI_FINT@ MPI_Fint;
+typedef @MPI_COUNT@ MPI_Count;
+
+/* Let ROMIO know that MPI_Offset is already defined */
+#define HAVE_MPI_OFFSET
+/* MPI_OFFSET_TYPEDEF is set in configure and is
+      typedef $MPI_OFFSET MPI_Offset;
+   where $MPI_OFFSET is the correct C type */
+@MPI_OFFSET_TYPEDEF@
+
 #ifdef MPICH_DEFINE_ATTR_TYPE_TYPES
 static const MPI_Datatype mpich_mpi_datatype_null MPICH_ATTR_TYPE_TAG_MUST_BE_NULL() = MPI_DATATYPE_NULL;
 static const MPI_Datatype mpich_mpi_char               MPICH_ATTR_TYPE_TAG(char)               = MPI_CHAR;
@@ -408,18 +420,6 @@
 static const MPI_Datatype mpich_mpi_offset MPICH_ATTR_TYPE_TAG(MPI_Offset) = MPI_OFFSET;
 #endif

-/* Definitions that are determined by configure. */
-typedef @MPI_AINT@ MPI_Aint;
-typedef @MPI_FINT@ MPI_Fint;
-typedef @MPI_COUNT@ MPI_Count;
-
-/* Let ROMIO know that MPI_Offset is already defined */
-#define HAVE_MPI_OFFSET
-/* MPI_OFFSET_TYPEDEF is set in configure and is
-      typedef $MPI_OFFSET MPI_Offset;
-   where $MPI_OFFSET is the correct C type */
-@MPI_OFFSET_TYPEDEF@
-
 /* The order of these elements must match that in mpif.h, mpi_f08_types.f90,
    and mpi_c_interface_types.f90 */
 typedef struct MPI_Status {