diff --git a/include/openvswitch/ofp-bundle.h b/include/openvswitch/ofp-bundle.h
index f19996663..78a44d6f0 100644
--- a/include/openvswitch/ofp-bundle.h
+++ b/include/openvswitch/ofp-bundle.h
@@ -26,17 +26,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
+
+/* Abstract OFPT_BUNDLE_CONTROL message. */
 struct ofputil_bundle_ctrl_msg {
-    uint32_t    bundle_id;
-    uint16_t    type;
-    uint16_t    flags;
-};
-
-struct ofputil_bundle_add_msg {
-    uint32_t            bundle_id;
-    uint16_t            flags;
-    const struct ofp_header   *msg;
+    uint32_t bundle_id;
+    uint16_t type;
+    uint16_t flags;
 };
 
 enum ofperr ofputil_decode_bundle_ctrl(const struct ofp_header *,
@@ -46,6 +41,13 @@ struct ofpbuf *ofputil_encode_bundle_ctrl_request(
     enum ofp_version, struct ofputil_bundle_ctrl_msg *);
 struct ofpbuf *ofputil_encode_bundle_ctrl_reply(
     const struct ofp_header *, struct ofputil_bundle_ctrl_msg *);
+
+/* Abstract OFPT_BUNDLE_ADD_MESSAGE message. */
+struct ofputil_bundle_add_msg {
+    uint32_t bundle_id;
+    uint16_t flags;
+    const struct ofp_header *msg;
+};
 
 struct ofpbuf *ofputil_encode_bundle_add(enum ofp_version,
                                          struct ofputil_bundle_add_msg *);
@@ -53,7 +55,7 @@ struct ofpbuf *ofputil_encode_bundle_add(enum ofp_version,
 enum ofperr ofputil_decode_bundle_add(const struct ofp_header *,
                                       struct ofputil_bundle_add_msg *,
                                       enum ofptype *);
-
+
 /* Bundle message as produced by ofp-parse. */
 struct ofputil_bundle_msg {
     enum ofptype type;