diff --git a/[refs] b/[refs]
index e179d09b9a04..4fd47f969b09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9837bbb3e694eef4c55c934ebf1f8a0399b142c
+refs/heads/master: d2c15e2580ac4ed73f0a25a69843d51211e9c620
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbipd.c b/trunk/drivers/staging/usbip/userspace/src/usbipd.c
index ec9faac5ff8f..ccc7dfdd0242 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbipd.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbipd.c
@@ -7,6 +7,7 @@
 #include "../config.h"
 #endif
 
+#include <errno.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <strings.h>
@@ -23,16 +24,15 @@
 
 #define _GNU_SOURCE
 #include <getopt.h>
+#include <glib.h>
 #include <signal.h>
 
-#include "usbip.h"
+#include "stub_driver.h"
+#include "usbip_common.h"
 #include "usbip_network.h"
 
-#include <glib.h>
-
 static const char version[] = PACKAGE_STRING;
 
-
 static int send_reply_devlist(int sockfd)
 {
 	int ret;