Rerun format_code (after merging clang-tidy PR)

65 files changed, 91 insertions, 105 deletions

diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc
index d507f559..8128fed1 100644
--- a/examples/pdf-bookmarks.cc
+++ b/examples/pdf-bookmarks.cc
@@ -4,9 +4,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 // This program demonstrates extraction of bookmarks using the qpdf
 // outlines API. Note that all the information shown by this program
diff --git a/examples/pdf-count-strings.cc b/examples/pdf-count-strings.cc
index 93676375..e9eb827d 100644
--- a/examples/pdf-count-strings.cc
+++ b/examples/pdf-count-strings.cc
@@ -4,8 +4,8 @@
 // that uses QPDFObjectHandle::TokenFilter with addContentTokenFilter.
 //
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QPDF.hh>
diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc
index 64ae5cb8..641572d0 100644
--- a/examples/pdf-create.cc
+++ b/examples/pdf-create.cc
@@ -14,9 +14,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
+#include <cstdlib>
 #include <iostream>
 #include <memory>
-#include <cstdlib>
 
 static char const* whoami = nullptr;
 
diff --git a/examples/pdf-custom-filter.cc b/examples/pdf-custom-filter.cc
index d99c6ab2..c2d4a441 100644
--- a/examples/pdf-custom-filter.cc
+++ b/examples/pdf-custom-filter.cc
@@ -200,8 +200,7 @@ class StreamReplacer: public QPDFObjectHandle::StreamDataProvider
   public:
     StreamReplacer(QPDF* pdf);
     ~StreamReplacer() override = default;
