diff --git a/ompi/datatype/ompi_datatype_internal.h b/ompi/datatype/ompi_datatype_internal.h
index c1d2d6e0ff..b8c866a429 100644
--- a/ompi/datatype/ompi_datatype_internal.h
+++ b/ompi/datatype/ompi_datatype_internal.h
@@ -138,44 +138,44 @@
 
 #if SIZEOF_INT == 1
 #define OMPI_DATATYPE_MPI_INT                     OMPI_DATATYPE_MPI_INT8_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_INT8_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_UINT8_T
 #elif SIZEOF_INT == 2
 #define OMPI_DATATYPE_MPI_INT                     OMPI_DATATYPE_MPI_INT16_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_INT16_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_UINT16_T
 #elif SIZEOF_INT == 4
 #define OMPI_DATATYPE_MPI_INT                     OMPI_DATATYPE_MPI_INT32_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_INT32_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_UINT32_T
 #elif SIZEOF_INT == 8
 #define OMPI_DATATYPE_MPI_INT                     OMPI_DATATYPE_MPI_INT64_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_INT64_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_INT            OMPI_DATATYPE_MPI_UINT64_T
 #endif
 
 #if SIZEOF_LONG == 1
 #define OMPI_DATATYPE_MPI_LONG                    OMPI_DATATYPE_MPI_INT8_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_INT8_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_UINT8_T
 #elif SIZEOF_LONG == 2
 #define OMPI_DATATYPE_MPI_LONG                    OMPI_DATATYPE_MPI_INT16_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_INT16_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_UINT16_T
 #elif SIZEOF_LONG == 4
 #define OMPI_DATATYPE_MPI_LONG                    OMPI_DATATYPE_MPI_INT32_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_INT32_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_UINT32_T
 #elif SIZEOF_LONG == 8
 #define OMPI_DATATYPE_MPI_LONG                    OMPI_DATATYPE_MPI_INT64_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_INT64_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG           OMPI_DATATYPE_MPI_UINT64_T
 #endif
 
 #if SIZEOF_LONG_LONG == 1
 #define OMPI_DATATYPE_MPI_LONG_LONG               OMPI_DATATYPE_MPI_INT8_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_INT8_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_UINT8_T
 #elif SIZEOF_LONG_LONG == 2
 #define OMPI_DATATYPE_MPI_LONG_LONG               OMPI_DATATYPE_MPI_INT16_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_INT16_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_UINT16_T
 #elif SIZEOF_LONG_LONG == 4
 #define OMPI_DATATYPE_MPI_LONG_LONG               OMPI_DATATYPE_MPI_INT32_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_INT32_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_UINT32_T
 #elif SIZEOF_LONG_LONG == 8
 #define OMPI_DATATYPE_MPI_LONG_LONG               OMPI_DATATYPE_MPI_INT64_T
-#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_INT64_T
+#define OMPI_DATATYPE_MPI_UNSIGNED_LONG_LONG      OMPI_DATATYPE_MPI_UINT64_T
 #endif
 
 /*