diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_header.h b/ompi/mca/osc/pt2pt/osc_pt2pt_header.h
index d08866ffd0..e080333595 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_header.h
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_header.h
@@ -70,7 +70,7 @@ typedef struct ompi_osc_pt2pt_send_header_t ompi_osc_pt2pt_send_header_t;
         OMPI_OSC_PT2PT_BASE_HDR_HTON((hdr).hdr_base) \
         (hdr).hdr_origin = htonl((hdr).hdr_origin); \
         (hdr).hdr_origin_tag = htonl((hdr).hdr_origin_tag); \
-        (hdr).hdr_target_disp = htonll((hdr).hdr_target_disp); \
+        (hdr).hdr_target_disp = hton64((hdr).hdr_target_disp); \
         (hdr).hdr_target_count = htonl((hdr).hdr_target_count); \
         (hdr).hdr_target_op = htonl((hdr).hdr_target_op); \
         (hdr).hdr_msg_length = htonl((hdr).hdr_msg_length); \
@@ -81,7 +81,7 @@ typedef struct ompi_osc_pt2pt_send_header_t ompi_osc_pt2pt_send_header_t;
         OMPI_OSC_PT2PT_BASE_HDR_NTOH((hdr).hdr_base) \
         (hdr).hdr_origin = ntohl((hdr).hdr_origin); \
         (hdr).hdr_origin_tag = ntohl((hdr).hdr_origin_tag); \
-        (hdr).hdr_target_disp = ntohllo((hdr).hdr_target_disp); \
+        (hdr).hdr_target_disp = ntoh64((hdr).hdr_target_disp); \
         (hdr).hdr_target_count = ntohl((hdr).hdr_target_count); \
         (hdr).hdr_target_op = ntohl((hdr).hdr_target_op); \
         (hdr).hdr_msg_length = ntohl((hdr).hdr_msg_length); \
diff --git a/ompi/mca/osc/rdma/osc_rdma_header.h b/ompi/mca/osc/rdma/osc_rdma_header.h
index 3e648f12ef..873dd3e3b9 100644
--- a/ompi/mca/osc/rdma/osc_rdma_header.h
+++ b/ompi/mca/osc/rdma/osc_rdma_header.h
@@ -75,7 +75,7 @@ typedef struct ompi_osc_rdma_send_header_t ompi_osc_rdma_send_header_t;
         (hdr).hdr_windx = htons((hdr).hdr_windx); \
         (hdr).hdr_origin = htonl((hdr).hdr_origin); \
         (hdr).hdr_origin_tag = htonl((hdr).hdr_origin_tag); \
-        (hdr).hdr_target_disp = htonll((hdr).hdr_target_disp); \
+        (hdr).hdr_target_disp = hton64((hdr).hdr_target_disp); \
         (hdr).hdr_target_count = htonl((hdr).hdr_target_count); \
         (hdr).hdr_target_op = htonl((hdr).hdr_target_op); \
         (hdr).hdr_msg_length = htonl((hdr).hdr_msg_length); \
@@ -87,7 +87,7 @@ typedef struct ompi_osc_rdma_send_header_t ompi_osc_rdma_send_header_t;
         (hdr).hdr_windx = ntohs((hdr).hdr_windx); \
         (hdr).hdr_origin = ntohl((hdr).hdr_origin); \
         (hdr).hdr_origin_tag = ntohl((hdr).hdr_origin_tag); \
-        (hdr).hdr_target_disp = ntohll((hdr).hdr_target_disp); \
+        (hdr).hdr_target_disp = ntoh64((hdr).hdr_target_disp); \
         (hdr).hdr_target_count = ntohl((hdr).hdr_target_count); \
         (hdr).hdr_target_op = ntohl((hdr).hdr_target_op); \
         (hdr).hdr_msg_length = ntohl((hdr).hdr_msg_length); \