diff --git a/drivers/staging/iio/dac/max517.c b/drivers/staging/iio/dac/max517.c
index ed5d351b2387e0a6abd1a67788cba954a7394fbe..d54262ff0cd660e9f6e1fb8653018c04e7d33809 100644
--- a/drivers/staging/iio/dac/max517.c
+++ b/drivers/staging/iio/dac/max517.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 
 #include "../iio.h"
+#include "../sysfs.h"
 #include "dac.h"
 
 #include "max517.h"
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 36a826e6e65abd5c7de07beb4e291ed2ff2e2948..6b896a511de86e44a48c13431e93c9bb3924139e 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -13,8 +13,6 @@
 
 #include <linux/device.h>
 #include <linux/cdev.h>
-#include <linux/irq.h>
-#include "sysfs.h"
 
 /* IIO TODO LIST */
 /*
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index e83d62609ec00c10b762e76c5c5284faba14d736..f59a603713c7846ab87cd6de64852b874ca8dab6 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -26,6 +26,8 @@
 #include "iio_core.h"
 #include "iio_core_trigger.h"
 #include "chrdev.h"
+#include "sysfs.h"
+
 /* IDA to assign each registered device a unique id*/
 static DEFINE_IDA(iio_ida);
 
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index 947f5425ed78ebd20f0c9296c3bd15f2b566f657..e844246bc32ad87c81e94cfa2289c08b98bc9cfc 100644
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -22,6 +22,7 @@
 
 #include "iio.h"
 #include "iio_core.h"
+#include "sysfs.h"
 #include "ring_generic.h"
 
 
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index da5bb33a66c1a1912a6cd32cec250a24616d7f68..f31e8c2fc5b6ec377c3b32d863ad4bbff4a9dfc0 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -28,7 +28,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include "../iio.h"
-
+#include "../sysfs.h"
 #define CONVERSION_TIME_MS		100
 
 #define ISL29018_REG_ADD_COMMAND1	0x00
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 60d21f3f0603af9ebf232e657e665652fbd3ed1f..bd879ad836a6169146b49c923ef1b196f573fbce 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 
 #include "../iio.h"
+#include "../sysfs.h"
 #include "tsl2563.h"
 
 /* Use this many bits for fraction part. */
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index a17fa9f6a30eb36cc271892f8266ecade6ec6c8b..43936cb43818c3818602e7bc061a3576293e200f 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -31,7 +31,7 @@
 #include <linux/gpio.h>
 
 #include "../iio.h"
-
+#include "../sysfs.h"
 /*
  * Register definitions, as well as various shifts and masks to get at the
  * individual fields of the registers.