vconn: Remove unnecessary forward declarations and #includes from header.

This required fix-ups in a few other files that accidentally depended upon
vconn.h including those other headers.

diff --git a/lib/vconn.h b/lib/vconn.h
index 3c1ffe9c2bb71074c756583b4371c95b26131d96..74b6b49cbf02f6b9f4e5f68bca7784c2a44b04fa 100644 (file)
--- a/lib/vconn.h
+++ b/lib/vconn.h
@@ -17,12 +17,8 @@
 #ifndef VCONN_H
 #define VCONN_H 1
 
-#include <assert.h>
 #include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "flow.h"
+#include "openvswitch/types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,10 +26,6 @@ extern "C" {
 
 struct list;
 struct ofpbuf;
-struct ofp_action_header;
-struct ofp_header;
-struct ofp_match;
-struct ofp_stats_msg;
 struct pvconn;
 struct vconn;
 

diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c
index 695d9b46a8231847e406009da6d5918a48f2290f..6d7eb1301ca7c5000bd2771571e6df72c758624e 100644 (file)
--- a/ofproto/pinsched.c
+++ b/ofproto/pinsched.c
@@ -21,6 +21,7 @@
 #include <arpa/inet.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include "hash.h"
 #include "hmap.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"

diff --git a/tests/test-vconn.c b/tests/test-vconn.c
index 2b14fa85d1858d873d32d1d034ef4bcbfbff69a4..42940c302ce8f7d839cb291918e318f243cd518e 100644 (file)
--- a/tests/test-vconn.c
+++ b/tests/test-vconn.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "command-line.h"
+#include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "socket-util.h"
 #include "stream.h"

diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
index 4910d699c3c41e126023f237c169f319aa354794..359e3ab1a5ce75683815796eb6bacd9a603e7209 100644 (file)
--- a/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@ -34,6 +34,7 @@
 #include "dummy.h"
 #include "leak-checker.h"
 #include "netdev.h"
+#include "openflow/openflow.h"
 #include "ovsdb-idl.h"
 #include "poll-loop.h"
 #include "process.h"