diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index a3f7ba2d76..fde3e861c4 100644
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -416,6 +416,17 @@ struct bgp_aggregate {
 	/* AS set generation. */
 	uint8_t as_set;
 
+	/* Optional modify flag to override ORIGIN */
+	uint8_t origin;
+
+	/** Are there MED mismatches? */
+	bool med_mismatched;
+	/* MED matching state. */
+	/** Did we get the first MED value? */
+	bool med_initialized;
+	/** Match only equal MED. */
+	bool match_med;
+
 	/* Route-map for aggregated route. */
 	struct {
 		char *name;
@@ -431,9 +442,6 @@ struct bgp_aggregate {
 	/* Count of routes of origin type egp under this aggregate. */
 	unsigned long egp_origin_count;
 
-	/* Optional modify flag to override ORIGIN */
-	uint8_t origin;
-
 	/* Hash containing the communities of all the
 	 * routes under this aggregate.
 	 */
@@ -469,13 +477,6 @@ struct bgp_aggregate {
 	/* SAFI configuration. */
 	safi_t safi;
 
-	/** Match only equal MED. */
-	bool match_med;
-	/* MED matching state. */
-	/** Did we get the first MED value? */
-	bool med_initialized;
-	/** Are there MED mismatches? */
-	bool med_mismatched;
 	/** MED value found in current group. */
 	uint32_t med_matched_value;