diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk
index 16f49c4f..559eddb4 100644
--- a/examples/calc++/local.mk
+++ b/examples/calc++/local.mk
@@ -30,10 +30,10 @@ SUFFIXES += .yy .stamp
 $(calc_sources_generated): examples/calc++/calc++-parser.stamp
 	@test -f $@ || rm -f examples/calc++/calc++-parser.stamp
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/calc++/calc++-parser.stamp
-CLEANFILES += 					\
-  $(calc_sources_generated)			\
-  examples/calc++/calc++-parser.output		\
-  examples/calc++/calc++-parser.stamp		\
+CLEANFILES +=                                   \
+  $(calc_sources_generated)                     \
+  examples/calc++/calc++-parser.output          \
+  examples/calc++/calc++-parser.stamp           \
   examples/calc++/calc++-scanner.cc
 
 
diff --git a/src/files.c b/src/files.c
index 91c0c10e..88234bfc 100644
--- a/src/files.c
+++ b/src/files.c
@@ -139,7 +139,10 @@ xfdopen (int fd, char const *mode)
 {
   FILE *res = fdopen (fd, mode);
   if (! res)
-    error (EXIT_FAILURE, get_errno (), "fdopen");
+    error (EXIT_FAILURE, get_errno (),
+           // On a separate line to please the "unmarked_diagnostics"
+           // syntax-check.
+           "fdopen");
   return res;
 }
 
diff --git a/src/output.c b/src/output.c
index 76895d66..58615057 100644
--- a/src/output.c
+++ b/src/output.c
@@ -23,7 +23,6 @@
 
 #include <concat-filename.h>
 #include <configmake.h>
-#include <error.h>
 #include <filename.h>
 #include <get-errno.h>
 #include <quotearg.h>