diff --git a/[refs] b/[refs]
index 1d9df55ca3c0..7fb45d60cb23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c826b66cc6f91831b5473a0ddceb410d4ffaf0
+refs/heads/master: b544f3fd3ac509850f8f1c28b302ae4e65b88346
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 3c9b616c834a..137dd4bb4ba7 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -381,6 +381,7 @@ header-y += unistd.h
 header-y += usbdevice_fs.h
 header-y += utime.h
 header-y += utsname.h
+header-y += uuid.h
 header-y += uvcvideo.h
 header-y += v4l2-mediabus.h
 header-y += v4l2-subdev.h
diff --git a/trunk/include/linux/uuid.h b/trunk/include/linux/uuid.h
index 5b7efbfcee4e..f86c37bfd4a0 100644
--- a/trunk/include/linux/uuid.h
+++ b/trunk/include/linux/uuid.h
@@ -54,6 +54,8 @@ typedef struct {
 	UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\
 		0x00, 0x00, 0x00, 0x00)
 
+#ifdef __KERNEL__
+
 static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2)
 {
 	return memcmp(&u1, &u2, sizeof(uuid_le));
@@ -67,4 +69,6 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2)
 extern void uuid_le_gen(uuid_le *u);
 extern void uuid_be_gen(uuid_be *u);
 
+#endif /* __KERNEL__ */
+
 #endif