diff --git a/samples/Kconfig b/samples/Kconfig
index 52f4264b30065b1b5d1c51b48559dd4d10466384..977980317a7d764c51b794ba6034efc83c31d0dd 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -62,8 +62,8 @@ config SAMPLE_KDB
 	  command to the kdb shell.
 
 config SAMPLE_HIDRAW
-	tristate "Build simple hidraw example"
-	depends on HIDRAW
+	bool "Build simple hidraw example"
+	depends on HIDRAW && HEADERS_CHECK
 	help
 	  Build an example of how to use hidraw from userspace.
 
diff --git a/samples/hidraw/Makefile b/samples/hidraw/Makefile
index 7811cb0289aa74c81049601b3cff52a96f172198..382eeae77bd6437f30b2478a349a259e0434b444 100644
--- a/samples/hidraw/Makefile
+++ b/samples/hidraw/Makefile
@@ -6,3 +6,5 @@ hostprogs-y := hid-example
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
+
+HOSTCFLAGS_hid-example.o += -I$(objtree)/usr/include