diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index f67938cb5a156e37bbf67a6a574249c1d750e5be..0e5206ab5d094930d3f30ad012057d5a4d213f67 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -31,6 +31,8 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index a2a190ebcdd86f90a7e890fbc48c81759e9767b8..071556268d949f05d7954eee626e0d43fdf51363 100644
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -26,6 +26,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 33cb5d5a9b84514f6ef691a0265c12f2e21f6163..1184fffce0d1091b9977d39890255569c80473fb 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -28,6 +28,8 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index dd625855b08fc9144ccdba19607d9cc509132227..0128b50f5a9dc4d0df3e0379bfbe0d3174d099cc 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -28,6 +28,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 2efac38dfd8c45f68b3d36103667ef500590d6c1..a28fc31ca850646cf7070e581eb8ae80a301f9dc 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -25,6 +25,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/hv_api.h b/drivers/staging/hv/hv_api.h
index 43a722888dc4f88247d561de2be90dceb6571f8c..b24493a9980b596a2bc7a9d1acb06a0eecc0d1dd 100644
--- a/drivers/staging/hv/hv_api.h
+++ b/drivers/staging/hv/hv_api.h
@@ -23,11 +23,6 @@
 #ifndef __HV_API_H
 #define __HV_API_H
 
-struct hv_guid {
-	unsigned char data[16];
-};
-
-
 
 /* Status codes for hypervisor operations. */
 
diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c
index c71a1486544d39ff07b94aa7e1c2fefce84e457a..04875c2f0933ed2c118c208488ae039d811f5a66 100644
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/staging/hv/hv_kvp.c
@@ -27,6 +27,7 @@
 #include <linux/connector.h>
 #include <linux/workqueue.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index af4db6422635f96195d3c3d427b46f2e528d5d22..78db75d127be53a92b17a5e79267997f5493a519 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -26,6 +26,7 @@
 #include <linux/dmi.h>
 #include <linux/delay.h>
 
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index ea76ddaa5fcd054b2818e152003cdde0e9013d09..672a5961d63bea0e859a36a80e67323d69419529 100644
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -29,6 +29,7 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 24e42b39efc6434503484db3f04b3e6b42d54d42..32193119de0c21be9d202ece30b466756da5cd6d 100644
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -21,3 +21,13 @@
  *   K. Y. Srinivasan <kys@microsoft.com>
  *
  */
+
+#ifndef _HYPERV_H
+#define _HYPERV_H
+
+struct hv_guid {
+	unsigned char data[16];
+};
+
+
+#endif /* _HYPERV_H */
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 4eb448226ef10c4f117cc162908be825e4adc771..368ac68b7c618de702af8562541fe8306c392667 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -27,6 +27,8 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "netvsc.h"
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index c5e7b93692e095b761afcbd49f6e39cb5a5860f8..93c9ee1c6059889c239a6e181f6ee9c86d4bed48 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -38,6 +38,8 @@
 #include <net/route.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index badf52ad241642ca093fa66e2c36d57a6011d7d9..809bce28aea7c179cc9dfbdfa905d99d10a37d73 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -25,6 +25,8 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "ring_buffer.h"
 
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index 20378365b108457434ea5f2d9cea8390e5e7e4a5..5eff454bf585332dcb18ec609b90cb59ab9d8909 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -26,6 +26,8 @@
 #include <linux/io.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "netvsc_api.h"
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 8d7a49038178df9d58648453e4ac13db8163f8c2..4ffcf5f3bcf2ac94c242beb9e9059e86e47fca0b 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "storvsc_api.h"
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 907d85568cc17ead38d81ef63130187670c1b1ff..c0633e9eceac637392e8cd9918b6746de7af169d 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -32,6 +32,8 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 5dcd87a972a4888be1417bc8fc2e98cf097ae4e7..2b2ada7f33869430f5edb94a7134b7bebe4bf556 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -34,6 +34,8 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "version_info.h"
 #include "hv_api.h"
 #include "logging.h"