diff --git a/examples/pdf-count-strings.cc b/examples/pdf-count-strings.cc
index 529f6bdc..09c4a1f5 100644
--- a/examples/pdf-count-strings.cc
+++ b/examples/pdf-count-strings.cc
@@ -6,13 +6,11 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <string.h>
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
-#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QUtil.hh>
 
 static char const* whoami = nullptr;
diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc
index 527243a7..56af4a8d 100644
--- a/examples/pdf-create.cc
+++ b/examples/pdf-create.cc
@@ -12,13 +12,11 @@
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
-#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
 #include <memory>
 #include <stdlib.h>
-#include <string.h>
 
 static char const* whoami = nullptr;
 
diff --git a/examples/pdf-filter-tokens.cc b/examples/pdf-filter-tokens.cc
index a99ce70c..8824b391 100644
--- a/examples/pdf-filter-tokens.cc
+++ b/examples/pdf-filter-tokens.cc
@@ -9,12 +9,10 @@
 #include <deque>
 #include <iostream>
 #include <stdlib.h>
-#include <string.h>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
-#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 
diff --git a/examples/pdf-name-number-tree.cc b/examples/pdf-name-number-tree.cc
index f9dcb0fc..e1dfde05 100644
--- a/examples/pdf-name-number-tree.cc
+++ b/examples/pdf-name-number-tree.cc
@@ -3,7 +3,6 @@
 #include <qpdf/QPDFNumberTreeObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <cstring>
 #include <iostream>
 
 static char const* whoami = nullptr;
diff --git a/examples/pdf-overlay-page.cc b/examples/pdf-overlay-page.cc
index 04a1e921..d40bf0e1 100644
--- a/examples/pdf-overlay-page.cc
+++ b/examples/pdf-overlay-page.cc
@@ -5,7 +5,6 @@
 #include <qpdf/QUtil.hh>
 #include <iostream>
 #include <stdlib.h>
-#include <string.h>
 
 // This program demonstrates use of form XObjects to overlay a page
 // from one file onto all pages of another file. The qpdf program's
diff --git a/examples/pdf-parse-content.cc b/examples/pdf-parse-content.cc
index 481633e6..85abcabc 100644
--- a/examples/pdf-parse-content.cc
+++ b/examples/pdf-parse-content.cc
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <stdlib.h>
-#include <string.h>
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>
diff --git a/examples/pdf-set-form-values.cc b/examples/pdf-set-form-values.cc
index 1398c0dd..281e139e 100644
--- a/examples/pdf-set-form-values.cc
+++ b/examples/pdf-set-form-values.cc
@@ -4,9 +4,7 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 static char const* whoami = nullptr;
 
diff --git a/examples/qpdf-job.cc b/examples/qpdf-job.cc
index 614abbe6..c7131f77 100644
--- a/examples/qpdf-job.cc
+++ b/examples/qpdf-job.cc
@@ -1,8 +1,6 @@
-#include <qpdf/QIntC.hh>
 #include <qpdf/QPDFJob.hh>
 #include <qpdf/QUtil.hh>
 
-#include <cstring>
 #include <iostream>
 
 // This program is a simple demonstration of different ways to use the
diff --git a/examples/qpdfjob-c-save-attachment.c b/examples/qpdfjob-c-save-attachment.c
index 39d1f69a..301bf635 100644
--- a/examples/qpdfjob-c-save-attachment.c
+++ b/examples/qpdfjob-c-save-attachment.c
@@ -1,4 +1,3 @@
-#include <qpdf/Constants.h>
 #include <qpdf/qpdfjob-c.h>
 #include <qpdf/qpdflogger-c.h>
 
diff --git a/examples/qpdfjob-remove-annotations.cc b/examples/qpdfjob-remove-annotations.cc
index dfab3f7b..fd8754d5 100644
--- a/examples/qpdfjob-remove-annotations.cc
+++ b/examples/qpdfjob-remove-annotations.cc
@@ -4,7 +4,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <cstring>
 #include <iostream>
 
 // This example demonstrates how we can use the QPDFJob createQPDF and writeQPDF
diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc
index 6402f639..005692ae 100644
--- a/libqpdf/BufferInputSource.cc
+++ b/libqpdf/BufferInputSource.cc
@@ -2,9 +2,7 @@
 
 #include <qpdf/QIntC.hh>
 #include <algorithm>
-#include <limits>
 #include <sstream>
-#include <stdexcept>
 #include <string.h>
 
 BufferInputSource::BufferInputSource(
diff --git a/libqpdf/MD5.cc b/libqpdf/MD5.cc
index 2119349c..57419374 100644
--- a/libqpdf/MD5.cc
+++ b/libqpdf/MD5.cc
@@ -4,10 +4,6 @@
 #include <qpdf/QPDFCryptoProvider.hh>
 #include <qpdf/QUtil.hh>
 
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 MD5::MD5()
diff --git a/libqpdf/Pipeline.cc b/libqpdf/Pipeline.cc
index 3223ac7e..73bd1675 100644
--- a/libqpdf/Pipeline.cc
+++ b/libqpdf/Pipeline.cc
@@ -1,7 +1,5 @@
 #include <qpdf/Pipeline.hh>
 
-#include <qpdf/QUtil.hh>
-
 #include <cstring>
 #include <stdexcept>
 
diff --git a/libqpdf/Pl_AES_PDF.cc b/libqpdf/Pl_AES_PDF.cc
index acb6b3f6..89bde7ce 100644
--- a/libqpdf/Pl_AES_PDF.cc
+++ b/libqpdf/Pl_AES_PDF.cc
@@ -5,7 +5,6 @@
 #include <qpdf/QUtil.hh>
 #include <cstring>
 #include <stdexcept>
-#include <stdlib.h>
 #include <string>
 
 bool Pl_AES_PDF::use_static_iv = false;
diff --git a/libqpdf/Pl_ASCIIHexDecoder.cc b/libqpdf/Pl_ASCIIHexDecoder.cc
index f1c4785b..48836f58 100644
--- a/libqpdf/Pl_ASCIIHexDecoder.cc
+++ b/libqpdf/Pl_ASCIIHexDecoder.cc
@@ -3,7 +3,6 @@
 #include <qpdf/QTC.hh>
 #include <ctype.h>
 #include <stdexcept>
-#include <string.h>
 
 Pl_ASCIIHexDecoder::Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),
diff --git a/libqpdf/Pl_Base64.cc b/libqpdf/Pl_Base64.cc
index 6fb422c1..af5ff0bb 100644
--- a/libqpdf/Pl_Base64.cc
+++ b/libqpdf/Pl_Base64.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
-#include <algorithm>
 #include <cstring>
 #include <stdexcept>
 
diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc
index f7cc4b75..35587875 100644
--- a/libqpdf/Pl_DCT.cc
+++ b/libqpdf/Pl_DCT.cc
@@ -2,12 +2,9 @@
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
-#include <qpdf/QUtil.hh>
 
-#include <cstring>
 #include <setjmp.h>
 #include <stdexcept>
-#include <stdlib.h>
 #include <string>
 
 #if BITS_IN_JSAMPLE != 8
diff --git a/libqpdf/Pl_Function.cc b/libqpdf/Pl_Function.cc
index 853b4212..26551ac8 100644
--- a/libqpdf/Pl_Function.cc
+++ b/libqpdf/Pl_Function.cc
@@ -1,7 +1,5 @@
 #include <qpdf/Pl_Function.hh>
 
-#include <qpdf/QUtil.hh>
-#include <errno.h>
 #include <stdexcept>
 
 Pl_Function::Members::Members(writer_t fn) :
