diff --git a/[refs] b/[refs]
index fa14d5c5fe9e..e796010fcea3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 605d9288b3e8a3d15e6f36185c2fc737b6979572
+refs/heads/master: 5e6b83ed8c00f2e2ae5b2413c5907bed735b600d
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 327f60658d94..7d970678f940 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -250,6 +250,8 @@ unifdef-y += isdn.h
 unifdef-y += isdnif.h
 unifdef-y += isdn_divertif.h
 unifdef-y += isdn_ppp.h
+unifdef-y += ivtv.h
+unifdef-y += ivtvfb.h
 unifdef-y += joystick.h
 unifdef-y += kdev_t.h
 unifdef-y += kd.h
diff --git a/trunk/include/linux/ivtv.h b/trunk/include/linux/ivtv.h
index 794b8daa9378..17ca64b5a66c 100644
--- a/trunk/include/linux/ivtv.h
+++ b/trunk/include/linux/ivtv.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTV_H__
 #define __LINUX_IVTV_H__
 
-#ifdef __KERNEL__
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
+#include <linux/compiler.h>
 #include <linux/types.h>
 
 /* ivtv knows several distinct output modes: MPEG streaming,
diff --git a/trunk/include/linux/ivtvfb.h b/trunk/include/linux/ivtvfb.h
index e980ba62ddcc..e20af47b59ad 100644
--- a/trunk/include/linux/ivtvfb.h
+++ b/trunk/include/linux/ivtvfb.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTVFB_H__
 #define __LINUX_IVTVFB_H__
 
-#ifdef __KERNEL__
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
+#include <linux/compiler.h>
 #include <linux/types.h>
 
 /* Framebuffer external API */
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index e466bd54a50e..e65a6bed4e3e 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -55,13 +55,13 @@
  */
 #ifndef __LINUX_VIDEODEV2_H
 #define __LINUX_VIDEODEV2_H
+
 #ifdef __KERNEL__
 #include <linux/time.h>     /* need struct timeval */
-#include <linux/compiler.h> /* need __user */
 #else
-#define __user
 #include <sys/time.h>
 #endif
+#include <linux/compiler.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>