diff --git a/samples/Kconfig b/samples/Kconfig
index 52f4264b300..977980317a7 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 7811cb0289a..382eeae77bd 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