diff --git a/ompi/mca/pml/bfo/pml_bfo_hdr.h b/ompi/mca/pml/bfo/pml_bfo_hdr.h
index 96334e2e33..ed87752306 100644
--- a/ompi/mca/pml/bfo/pml_bfo_hdr.h
+++ b/ompi/mca/pml/bfo/pml_bfo_hdr.h
@@ -353,6 +353,7 @@ struct mca_pml_bfo_fin_hdr_t {
 };
 typedef struct mca_pml_bfo_fin_hdr_t mca_pml_bfo_fin_hdr_t;
 
+#if PML_BFO
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT && OPAL_ENABLE_DEBUG
 #define MCA_PML_OB1_FIN_HDR_FILL(h) \
 do {                                \
@@ -376,6 +377,28 @@ do {                                \
         MCA_PML_BFO_MATCH_HDR_HTON((h).hdr_match); \
         MCA_PML_OB1_FIN_HDR_FILL(h); \
     } while (0) 
+#else /* PML_BFO */
+#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT && OPAL_ENABLE_DEBUG
+#define MCA_PML_OB1_FIN_HDR_FILL(h) \
+do {                                \
+    (h).hdr_padding[0] = 0;         \
+    (h).hdr_padding[1] = 0;         \
+} while (0)
+#else
+#define MCA_PML_BFO_FIN_HDR_FILL(h)
+#endif  /* OPAL_ENABLE_HETEROGENEOUS_SUPPORT && OPAL_ENABLE_DEBUG */
+
+#define MCA_PML_BFO_FIN_HDR_NTOH(h) \
+    do { \
+        MCA_PML_BFO_COMMON_HDR_NTOH((h).hdr_common); \
+    } while (0)
+
+#define MCA_PML_BFO_FIN_HDR_HTON(h) \
+    do { \
+        MCA_PML_BFO_COMMON_HDR_HTON((h).hdr_common); \
+        MCA_PML_OB1_FIN_HDR_FILL(h); \
+    } while (0) 
+#endif /* PML_BFO */
 
 #if PML_BFO
 /**