diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index 9a9260c43be4..fc2d29fc7ddb 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -14,7 +14,6 @@
 struct gb_interface {
 	struct device dev;
 	struct gb_control *control;
-	struct gb_svc *svc;
 
 	struct list_head bundles;
 	struct list_head links;	/* greybus_host_device->interfaces */
diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 969c3899e954..5f2b2b43b939 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -9,6 +9,12 @@
 
 #include "greybus.h"
 
+struct gb_svc {
+	struct gb_connection	*connection;
+	u8			version_major;
+	u8			version_minor;
+};
+
 static struct ida greybus_svc_device_id_map;
 
 /*
diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h
index 66497808ee62..ee39479cf9b2 100644
--- a/drivers/staging/greybus/svc.h
+++ b/drivers/staging/greybus/svc.h
@@ -10,12 +10,7 @@
 #ifndef __SVC_H
 #define __SVC_H
 
-struct gb_svc {
-	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
-};
-
+struct gb_svc;
 
 int gb_svc_intf_device_id(struct gb_svc *svc, u8 intf_id, u8 device_id);
 int gb_svc_intf_reset(struct gb_svc *svc, u8 intf_id);