diff --git a/Makefile.in b/Makefile.in
index f6bc306d6..45f922d66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -828,6 +828,13 @@ depend:
 	./config.status
 .PHONY: depend
 
+# Include What You Use
+iwyu:
+	# Requires the --keep-going flag as it always returns 1
+	# Can't set MAKEFLAGS on a target-specific basic
+	$(MAKE) -k _iwyu CXX=include-what-you-use
+_iwyu: clean $(PROGRAMS)
+.PHONY: iwyu _iwyu
 
 #
 # Cleanup targets
diff --git a/build_tools/iwyu.sh b/build_tools/iwyu.sh
new file mode 100755
index 000000000..dc36796a0
--- /dev/null
+++ b/build_tools/iwyu.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Reminder of how to run Include What You Use
+
+make iwyu