diff --git a/mpi.h b/mpi.h
index 2273e89..4b95918 100644
--- a/mpi.h
+++ b/mpi.h
@@ -90,8 +90,8 @@ typedef struct MPI_ABI_Info* MPI_Info;
 typedef struct MPI_ABI_Errhandler* MPI_Errhandler;
 #define MPI_ERRHANDLER_NULL            ((MPI_Errhandler)0x00000140)
 #define MPI_ERRORS_ARE_FATAL           ((MPI_Errhandler)0x00000141)
-#define MPI_ERRORS_RETURN              ((MPI_Errhandler)0x00000142)
-#define MPI_ERRORS_ABORT               ((MPI_Errhandler)0x00000143)
+#define MPI_ERRORS_ABORT               ((MPI_Errhandler)0x00000142)
+#define MPI_ERRORS_RETURN              ((MPI_Errhandler)0x00000143)
 
 typedef struct MPI_ABI_Request* MPI_Request;
 #define MPI_REQUEST_NULL               ((MPI_Request)0x00000180)
@@ -360,9 +360,9 @@ enum {
     MPI_COMBINER_STRUCT                = 110,
     MPI_COMBINER_SUBARRAY              = 111,
     MPI_COMBINER_DARRAY                = 112,
-    MPI_COMBINER_F90_INTEGER           = 113,
-    MPI_COMBINER_F90_REAL              = 114,
-    MPI_COMBINER_F90_COMPLEX           = 115,
+    MPI_COMBINER_F90_REAL              = 113,
+    MPI_COMBINER_F90_COMPLEX           = 114,
+    MPI_COMBINER_F90_INTEGER           = 115,
     MPI_COMBINER_RESIZED               = 116,
     MPI_COMBINER_VALUE_INDEX           = 117,
 
@@ -404,9 +404,9 @@ enum {
     MPI_WIN_SEPARATE                   = 322,
 
     /* File Positioning */
-    MPI_SEEK_SET                       = 401,
-    MPI_SEEK_CUR                       = 402,
-    MPI_SEEK_END                       = 403
+    MPI_SEEK_CUR                       = 401,
+    MPI_SEEK_END                       = 402,
+    MPI_SEEK_SET                       = 403
 };
 
 /* File Operation Constants */
@@ -422,9 +422,9 @@ enum {
     MPI_IO                             = 502,
     MPI_HOST                           = 503, /* deprecated: MPI-4.1 */
     MPI_WTIME_IS_GLOBAL                = 504,
-    MPI_UNIVERSE_SIZE                  = 505,
-    MPI_APPNUM                         = 506,
-    MPI_LASTUSEDCODE                   = 507,
+    MPI_APPNUM                         = 505,
+    MPI_LASTUSEDCODE                   = 506,
+    MPI_UNIVERSE_SIZE                  = 507,
 
     /* Window */
     MPI_WIN_BASE                       = 601,
@@ -561,7 +561,7 @@ typedef void (MPI_T_event_free_cb_function)(MPI_T_event_registration event_regis
 typedef void (MPI_T_event_dropped_cb_function)(MPI_Count count, MPI_T_event_registration event_registration, int source_index, MPI_T_cb_safety cb_safety, void *user_data);
 
 /* MPI functions */
-int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false);
+int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
 int MPI_Abi_get_fortran_info(MPI_Info *info);
 int MPI_Abi_get_info(MPI_Info *info);
 int MPI_Abi_get_version(int *abi_major, int *abi_minor);
@@ -1231,7 +1231,7 @@ int MPI_T_source_get_num(int *num_sources);
 int MPI_T_source_get_timestamp(int source_index, MPI_Count *timestamp);
 
 /* PMPI functions */
-int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false);
+int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
 int PMPI_Abi_get_fortran_info(MPI_Info *info);
 int PMPI_Abi_get_info(MPI_Info *info);
 int PMPI_Abi_get_version(int *abi_major, int *abi_minor);
diff --git a/mpistubs.c b/mpistubs.c
index 7276144..c6e0530 100644
--- a/mpistubs.c
+++ b/mpistubs.c
@@ -2,7 +2,7 @@
 #include "mpi.h"
 
 /* MPI functions */
-int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false) { abort(); return 0; }
+int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set) { abort(); return 0; }
 int MPI_Abi_get_fortran_info(MPI_Info *info) { abort(); return 0; }
 int MPI_Abi_get_info(MPI_Info *info) { abort(); return 0; }
 int MPI_Abi_get_version(int *abi_major, int *abi_minor) { abort(); return 0; }
@@ -672,7 +672,7 @@ int MPI_T_source_get_num(int *num_sources) { abort(); return 0; }
 int MPI_T_source_get_timestamp(int source_index, MPI_Count *timestamp) { abort(); return 0; }
 
 /* PMPI functions */
-int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false) { abort(); return 0; }
+int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set) { abort(); return 0; }
 int PMPI_Abi_get_fortran_info(MPI_Info *info) { abort(); return 0; }
 int PMPI_Abi_get_info(MPI_Info *info) { abort(); return 0; }
 int PMPI_Abi_get_version(int *abi_major, int *abi_minor) { abort(); return 0; }