From e2263711ba066e4275e6d9138dc10de86d9b08b0 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 2 Oct 2020 10:55:06 +0900
Subject: [PATCH] network: cleanup networkd-route.h

---
 src/network/networkd-ndisc.c             |  1 -
 src/network/networkd-network-gperf.gperf |  1 +
 src/network/networkd-network.h           |  1 -
 src/network/networkd-route.c             |  6 +-----
 src/network/networkd-route.h             | 21 +++++++++++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 256f6cc659..545574e126 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -12,7 +12,6 @@
 #include "networkd-dhcp6.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
-#include "networkd-route.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 3b5056e105..1d899464d8 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -22,6 +22,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 #include "networkd-neighbor.h"
 #include "networkd-nexthop.h"
 #include "networkd-radv.h"
+#include "networkd-route.h"
 #include "networkd-routing-policy-rule.h"
 #include "networkd-sriov.h"
 #include "qdisc.h"
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 8470941709..c56c24656a 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -22,7 +22,6 @@
 #include "networkd-lldp-tx.h"
 #include "networkd-ndisc.h"
 #include "networkd-radv.h"
-#include "networkd-route.h"
 #include "networkd-util.h"
 #include "ordered-set.h"
 #include "resolve-util.h"
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 453a33e1ce..e59f634fb1 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -3,18 +3,14 @@
 #include <linux/icmpv6.h>
 
 #include "alloc-util.h"
-#include "conf-parser.h"
-#include "in-addr-util.h"
-#include "missing_network.h"
 #include "netlink-util.h"
 #include "networkd-ipv4ll.h"
 #include "networkd-manager.h"
-#include "networkd-ndisc.h"
+#include "networkd-network.h"
 #include "networkd-nexthop.h"
 #include "networkd-route.h"
 #include "networkd-routing-policy-rule.h"
 #include "parse-util.h"
-#include "set.h"
 #include "socket-netlink.h"
 #include "string-table.h"
 #include "string-util.h"
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index 676bea3d70..ac545d9b78 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -1,15 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "sd-netlink.h"
+
 #include "conf-parser.h"
-#include "macro.h"
-
-typedef struct Route Route;
-typedef struct NetworkConfigSection NetworkConfigSection;
-
-#include "networkd-network.h"
+#include "in-addr-util.h"
+#include "networkd-link.h"
 #include "networkd-util.h"
 
+typedef struct Manager Manager;
+typedef struct Network Network;
+
 typedef struct MultipathRouteVia {
         uint16_t family;
         union in_addr_union address;
@@ -21,7 +26,7 @@ typedef struct MultipathRoute {
         uint32_t weight;
 } MultipathRoute;
 
-struct Route {
+typedef struct Route {
         Network *network;
         NetworkConfigSection *section;
 
@@ -58,7 +63,7 @@ struct Route {
 
         usec_t lifetime;
         sd_event_source *expire;
-};
+} Route;
 
 void route_hash_func(const Route *route, struct siphash *state);
 int route_compare_func(const Route *a, const Route *b);