diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index f6ad27412797..d035420c7bfb 100644
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -10,6 +10,7 @@
  */
 
 #include "driver.h"
+#include "audio.h"
 
 #include <sound/core.h>
 #include <sound/initval.h>
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index 6660c0b4cc5c..a4628bd61cac 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -18,6 +18,7 @@
 #include "audio.h"
 #include "pcm.h"
 #include "pod.h"
+#include "capture.h"
 
 
 /*
diff --git a/drivers/staging/line6/midibuf.c b/drivers/staging/line6/midibuf.c
index 2f86c6692516..1f5934e32124 100644
--- a/drivers/staging/line6/midibuf.c
+++ b/drivers/staging/line6/midibuf.c
@@ -16,7 +16,7 @@
 #include "midibuf.h"
 
 
-int midibuf_message_length(unsigned char code)
+static int midibuf_message_length(unsigned char code)
 {
 	if(code < 0x80)
 		return -1;
@@ -59,12 +59,12 @@ void midibuf_status(struct MidiBuffer *this)
 				 this->size, this->split, this->pos_read, this->pos_write, this->full, this->command_prev);
 }
 
-int midibuf_is_empty(struct MidiBuffer *this)
+static int midibuf_is_empty(struct MidiBuffer *this)
 {
 	return (this->pos_read == this->pos_write) && !this->full;
 }
 
-int midibuf_is_full(struct MidiBuffer *this)
+static int midibuf_is_full(struct MidiBuffer *this)
 {
 	return this->full;
 }
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index c86e89c59f07..c30c627efdd7 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -18,6 +18,7 @@
 #include "audio.h"
 #include "pcm.h"
 #include "pod.h"
+#include "playback.h"
 
 
 /*
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index eba804f2b17c..614e9dc2ad19 100644
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -398,7 +398,7 @@ void pod_midi_postprocess(struct usb_line6_pod *pod, unsigned char *data, int le
 /*
 	Send channel number (i.e., switch to a different sound).
 */
-void pod_send_channel(struct usb_line6_pod *pod, int value)
+static void pod_send_channel(struct usb_line6_pod *pod, int value)
 {
 	line6_invalidate_current(&pod->dumpreq);
 
@@ -951,7 +951,7 @@ static void pod_destruct(struct usb_interface *interface)
 /*
 	Create sysfs entries.
 */
-int pod_create_files2(struct device *dev)
+static int pod_create_files2(struct device *dev)
 {
 	int err;
 
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index b27764769296..f25493dde797 100644
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -392,7 +392,7 @@ static void variax_destruct(struct usb_interface *interface)
 /*
 	Create sysfs entries.
 */
-int variax_create_files2(struct device *dev)
+static int variax_create_files2(struct device *dev)
 {
 	int err;
 	CHECK_RETURN(device_create_file(dev, &dev_attr_model));