diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b6d89decfbd87a338ec99b27fb8311ef48936e51..7333bbad887104f4e583d8077900ff5e892e631e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -29,8 +29,8 @@
 #include <linux/i2c.h>
 #include <linux/usb.h>
 #include <media/tuner.h>
-#include "audiochip.h"
-#include "tveeprom.h"
+#include <media/audiochip.h>
+#include <media/tveeprom.h>
 #include "msp3400.h"
 
 #include "em2820.h"
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index a75a91da70e9f4a0a31cd55832eca6a040493e6c..7913740e672455d3deaabc4c5ca41b2d71c4769e 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -26,9 +26,9 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/videodev.h>
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
+#include <linux/videodev.h>
 
 #include "em2820.h"
 
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a000131a8f5dc7c8b95eeb25e89a81fab2f6f5be..3fc58c67e6cfba52bcd2a46a70f542664cfdc5c2 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/usb.h>
-#include <linux/videodev.h>
 #include <linux/i2c.h>
+#include <linux/videodev.h>
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
 
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index a9bad89b4d69c5fa521a6c3073bc816a070e083d..ee605712bf192b90f9d5d06e6128e34d046d7e87 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -40,7 +40,7 @@
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
-#include "audiochip.h"
+#include <media/audiochip.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 03f360b45fdfcbd532ccca49117c42c502163e04..81e6d4494e7dc95bff0ad37d29e81aac8e28194d 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -5,7 +5,6 @@
  * This code is placed under the terms of the GNU General Public License
  */
 
-#include <linux/videodev.h>
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>