diff --git a/libqpdf/Pl_OStream.cc b/libqpdf/Pl_OStream.cc
index 137b6654..c9d4b1e6 100644
--- a/libqpdf/Pl_OStream.cc
+++ b/libqpdf/Pl_OStream.cc
@@ -1,7 +1,5 @@
 #include <qpdf/Pl_OStream.hh>
 
-#include <qpdf/QUtil.hh>
-#include <errno.h>
 #include <stdexcept>
 
 Pl_OStream::Members::Members(std::ostream& os) :
diff --git a/libqpdf/Pl_QPDFTokenizer.cc b/libqpdf/Pl_QPDFTokenizer.cc
index 5e42d579..b5c3f75e 100644
--- a/libqpdf/Pl_QPDFTokenizer.cc
+++ b/libqpdf/Pl_QPDFTokenizer.cc
@@ -2,9 +2,7 @@
 
 #include <qpdf/BufferInputSource.hh>
 #include <qpdf/QTC.hh>
-#include <qpdf/QUtil.hh>
 #include <stdexcept>
-#include <string.h>
 
 Pl_QPDFTokenizer::Members::Members() :
     filter(nullptr),
diff --git a/libqpdf/Pl_SHA2.cc b/libqpdf/Pl_SHA2.cc
index c54bd7ee..852e5db7 100644
--- a/libqpdf/Pl_SHA2.cc
+++ b/libqpdf/Pl_SHA2.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDFCryptoProvider.hh>
 #include <qpdf/QUtil.hh>
-#include <cstdio>
 #include <stdexcept>
 
 Pl_SHA2::Pl_SHA2(int bits, Pipeline* next) :
diff --git a/libqpdf/Pl_String.cc b/libqpdf/Pl_String.cc
index d946a652..9b57ac2d 100644
--- a/libqpdf/Pl_String.cc
+++ b/libqpdf/Pl_String.cc
@@ -1,7 +1,5 @@
 #include <qpdf/Pl_String.hh>
 
-#include <qpdf/QUtil.hh>
-#include <errno.h>
 #include <stdexcept>
 
 Pl_String::Members::Members(std::string& s) :
diff --git a/libqpdf/QPDFAnnotationObjectHelper.cc b/libqpdf/QPDFAnnotationObjectHelper.cc
index f22207de..c14d98f9 100644
--- a/libqpdf/QPDFAnnotationObjectHelper.cc
+++ b/libqpdf/QPDFAnnotationObjectHelper.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFMatrix.hh>
-#include <qpdf/QPDFNameTreeObjectHelper.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 
diff --git a/libqpdf/QPDFExc.cc b/libqpdf/QPDFExc.cc
index 6f1ef1a0..87fad72a 100644
--- a/libqpdf/QPDFExc.cc
+++ b/libqpdf/QPDFExc.cc
@@ -1,7 +1,5 @@
 #include <qpdf/QPDFExc.hh>
 
-#include <qpdf/QUtil.hh>
-
 QPDFExc::QPDFExc(
     qpdf_error_code_e error_code,
     std::string const& filename,
diff --git a/libqpdf/QPDFParser.cc b/libqpdf/QPDFParser.cc
index 4c43e487..e56fcce3 100644
--- a/libqpdf/QPDFParser.cc
+++ b/libqpdf/QPDFParser.cc
@@ -16,7 +16,6 @@
 #include <qpdf/QPDF_Reserved.hh>
 #include <qpdf/QPDF_Stream.hh>
 #include <qpdf/QPDF_String.hh>
-#include <qpdf/QPDF_Unresolved.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 
diff --git a/libqpdf/QPDFSystemError.cc b/libqpdf/QPDFSystemError.cc
index 8d129bad..65fa3121 100644
--- a/libqpdf/QPDFSystemError.cc
+++ b/libqpdf/QPDFSystemError.cc
@@ -1,6 +1,5 @@
 #include <qpdf/QPDFSystemError.hh>
 
-#include <qpdf/QUtil.hh>
 #include <string.h>
 
 QPDFSystemError::QPDFSystemError(
diff --git a/libqpdf/QPDFXRefEntry.cc b/libqpdf/QPDFXRefEntry.cc
index 77f641b0..0d66028c 100644
--- a/libqpdf/QPDFXRefEntry.cc
+++ b/libqpdf/QPDFXRefEntry.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDFExc.hh>
-#include <qpdf/QUtil.hh>
 
 QPDFXRefEntry::QPDFXRefEntry()
 {
diff --git a/libqpdf/QPDF_Name.cc b/libqpdf/QPDF_Name.cc
index 2fa697cf..11b30086 100644
--- a/libqpdf/QPDF_Name.cc
+++ b/libqpdf/QPDF_Name.cc
@@ -1,8 +1,6 @@
 #include <qpdf/QPDF_Name.hh>
 
 #include <qpdf/QUtil.hh>
-#include <stdio.h>
-#include <string.h>
 
 QPDF_Name::QPDF_Name(std::string const& name) :
     QPDFValue(::ot_name, "name"),
diff --git a/libqpdf/QPDF_String.cc b/libqpdf/QPDF_String.cc
index c3148fa0..51742bdd 100644
--- a/libqpdf/QPDF_String.cc
+++ b/libqpdf/QPDF_String.cc
@@ -5,7 +5,6 @@
 // DO NOT USE ctype -- it is locale dependent for some things, and
 // it's not worth the risk of including it in case it may accidentally
 // be used.
-#include <string.h>
 
 static bool
 is_iso_latin1_printable(char ch)
diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc
index 926353fa..5b72943a 100644
--- a/libqpdf/QPDF_linearization.cc
+++ b/libqpdf/QPDF_linearization.cc
@@ -13,7 +13,6 @@
 #include <qpdf/QUtil.hh>
 
 #include <algorithm>
-#include <iostream>
 #include <math.h>
 #include <string.h>
 
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 03301d9d..72b2a55f 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -9,7 +9,6 @@
 #include <qpdf/QPDFSystemError.hh>
 #include <qpdf/QTC.hh>
 
-#include <cmath>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libqpdf/RC4.cc b/libqpdf/RC4.cc
index 6fc25a86..2d1b783d 100644
--- a/libqpdf/RC4.cc
+++ b/libqpdf/RC4.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDFCryptoProvider.hh>
 
-#include <string.h>
 
 RC4::RC4(unsigned char const* key_data, int key_len) :
     crypto(QPDFCryptoProvider::getImpl())
diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc
index 01987365..e7df8ac3 100644
--- a/libqpdf/qpdf-c.cc
+++ b/libqpdf/qpdf-c.cc
@@ -15,7 +15,6 @@
 #include <qpdf/qpdf-c_impl.hh>
 #include <qpdf/qpdflogger-c_impl.hh>
 
-#include <cstring>
 #include <functional>
 #include <list>
 #include <stdexcept>
diff --git a/libqpdf/qpdfjob-c.cc b/libqpdf/qpdfjob-c.cc
index ddb33349..2e78672f 100644
--- a/libqpdf/qpdfjob-c.cc
+++ b/libqpdf/qpdfjob-c.cc
@@ -1,14 +1,12 @@
 #include <qpdf/qpdfjob-c.h>
 
 #include <qpdf/QPDFJob.hh>
-#include <qpdf/QPDFLogger.hh>
 #include <qpdf/QPDFUsage.hh>
 #include <qpdf/QUtil.hh>
 #include <qpdf/qpdf-c_impl.hh>
 #include <qpdf/qpdflogger-c_impl.hh>
 
 #include <cstdio>
-#include <cstring>
 
 struct _qpdfjob_handle
 {
diff --git a/libqpdf/qpdflogger-c.cc b/libqpdf/qpdflogger-c.cc
index 2a6d1052..c713dfb4 100644
--- a/libqpdf/qpdflogger-c.cc
+++ b/libqpdf/qpdflogger-c.cc
@@ -4,7 +4,6 @@
 
 #include <qpdf/Pipeline.hh>
 #include <qpdf/Pl_Function.hh>
-#include <qpdf/QIntC.hh>
 #include <qpdf/QPDFLogger.hh>
 #include <functional>
 #include <memory>
diff --git a/libtests/arg_parser.cc b/libtests/arg_parser.cc
index 9e3e8da5..6b4c829f 100644
--- a/libtests/arg_parser.cc
+++ b/libtests/arg_parser.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDFArgParser.hh>
 #include <qpdf/QPDFUsage.hh>
-#include <qpdf/QUtil.hh>
 #include <cstring>
 #include <iostream>
 
diff --git a/libtests/bits.cc b/libtests/bits.cc
index 07870eb7..0db956e1 100644
--- a/libtests/bits.cc
+++ b/libtests/bits.cc
@@ -4,7 +4,6 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
 #include <stdlib.h>
 
 // See comments in bits_functions.hh
diff --git a/libtests/closed_file_input_source.cc b/libtests/closed_file_input_source.cc
index e4c8ed36..23b15154 100644
--- a/libtests/closed_file_input_source.cc
+++ b/libtests/closed_file_input_source.cc
@@ -3,8 +3,6 @@
 
 #include <iostream>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 void
 check(std::string const& what, bool result)
diff --git a/libtests/cxx11.cc b/libtests/cxx11.cc
index ac18e13e..5f0dcc9a 100644
--- a/libtests/cxx11.cc
+++ b/libtests/cxx11.cc
@@ -1,6 +1,5 @@
 #include <qpdf/assert_test.h>
 
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <functional>
diff --git a/libtests/dct_uncompress.cc b/libtests/dct_uncompress.cc
index 1ab22e97..5e1e9a33 100644
--- a/libtests/dct_uncompress.cc
+++ b/libtests/dct_uncompress.cc
@@ -5,7 +5,6 @@
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/flate.cc b/libtests/flate.cc
index 77fb440e..1170841b 100644
--- a/libtests/flate.cc
+++ b/libtests/flate.cc
@@ -4,10 +4,8 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <errno.h>
 #include <iostream>
 #include <stdlib.h>
-#include <string.h>
 
 void
 run(char const* filename)
diff --git a/libtests/json_parse.cc b/libtests/json_parse.cc
index 721b17de..ed69784e 100644
--- a/libtests/json_parse.cc
+++ b/libtests/json_parse.cc
@@ -1,6 +1,5 @@
 #include <qpdf/FileInputSource.hh>
 #include <qpdf/JSON.hh>
-#include <qpdf/QUtil.hh>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
diff --git a/libtests/logger_c.c b/libtests/logger_c.c
index 5c4c519a..c3fa0d8c 100644
--- a/libtests/logger_c.c
+++ b/libtests/logger_c.c
@@ -2,7 +2,6 @@
 
 #include <qpdf/qpdflogger-c.h>
 
-#include <qpdf/Constants.h>
 #include <qpdf/qpdfjob-c.h>
 
 #include <stdio.h>
diff --git a/libtests/pointer_holder.cc b/libtests/pointer_holder.cc
index f03c4257..e5a58d17 100644
--- a/libtests/pointer_holder.cc
+++ b/libtests/pointer_holder.cc
@@ -7,7 +7,6 @@
 
 #include <iostream>
 #include <list>
-#include <stdlib.h>
 
 class Object
 {
diff --git a/libtests/predictors.cc b/libtests/predictors.cc
index a8f6c5d9..f0bde79a 100644
--- a/libtests/predictors.cc
+++ b/libtests/predictors.cc
@@ -6,7 +6,6 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <errno.h>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index 66264d19..b9012db9 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -3,15 +3,11 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QPDFSystemError.hh>
 #include <qpdf/QUtil.hh>
-#include <fcntl.h>
 #include <fstream>
 #include <iostream>
 #include <limits.h>
-#include <locale>
 #include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #ifdef _WIN32
 # include <io.h>
diff --git a/libtests/random.cc b/libtests/random.cc
index ad7d105d..40ef7d47 100644
--- a/libtests/random.cc
+++ b/libtests/random.cc
@@ -1,7 +1,6 @@
 #include <qpdf/InsecureRandomDataProvider.hh>
 #include <qpdf/QUtil.hh>
 #include <qpdf/SecureRandomDataProvider.hh>
-#include <qpdf/qpdf-config.h>
 #include <iostream>
 
 class BogusRandomDataProvider: public RandomDataProvider
diff --git a/libtests/sha2.cc b/libtests/sha2.cc
index 65b70c39..46ccd5c2 100644
--- a/libtests/sha2.cc
+++ b/libtests/sha2.cc
@@ -1,7 +1,6 @@
 #include <qpdf/Pl_SHA2.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
 #include <string.h>
 
 static void
diff --git a/qpdf/pdf_from_scratch.cc b/qpdf/pdf_from_scratch.cc
index bdcdaae1..4e1c6553 100644
--- a/qpdf/pdf_from_scratch.cc
+++ b/qpdf/pdf_from_scratch.cc
@@ -3,7 +3,6 @@
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
-#include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
 #include <stdio.h>
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index ea7f338a..815a86b4 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -4,7 +4,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <cstring>
 #include <iostream>
 
 static char const* whoami = 0;
diff --git a/qpdf/qpdfjob-ctest.c b/qpdf/qpdfjob-ctest.c
index 31f22d28..62da7fe5 100644
--- a/qpdf/qpdfjob-ctest.c
+++ b/qpdf/qpdfjob-ctest.c
@@ -2,7 +2,6 @@
 
 #include <qpdf/qpdfjob-c.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #ifndef QPDF_NO_WCHAR_T
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc
index 4a5d0ae8..39631d21 100644
--- a/qpdf/test_driver.cc
+++ b/qpdf/test_driver.cc
@@ -26,7 +26,6 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <algorithm>
 #include <iostream>
 #include <limits.h>
 #include <map>
diff --git a/qpdf/test_renumber.cc b/qpdf/test_renumber.cc
index 7edec21b..1b828128 100644
--- a/qpdf/test_renumber.cc
+++ b/qpdf/test_renumber.cc
@@ -1,4 +1,3 @@
-#include <qpdf/Buffer.hh>
 #include <qpdf/Constants.h>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjGen.hh>
@@ -6,7 +5,6 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QPDFXRefEntry.hh>
 
-#include <algorithm>
 #include <cstdlib>
 #include <iostream>
 #include <set>
diff --git a/qpdf/test_shell_glob.cc b/qpdf/test_shell_glob.cc
index c2cfb422..492e117d 100644
--- a/qpdf/test_shell_glob.cc
+++ b/qpdf/test_shell_glob.cc
@@ -1,5 +1,4 @@
 #include <qpdf/QUtil.hh>
-#include <cstring>
 #include <iostream>
 
 int
diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc
index f465cd46..83d3e1c8 100644
--- a/qpdf/test_tokenizer.cc
+++ b/qpdf/test_tokenizer.cc
@@ -4,7 +4,6 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
-#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFTokenizer.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
diff --git a/qpdf/test_xref.cc b/qpdf/test_xref.cc
index d01ac046..6ecb9a00 100644
--- a/qpdf/test_xref.cc
+++ b/qpdf/test_xref.cc
@@ -1,11 +1,8 @@
 #include <qpdf/QPDF.hh>
-#include <qpdf/QPDFObjGen.hh>
-#include <qpdf/QPDFXRefEntry.hh>
 
 #include <cstdlib>
 #include <iostream>
 #include <map>
-#include <string>
 
 int
 main(int argc, char* argv[])