--- bridge-utils-1.5/libbridge/libbridge_devif.c	2011-03-29 02:52:54.000000000 +0200
+++ src/libbridge/libbridge_devif.c	2015-09-15 16:57:55.333440103 +0200
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 
 #include "libbridge.h"
 #include "libbridge_private.h"
--- bridge-utils-1.5/libbridge/libbridge.h	2011-03-29 02:52:54.000000000 +0200
+++ src/libbridge/libbridge.h	2015-09-15 16:58:50.881862987 +0200
@@ -21,7 +21,10 @@
 
 #include <sys/socket.h>
 #include <linux/if.h>
+#include <netinet/in.h>
 #include <linux/if_bridge.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 /* defined in net/if.h but that conflicts with linux/if.h... */
 extern unsigned int if_nametoindex (const char *__ifname);
@@ -45,7 +48,7 @@
 	struct timeval bridge_max_age;
 	struct timeval bridge_hello_time;
 	struct timeval bridge_forward_delay;
-	u_int16_t root_port;
+	uint16_t root_port;
 	unsigned char stp_enabled;
 	unsigned char topology_change;
 	unsigned char topology_change_detected;
@@ -58,8 +61,8 @@
 
 struct fdb_entry
 {
-	u_int8_t mac_addr[6];
-	u_int16_t port_no;
+	uint8_t mac_addr[6];
+	uint16_t port_no;
 	unsigned char is_local;
 	struct timeval ageing_timer_value;
 };
@@ -69,9 +72,9 @@
 	unsigned port_no;
 	struct bridge_id designated_root;
 	struct bridge_id designated_bridge;
-	u_int16_t port_id;
-	u_int16_t designated_port;
-	u_int8_t priority;
+	uint16_t port_id;
+	uint16_t designated_port;
+	uint8_t priority;
 	unsigned char top_change_ack;
 	unsigned char config_pending;
 	unsigned char state;
--- bridge-utils-1.5/libbridge/libbridge_if.c	2011-03-29 02:52:54.000000000 +0200
+++ src/libbridge/libbridge_if.c	2015-09-15 16:58:30.829710333 +0200
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <sys/ioctl.h>
 
 #include "libbridge.h"