-    void
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerStream(
         QPDFObjectHandle stream,
diff --git a/examples/pdf-double-page-size.cc b/examples/pdf-double-page-size.cc
index d1fb3344..1c9cb3e5 100644
--- a/examples/pdf-double-page-size.cc
+++ b/examples/pdf-double-page-size.cc
@@ -4,9 +4,9 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
diff --git a/examples/pdf-filter-tokens.cc b/examples/pdf-filter-tokens.cc
index fb6f542c..9cfd3949 100644
--- a/examples/pdf-filter-tokens.cc
+++ b/examples/pdf-filter-tokens.cc
@@ -6,9 +6,9 @@
 //
 
 #include <algorithm>
+#include <cstdlib>
 #include <deque>
 #include <iostream>
-#include <cstdlib>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>
diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc
index fae305b1..a7fa15fd 100644
--- a/examples/pdf-invert-images.cc
+++ b/examples/pdf-invert-images.cc
@@ -5,9 +5,9 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
@@ -34,8 +34,7 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider
 {
   public:
     ~ImageInverter() override = default;
-    void
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerImage(
         QPDFObjectHandle image,
diff --git a/examples/pdf-mod-info.cc b/examples/pdf-mod-info.cc
index 196ce979..a77070d2 100644
--- a/examples/pdf-mod-info.cc
+++ b/examples/pdf-mod-info.cc
@@ -5,10 +5,10 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* version = "1.1";
 static char const* whoami = nullptr;
diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc
index e98d1365..59598cfd 100644
--- a/examples/pdf-npages.cc
+++ b/examples/pdf-npages.cc
@@ -1,6 +1,6 @@
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>
diff --git a/examples/pdf-overlay-page.cc b/examples/pdf-overlay-page.cc
index 5c7bf46f..5b74d58b 100644
--- a/examples/pdf-overlay-page.cc
+++ b/examples/pdf-overlay-page.cc
@@ -3,8 +3,8 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 // 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 968c980b..888656e5 100644
--- a/examples/pdf-parse-content.cc
+++ b/examples/pdf-parse-content.cc
@@ -1,5 +1,5 @@
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 #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 d13f0608..a41cb3f7 100644
--- a/examples/pdf-set-form-values.cc
+++ b/examples/pdf-set-form-values.cc
@@ -3,8 +3,8 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
diff --git a/examples/pdf-split-pages.cc b/examples/pdf-split-pages.cc
index 6a4f149b..e8320201 100644
--- a/examples/pdf-split-pages.cc
+++ b/examples/pdf-split-pages.cc
@@ -10,9 +10,9 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
-#include <cstdlib>
 #include <string>
 
 static bool static_id = false;
diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index 06615e2c..ab92bd53 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -25,8 +25,8 @@
 #include <qpdf/DLL.h>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 
-#include <memory>
 #include <cstddef>
+#include <memory>
 
 class Buffer
 {
diff --git a/include/qpdf/InputSource.hh b/include/qpdf/InputSource.hh
index c66066fb..631ab75f 100644
--- a/include/qpdf/InputSource.hh
+++ b/include/qpdf/InputSource.hh
@@ -26,8 +26,8 @@
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 #include <qpdf/Types.h>
 
-#include <memory>
 #include <cstdio>
+#include <memory>
 #include <string>
 
 // Remember to use QPDF_DLL_CLASS on anything derived from InputSource
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index f1dcb7f7..e43bf4c5 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -25,12 +25,12 @@
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
 
+#include <cstdio>
 #include <functional>
 #include <iostream>
 #include <list>
 #include <map>
 #include <memory>
-#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -113,8 +113,8 @@ class QPDF
     // your own method of retrieving a PDF file, you can subclass
     // InputSource and use this method.
     QPDF_DLL
-    void
-    processInputSource(std::shared_ptr<InputSource>, char const* password = nullptr);
+    void processInputSource(
+        std::shared_ptr<InputSource>, char const* password = nullptr);
 
     // Create a PDF from an input source that contains JSON as written
     // by writeJSON (or qpdf --json-output, version 2 or higher). The
diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh
index 51b54d80..27ab96d3 100644
--- a/include/qpdf/QPDFJob.hh
+++ b/include/qpdf/QPDFJob.hh
@@ -497,7 +497,8 @@ class QPDFJob
 
     // Helper functions
     static void usage(std::string const& msg);
-    static JSON json_schema(int json_version, std::set<std::string>* keys = nullptr);
+    static JSON
+    json_schema(int json_version, std::set<std::string>* keys = nullptr);
     static void parse_object_id(
         std::string const& objspec, bool& trailer, int& obj, int& gen);
     void parseRotationParameter(std::string const&);
diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh
index 9f647c70..ffc515e0 100644
--- a/include/qpdf/QPDFPageObjectHelper.hh
+++ b/include/qpdf/QPDFPageObjectHelper.hh
@@ -319,8 +319,8 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
     // contents, as happens with addContentTokenFilter. See
     // examples/pdf-count-strings.cc for an example.
     QPDF_DLL
-    void
-    filterContents(QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
+    void filterContents(
+        QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
 
     // Old name -- calls filterContents()
     QPDF_DLL
diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh
index 4de7a637..5dd8f9d8 100644
--- a/include/qpdf/QPDFTokenizer.hh
+++ b/include/qpdf/QPDFTokenizer.hh
@@ -27,8 +27,8 @@
 #include <qpdf/InputSource.hh>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 
-#include <memory>
 #include <cstdio>
+#include <memory>
 #include <string>
 
 class QPDFTokenizer
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index 162d4f4e..0d445177 100644
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@@ -29,12 +29,12 @@
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
 
+#include <cstdio>
 #include <functional>
 #include <list>
 #include <map>
 #include <memory>
 #include <set>
-#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh
index 2f7f15b2..85224059 100644
--- a/include/qpdf/QUtil.hh
+++ b/include/qpdf/QUtil.hh
@@ -25,14 +25,14 @@
 #include <qpdf/DLL.h>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 #include <qpdf/Types.h>
+#include <cstdio>
 #include <cstring>
+#include <ctime>
 #include <functional>
 #include <list>
 #include <memory>
 #include <stdexcept>
-#include <cstdio>
 #include <string>
-#include <ctime>
 #include <vector>
 
 class RandomDataProvider;
diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc
index 33ab44f6..4fff642a 100644
--- a/libqpdf/BufferInputSource.cc
+++ b/libqpdf/BufferInputSource.cc
@@ -2,8 +2,8 @@
 
 #include <qpdf/QIntC.hh>
 #include <algorithm>
-#include <sstream>
 #include <cstring>
+#include <sstream>
 
 BufferInputSource::BufferInputSource(
     std::string const& description, Buffer* buf, bool own_memory) :
diff --git a/libqpdf/InputSource.cc b/libqpdf/InputSource.cc
index 3a4bb88a..acb459d9 100644
--- a/libqpdf/InputSource.cc
+++ b/libqpdf/InputSource.cc
@@ -2,8 +2,8 @@
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 void
 InputSource::setLastOffset(qpdf_offset_t offset)
diff --git a/libqpdf/Pl_ASCII85Decoder.cc b/libqpdf/Pl_ASCII85Decoder.cc
index e43b4a86..6280c362 100644
--- a/libqpdf/Pl_ASCII85Decoder.cc
+++ b/libqpdf/Pl_ASCII85Decoder.cc
@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCII85Decoder.hh>
 
 #include <qpdf/QTC.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),
diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index ff200643..639bff1a 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -1,9 +1,9 @@
 #include <qpdf/Pl_Buffer.hh>
 
 #include <algorithm>
-#include <stdexcept>
 #include <cstdlib>
 #include <cstring>
+#include <stdexcept>
 
 Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),
diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc
index 299b48b1..c9a43c06 100644
--- a/libqpdf/Pl_DCT.cc
+++ b/libqpdf/Pl_DCT.cc
@@ -24,8 +24,7 @@ namespace
 static void
 error_handler(j_common_ptr cinfo)
 {
-    auto* jerr =
-        reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
+    auto* jerr = reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
     char buf[JMSG_LENGTH_MAX];
     (*cinfo->err->format_message)(cinfo, buf);
     jerr->msg = buf;
@@ -261,8 +260,7 @@ jpeg_buffer_src(j_decompress_ptr cinfo, Buffer* buffer)
 void
 Pl_DCT::compress(void* cinfo_p, Buffer* b)
 {
-    auto* cinfo =
-        reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
+    auto* cinfo = reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
 
 #if ( \
     (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
@@ -316,8 +314,7 @@ Pl_DCT::compress(void* cinfo_p, Buffer* b)
 void
 Pl_DCT::decompress(void* cinfo_p, Buffer* b)
 {
-    auto* cinfo =
-        reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
+    auto* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
 
 #if ( \
     (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc
index 3356ea4f..aa9257fb 100644
--- a/libqpdf/Pl_LZWDecoder.cc
+++ b/libqpdf/Pl_LZWDecoder.cc
@@ -3,8 +3,8 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 Pl_LZWDecoder::Pl_LZWDecoder(
     char const* identifier, Pipeline* next, bool early_code_change) :
diff --git a/libqpdf/Pl_PNGFilter.cc b/libqpdf/Pl_PNGFilter.cc
index 41088e1a..31ef3cc8 100644
--- a/libqpdf/Pl_PNGFilter.cc
+++ b/libqpdf/Pl_PNGFilter.cc
@@ -4,8 +4,8 @@
 #include <qpdf/QUtil.hh>
 
 #include <climits>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 static int
 abs_diff(int a, int b)
diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc
index 45b6d396..ad620f62 100644
--- a/libqpdf/Pl_TIFFPredictor.cc
+++ b/libqpdf/Pl_TIFFPredictor.cc
@@ -6,8 +6,8 @@
 #include <qpdf/QUtil.hh>
 
 #include <climits>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 #include <vector>
 
 Pl_TIFFPredictor::Pl_TIFFPredictor(
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 56a18ccd..39a4a630 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -4,13 +4,13 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cstdlib>
+#include <cstring>
 #include <limits>
 #include <map>
 #include <memory.h>
 #include <regex>
 #include <sstream>
-#include <cstdlib>
-#include <cstring>
 #include <vector>
 
 #include <qpdf/BufferInputSource.hh>
@@ -2528,9 +2528,7 @@ QPDF::getCompressibleObjGens()
         if (obj.isStream()) {
             QPDFObjectHandle dict = obj.getDict();
             std::set<std::string> keys = dict.getKeys();
-            for (auto iter = keys.rbegin();
-                 iter != keys.rend();
-                 ++iter) {
+            for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
                 std::string const& key = *iter;
                 QPDFObjectHandle value = dict.getKey(key);
                 if (key == "/Length") {
@@ -2544,9 +2542,7 @@ QPDF::getCompressibleObjGens()
             }
         } else if (obj.isDictionary()) {
             std::set<std::string> keys = obj.getKeys();
-            for (auto iter = keys.rbegin();
-                 iter != keys.rend();
-                 ++iter) {
+            for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
                 queue.push_front(obj.getKey(*iter));
             }
         } else if (obj.isArray()) {
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index 5012d9b5..2cdc4711 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -1,9 +1,9 @@
 #include <qpdf/QPDFJob.hh>
 
+#include <cctype>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cctype>
 #include <fcntl.h>
 #include <iostream>
 #include <memory>
diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc
index 5534cd39..a95cd415 100644
--- a/libqpdf/QPDFJob_argv.cc
+++ b/libqpdf/QPDFJob_argv.cc
@@ -2,13 +2,13 @@
 
 // See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer.
 
-#include <cstdio>
 #include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <memory>
 #include <sstream>
-#include <cstdlib>
-#include <cstring>
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDFArgParser.hh>
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 9191f7db..5ef261af 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -29,11 +29,11 @@
 #include <qpdf/QUtil.hh>
 
 #include <algorithm>
-#include <cstring>
 #include <cctype>
 #include <climits>
-#include <stdexcept>
 #include <cstdlib>
+#include <cstring>
+#include <stdexcept>
 
 using namespace std::literals;
 
diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index 1a14e3a9..d2c66e29 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -10,9 +10,9 @@
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <stdexcept>
 #include <cstdlib>
 #include <cstring>
+#include <stdexcept>
 
 static inline bool
 is_delimiter(char ch)
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index a5a54cc7..99ff7c87 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -23,8 +23,8 @@
 #include <qpdf/RC4.hh>
 
 #include <algorithm>
-#include <stdexcept>
 #include <cstdlib>
+#include <stdexcept>
 
 QPDFWriter::ProgressReporter::~ProgressReporter()
 {
@@ -997,8 +997,7 @@ void
 QPDFWriter::activatePipelineStack(PipelinePopper& pp)
 {
     std::string stack_id("stack " + std::to_string(this->m->next_stack_id));
-    auto* c =
-        new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
+    auto* c = new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
     ++this->m->next_stack_id;
     this->m->pipeline_stack.push_back(c);
     this->m->pipeline = c;
diff --git a/libqpdf/QPDF_json.cc b/libqpdf/QPDF_json.cc
index 9e3cb3bb..3a05ae5c 100644
--- a/libqpdf/QPDF_json.cc
+++ b/libqpdf/QPDF_json.cc
@@ -246,8 +246,7 @@ class QPDF::JSONReactor: public JSON::Reactor
     void arrayStart() override;
     void containerEnd(JSON const& value) override;
     void topLevelScalar() override;
-    bool
-    dictionaryItem(std::string const& key, JSON const& value) override;
+    bool dictionaryItem(std::string const& key, JSON const& value) override;
     bool arrayItem(JSON const& value) override;
 
     bool anyErrors() const;
diff --git a/libqpdf/QTC.cc b/libqpdf/QTC.cc
index e537a0e1..ae9649a5 100644
--- a/libqpdf/QTC.cc
+++ b/libqpdf/QTC.cc
@@ -1,9 +1,9 @@
 #include <qpdf/QTC.hh>
 
 #include <qpdf/QUtil.hh>
+#include <cstdio>
 #include <map>
 #include <set>
-#include <cstdio>
 
 static bool
 tc_active(char const* const scope)
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index a542736d..57999185 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -11,6 +11,9 @@
 
 #include <cctype>
 #include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <fstream>
 #include <iomanip>
@@ -21,9 +24,6 @@
 #include <set>
 #include <sstream>
 #include <stdexcept>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #ifndef QPDF_NO_WCHAR_T
 # include <cwchar>
 #endif
diff --git a/libqpdf/RC4.cc b/libqpdf/RC4.cc
index 2d1b783d..c903fc16 100644
--- a/libqpdf/RC4.cc
+++ b/libqpdf/RC4.cc
@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDFCryptoProvider.hh>
 
-
 RC4::RC4(unsigned char const* key_data, int key_len) :
     crypto(QPDFCryptoProvider::getImpl())
 {
diff --git a/libtests/aes.cc b/libtests/aes.cc
index a981fc22..7368b44e 100644
--- a/libtests/aes.cc
+++ b/libtests/aes.cc
@@ -3,10 +3,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()
diff --git a/libtests/ascii85.cc b/libtests/ascii85.cc
index 8d926898..dad0c30b 100644
--- a/libtests/ascii85.cc
+++ b/libtests/ascii85.cc
@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCII85Decoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()
diff --git a/libtests/bits.cc b/libtests/bits.cc
index af715da8..e8c8a5c1 100644
--- a/libtests/bits.cc
+++ b/libtests/bits.cc
@@ -3,8 +3,8 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 // See comments in bits_functions.hh
 #define BITS_TESTING 1
diff --git a/libtests/buffer.cc b/libtests/buffer.cc
index 66eaa71c..86a52899 100644
--- a/libtests/buffer.cc
+++ b/libtests/buffer.cc
@@ -4,10 +4,10 @@
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/QUtil.hh>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <cstdlib>
 
 static unsigned char*
 uc(char const* s)
diff --git a/libtests/closed_file_input_source.cc b/libtests/closed_file_input_source.cc
index 183658a9..88253350 100644
--- a/libtests/closed_file_input_source.cc
+++ b/libtests/closed_file_input_source.cc
@@ -1,8 +1,8 @@
 #include <qpdf/ClosedFileInputSource.hh>
 #include <qpdf/FileInputSource.hh>
 
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 void
 check(std::string const& what, bool result)
diff --git a/libtests/dct_compress.cc b/libtests/dct_compress.cc
index 1f969982..3f7c86a1 100644
--- a/libtests/dct_compress.cc
+++ b/libtests/dct_compress.cc
@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()
diff --git a/libtests/dct_uncompress.cc b/libtests/dct_uncompress.cc
index 6606e4a5..c4255b57 100644
--- a/libtests/dct_uncompress.cc
+++ b/libtests/dct_uncompress.cc
@@ -2,9 +2,9 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/flate.cc b/libtests/flate.cc
index 9b64ca67..a14612c7 100644
--- a/libtests/flate.cc
+++ b/libtests/flate.cc
@@ -4,8 +4,8 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 void
 run(char const* filename)
diff --git a/libtests/hex.cc b/libtests/hex.cc
index d239d202..5f11f87f 100644
--- a/libtests/hex.cc
+++ b/libtests/hex.cc
@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCIIHexDecoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()
diff --git a/libtests/json_parse.cc b/libtests/json_parse.cc
index 31381ebf..bd2d49d1 100644
--- a/libtests/json_parse.cc
+++ b/libtests/json_parse.cc
@@ -15,8 +15,7 @@ namespace
         void arrayStart() override;
         void containerEnd(JSON const& value) override;
         void topLevelScalar() override;
-        bool
-        dictionaryItem(std::string const& key, JSON const& value) override;
+        bool dictionaryItem(std::string const& key, JSON const& value) override;
         bool arrayItem(JSON const& value) override;
 
       private:
diff --git a/libtests/lzw.cc b/libtests/lzw.cc
index 412ce4c5..3a7d003c 100644
--- a/libtests/lzw.cc
+++ b/libtests/lzw.cc
@@ -2,9 +2,9 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/md5.cc b/libtests/md5.cc
index 27aaad51..9aed832d 100644
--- a/libtests/md5.cc
+++ b/libtests/md5.cc
@@ -2,8 +2,8 @@
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_MD5.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 static void
 test_string(char const* str)
diff --git a/libtests/predictors.cc b/libtests/predictors.cc
index d7825bc6..f41cf5c1 100644
--- a/libtests/predictors.cc
+++ b/libtests/predictors.cc
@@ -6,9 +6,9 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 void
 run(char const* filename,
diff --git a/libtests/qintc.cc b/libtests/qintc.cc
index 5b985644..52a1e91e 100644
--- a/libtests/qintc.cc
+++ b/libtests/qintc.cc
@@ -69,11 +69,11 @@ try_range_check_subtract_real(
 int
 main()
 {
-    uint32_t u1 = 3141592653U;      // Too big for signed type
-    int32_t i1 = -1153374643;       // Same bit pattern as u1
-    uint64_t ul1 = 1099511627776LL; // Too big for 32-bit
-    uint64_t ul2 = 12345;           // Fits into 32-bit
-    int32_t i2 = 81;                // Fits in char and uchar
+    uint32_t u1 = 3141592653U;                  // Too big for signed type
+    int32_t i1 = -1153374643;                   // Same bit pattern as u1
+    uint64_t ul1 = 1099511627776LL;             // Too big for 32-bit
+    uint64_t ul2 = 12345;                       // Fits into 32-bit
+    int32_t i2 = 81;                            // Fits in char and uchar
     auto c1 = static_cast<signed char>('\xf7'); // Signed value when char
     char c2 = 'W'; // char; may be signed or unsigned
 
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index be5b6b1b..a1bbb905 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -3,11 +3,11 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QPDFSystemError.hh>
 #include <qpdf/QUtil.hh>
-#include <fstream>
-#include <iostream>
 #include <climits>
 #include <cstdio>
 #include <cstring>
+#include <fstream>
+#include <iostream>
 
 #ifdef _WIN32
 # include <io.h>
diff --git a/libtests/rc4.cc b/libtests/rc4.cc
index 300c6201..306d0882 100644
--- a/libtests/rc4.cc
+++ b/libtests/rc4.cc
@@ -5,10 +5,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 other_tests()
diff --git a/libtests/runlength.cc b/libtests/runlength.cc
index 260ce5cb..e034deda 100644
--- a/libtests/runlength.cc
+++ b/libtests/runlength.cc
@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/sha2.cc b/libtests/sha2.cc
index 4be8956a..22303da2 100644
--- a/libtests/sha2.cc
+++ b/libtests/sha2.cc
@@ -1,7 +1,7 @@
 #include <qpdf/Pl_SHA2.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 static void
 test(
diff --git a/qpdf/pdf_from_scratch.cc b/qpdf/pdf_from_scratch.cc
index 41e52f9c..05e5594d 100644
--- a/qpdf/pdf_from_scratch.cc
+++ b/qpdf/pdf_from_scratch.cc
@@ -4,10 +4,10 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc
index da1be6c0..8bdd8bd0 100644
--- a/qpdf/test_driver.cc
+++ b/qpdf/test_driver.cc
@@ -26,13 +26,13 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <climits>
-#include <map>
-#include <sstream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
+#include <map>
+#include <sstream>
 
 #define QPDF_OBJECT_NOWARN
 #include <qpdf/QPDFObject.hh>
diff --git a/qpdf/test_large_file.cc b/qpdf/test_large_file.cc
index cfd1c5db..fb69ce28 100644
--- a/qpdf/test_large_file.cc
+++ b/qpdf/test_large_file.cc
@@ -12,9 +12,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 // Run "test_large_file write small a.pdf" to get a PDF file that you
 // can look at in a reader.
diff --git a/qpdf/test_pdf_doc_encoding.cc b/qpdf/test_pdf_doc_encoding.cc
index e7aba030..6a16f16a 100644
--- a/qpdf/test_pdf_doc_encoding.cc
+++ b/qpdf/test_pdf_doc_encoding.cc
@@ -1,8 +1,8 @@
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
diff --git a/qpdf/test_pdf_unicode.cc b/qpdf/test_pdf_unicode.cc
index 325fcad8..e1e9f909 100644
--- a/qpdf/test_pdf_unicode.cc
+++ b/qpdf/test_pdf_unicode.cc
@@ -1,8 +1,8 @@
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc
index 507de459..25239426 100644
--- a/qpdf/test_tokenizer.cc
+++ b/qpdf/test_tokenizer.cc
@@ -6,10 +6,10 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFTokenizer.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
@@ -203,8 +203,7 @@ process(char const* filename, bool include_ignorable, size_t max_len)
         Pl_Buffer plb("buffer");
         page.pipeContents(&plb);
         auto content_data = plb.getBufferSharedPointer();
-        auto* bis =
-            new BufferInputSource("content data", content_data.get());
+        auto* bis = new BufferInputSource("content data", content_data.get());
         is = std::shared_ptr<InputSource>(bis);
         dump_tokens(
             is,
@@ -220,8 +219,7 @@ process(char const* filename, bool include_ignorable, size_t max_len)
         if (obj.isStream() && obj.getDict().getKey("/Type").isName() &&
             obj.getDict().getKey("/Type").getName() == "/ObjStm") {
             std::shared_ptr<Buffer> b = obj.getStreamData(qpdf_dl_specialized);
-            auto* bis =
-                new BufferInputSource("object stream data", b.get());
+            auto* bis = new BufferInputSource("object stream data", b.get());
             is = std::shared_ptr<InputSource>(bis);
             dump_tokens(
                 is,
diff --git a/qpdf/test_unicode_filenames.cc b/qpdf/test_unicode_filenames.cc
index 16478161..35ad7c79 100644
--- a/qpdf/test_unicode_filenames.cc
+++ b/qpdf/test_unicode_filenames.cc
@@ -5,9 +5,9 @@
 # include <windows.h>
 #endif
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 static void
 do_copy(FILE* in, FILE* out)
diff --git a/zlib-flate/zlib-flate.cc b/zlib-flate/zlib-flate.cc
index d1311c84..bc076194 100644
--- a/zlib-flate/zlib-flate.cc
+++ b/zlib-flate/zlib-flate.cc
@@ -3,11 +3,11 @@
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>
 
-#include <fcntl.h>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <fcntl.h>
+#include <iostream>
 
 static char const* whoami = nullptr;