diff --git a/Makefile.in b/Makefile.in
index d8a79811c..ff47a22f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,39 +78,50 @@ XGETTEXT_OPTS = -F -k_ -kN_ -kU_ --copyright-holder="Todd C. Miller" \
 		--flag easprintf:3:c-format --flag lbuf_append:2:c-format \
 		--flag lbuf_append_quoted:3:c-format --foreign-user
 
+# Default cppcheck options when run from the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 all: config.status
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 check pre-install: config.status
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
+cppcheck: config.status
+	rval=0; \
+	for d in $(SUBDIRS); do \
+	    echo checking $$d; \
+	    (cd $$d && exec $(MAKE) CPPCHECK_OPTS="$(CPPCHECK_OPTS)" $@) || rval=`expr $$rval + $$?`; \
+	done; \
+	exit $$rval
+
 install-dirs install-binaries install-includes install-plugin: config.status pre-install
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 install-doc: config.status ChangeLog
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 install: config.status ChangeLog pre-install install-nls
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 uninstall: uninstall-nls
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
diff --git a/common/Makefile.in b/common/Makefile.in
index aed7b5f97..98fb05908 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -54,6 +54,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Regression tests
 TEST_PROGS = conf_test parseln_test hltq_test
 TEST_LIBS = @LIBS@ @LIBINTL@ ../compat/libreplace.la
@@ -115,6 +118,9 @@ install-plugin:
 
 uninstall:
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c
+
 check: $(TEST_PROGS)
 	@if test X"$(cross_compiling)" != X"yes"; then \
 	    passed=0; failed=0; total=0; \
diff --git a/compat/Makefile.in b/compat/Makefile.in
index 843200e38..38d4371c6 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -54,6 +54,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # OS dependent defines
 DEFS = @OSDEFS@
 
@@ -130,6 +133,9 @@ install-plugin:
 
 uninstall:
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c
+
 check: $(TEST_PROGS)
 	@if test X"$(cross_compiling)" != X"yes"; then \
 	    if test -f fnm_test; then \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5ed4f0144..1f6b51a12 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -343,6 +343,8 @@ uninstall:
 		$(DESTDIR)$(mandirform)/sudoers.$(mansectform) \
 		$(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
 
+cppcheck:
+
 check:
 
 clean:
diff --git a/include/Makefile.in b/include/Makefile.in
index 42058ddfa..e48620f3f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -72,6 +72,8 @@ install-plugin:
 uninstall:
 	-rm -f $(DESTDIR)$(includedir)/sudo_plugin.h
 
+cppcheck:
+
 check:
 
 clean:
diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in
index 8370d48db..894daf8c2 100644
--- a/plugins/group_file/Makefile.in
+++ b/plugins/group_file/Makefile.in
@@ -55,6 +55,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Where to install things...
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -126,6 +129,9 @@ install-plugin: install-dirs group_file.la
 uninstall:
 	-rm -f $(DESTDIR)$(plugindir)/group_file.so
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c
+
 check:
 
 clean:
diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index 37f7e5c08..24265b6cb 100644
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -54,6 +54,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Where to install things...
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -125,6 +128,9 @@ install-plugin: install-dirs sample_plugin.la
 uninstall:
 	-rm -f $(DESTDIR)$(plugindir)/sample_plugin.so
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c
+
 check:
 
 clean:
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 5a7c653e1..b4c4965c1 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -70,6 +70,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Where to install things...
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -318,6 +321,9 @@ uninstall:
 	-cmp $(DESTDIR)$(sudoersdir)/sudoers $(srcdir)/sudoers >/dev/null && \
 	    rm -f $(DESTDIR)$(sudoersdir)/sudoers
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(devdir) -I$(srcdir) -I$(top_srcdir) $(srcdir)/*.c $(srcdir)/auth/*.c
+
 check: $(TEST_PROGS) visudo testsudoers
 	@if test X"$(cross_compiling)" != X"yes"; then \
 	    rval=0; \
diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in
index 0ab968c4d..0d7440984 100644
--- a/plugins/system_group/Makefile.in
+++ b/plugins/system_group/Makefile.in
@@ -55,6 +55,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Where to install things...
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -126,6 +129,9 @@ install-plugin: install-dirs system_group.la
 uninstall:
 	-rm -f $(DESTDIR)$(plugindir)/system_group.so
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c
+
 check:
 
 clean:
diff --git a/src/Makefile.in b/src/Makefile.in
index d418971a6..83c8a2e4a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -55,6 +55,9 @@ PIE_LDFLAGS = @PIE_LDFLAGS@
 SSP_CFLAGS = @SSP_CFLAGS@
 SSP_LDFLAGS = @SSP_LDFLAGS@
 
+# cppcheck options, usually set in the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 # Where to install things...
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -160,6 +163,9 @@ uninstall:
 		$(DESTDIR)$(libexecdir)/sudo/sesh \
 		$(DESTDIR)$(noexecdir)/$(noexecfile)
 
+cppcheck:
+	cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) -I$(top_srcdir) $(srcdir)/*.c
+
 check: $(TEST_PROGS)
 	./check_ttyname
 
diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index ab2342c36..6a8673c25 100644
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -74,6 +74,8 @@ install-plugin:
 
 uninstall:
 
+cppcheck:
+
 check:
 
 clean: