diff --git a/src/lib/pq/connection.cpp b/src/lib/pq/connection.cpp
index 8183a0a..9824328 100644
--- a/src/lib/pq/connection.cpp
+++ b/src/lib/pq/connection.cpp
@@ -6,18 +6,31 @@
 
 #include <algorithm>
 #include <cctype>
+#include <chrono>
 #include <cstring>
+#include <exception>
 #include <format>
+#include <functional>
 #include <memory>
+#include <optional>
 #include <stdexcept>
 #include <string>
 #include <string_view>
+#include <utility>
 
+#include <libpq-fe.h>
+
+#include <tao/pq/access_mode.hpp>
+#include <tao/pq/connection_status.hpp>
 #include <tao/pq/exception.hpp>
+#include <tao/pq/internal/poll.hpp>
 #include <tao/pq/internal/unreachable.hpp>
+#include <tao/pq/isolation_level.hpp>
 #include <tao/pq/notification.hpp>
 #include <tao/pq/oid.hpp>
+#include <tao/pq/poll.hpp>
 #include <tao/pq/result.hpp>
+#include <tao/pq/transaction_status.hpp>
 
 namespace tao::pq
 {
diff --git a/src/lib/pq/connection_pool.cpp b/src/lib/pq/connection_pool.cpp
index c42f576..2bb8939 100644
--- a/src/lib/pq/connection_pool.cpp
+++ b/src/lib/pq/connection_pool.cpp
@@ -4,6 +4,17 @@
 
 #include <tao/pq/connection_pool.hpp>
 
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string_view>
+#include <utility>
+
+#include <tao/pq/connection.hpp>
+#include <tao/pq/internal/poll.hpp>
+#include <tao/pq/poll.hpp>
+
 namespace tao::pq
 {
    auto connection_pool::v_create() const -> std::unique_ptr< pq::connection >
diff --git a/src/lib/pq/exception.cpp b/src/lib/pq/exception.cpp
index b25a138..52f96be 100644
--- a/src/lib/pq/exception.cpp
+++ b/src/lib/pq/exception.cpp
@@ -4,6 +4,11 @@
 
 #include <tao/pq/exception.hpp>
 
+#include <stdexcept>
+#include <string_view>
+
+#include <libpq-fe.h>
+
 namespace tao::pq
 {
    sql_error::sql_error( const char* what, const std::string_view in_sqlstate )
diff --git a/src/lib/pq/field.cpp b/src/lib/pq/field.cpp
index 890f623..6deeea4 100644
--- a/src/lib/pq/field.cpp
+++ b/src/lib/pq/field.cpp
@@ -3,6 +3,10 @@
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
 #include <tao/pq/field.hpp>
+
+#include <cstddef>
+#include <string>
+
 #include <tao/pq/row.hpp>
 
 namespace tao::pq
diff --git a/src/lib/pq/internal/demangle.cpp b/src/lib/pq/internal/demangle.cpp
index ac915e3..6709eb3 100644
--- a/src/lib/pq/internal/demangle.cpp
+++ b/src/lib/pq/internal/demangle.cpp
@@ -2,14 +2,16 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
+#include <tao/pq/internal/demangle.hpp>
+
+#include <string>
+
 #if !defined( _WIN32 )
 #include <cstdlib>
 #include <cxxabi.h>
 #include <memory>
 #endif
 
-#include <tao/pq/internal/demangle.hpp>
-
 namespace tao::pq::internal
 {
    auto demangle( const char* const symbol ) -> std::string
diff --git a/src/lib/pq/internal/poll.cpp b/src/lib/pq/internal/poll.cpp
index d0ac32a..558c3c5 100644
--- a/src/lib/pq/internal/poll.cpp
+++ b/src/lib/pq/internal/poll.cpp
@@ -8,6 +8,7 @@
 #include <cerrno>
 #include <cstring>
 #include <format>
+#include <string.h>
 #include <string>
 
 #if defined( _WIN32 )
@@ -18,6 +19,7 @@
 
 #include <tao/pq/exception.hpp>
 #include <tao/pq/internal/unreachable.hpp>
+#include <tao/pq/poll.hpp>
 
 namespace tao::pq::internal
 {
diff --git a/src/lib/pq/large_object.cpp b/src/lib/pq/large_object.cpp
index 1ad676b..3c352b7 100644
--- a/src/lib/pq/large_object.cpp
+++ b/src/lib/pq/large_object.cpp
@@ -5,10 +5,17 @@
 #include <tao/pq/large_object.hpp>
 
 #include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <ios>
+#include <memory>
+#include <stdexcept>
+#include <string>
 #include <utility>
 
 #include <libpq/libpq-fs.h>
 
+#include <tao/pq/binary.hpp>
 #include <tao/pq/connection.hpp>
 #include <tao/pq/internal/resize_uninitialized.hpp>
 #include <tao/pq/transaction.hpp>
diff --git a/src/lib/pq/parameter_traits.cpp b/src/lib/pq/parameter_traits.cpp
index c679db1..9315338 100644
--- a/src/lib/pq/parameter_traits.cpp
+++ b/src/lib/pq/parameter_traits.cpp
@@ -4,6 +4,9 @@
 
 #include <tao/pq/parameter_traits.hpp>
 
+#include <string>
+#include <string_view>
+
 namespace tao::pq::internal
 {
    void array_append( std::string& buffer, std::string_view data )
diff --git a/src/lib/pq/result.cpp b/src/lib/pq/result.cpp
index 75f00db..35d7d20 100644
--- a/src/lib/pq/result.cpp
+++ b/src/lib/pq/result.cpp
@@ -2,15 +2,20 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
+#include <tao/pq/result.hpp>
+
 #include <cassert>
-#include <charconv>
+#include <cstddef>
 #include <format>
+#include <stdexcept>
+#include <string>
 
-#include <tao/pq/exception.hpp>
-#include <tao/pq/result.hpp>
+#include <libpq-fe.h>
 
+#include <tao/pq/exception.hpp>
 #include <tao/pq/internal/from_chars.hpp>
 #include <tao/pq/internal/unreachable.hpp>
+#include <tao/pq/internal/zsv.hpp>
 
 namespace tao::pq
 {
diff --git a/src/lib/pq/result_traits.cpp b/src/lib/pq/result_traits.cpp
index 4a25333..2020a1a 100644
--- a/src/lib/pq/result_traits.cpp
+++ b/src/lib/pq/result_traits.cpp
@@ -4,10 +4,12 @@
 
 #include <tao/pq/result_traits.hpp>
 
+#include <cstddef>
 #include <cstring>
 #include <stdexcept>
 #include <string>
 
+#include <tao/pq/binary.hpp>
 #include <tao/pq/internal/from_chars.hpp>
 #include <tao/pq/internal/resize_uninitialized.hpp>
 #include <tao/pq/internal/strtox.hpp>
diff --git a/src/lib/pq/row.cpp b/src/lib/pq/row.cpp
index c4dfc1e..9880906 100644
--- a/src/lib/pq/row.cpp
+++ b/src/lib/pq/row.cpp
@@ -2,11 +2,16 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
-#include <tao/pq/result.hpp>
 #include <tao/pq/row.hpp>
 
 #include <cassert>
+#include <cstddef>
 #include <format>
+#include <stdexcept>
+#include <string>
+
+#include <tao/pq/internal/zsv.hpp>
+#include <tao/pq/result.hpp>
 
 namespace tao::pq
 {
diff --git a/src/lib/pq/table_field.cpp b/src/lib/pq/table_field.cpp
index 1b8eb22..6fc7b3b 100644
--- a/src/lib/pq/table_field.cpp
+++ b/src/lib/pq/table_field.cpp
@@ -3,6 +3,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
 #include <tao/pq/table_field.hpp>
+
+#include <cstddef>
+
 #include <tao/pq/table_row.hpp>
 
 namespace tao::pq
diff --git a/src/lib/pq/table_reader.cpp b/src/lib/pq/table_reader.cpp
index d603f1a..8b0f53c 100644
--- a/src/lib/pq/table_reader.cpp
+++ b/src/lib/pq/table_reader.cpp
@@ -4,10 +4,15 @@
 
 #include <tao/pq/table_reader.hpp>
 
+#include <cassert>
 #include <chrono>
 #include <cstring>
+#include <stdexcept>
+#include <string_view>
 #include <tuple>
 
+#include <libpq-fe.h>
+
 #include <tao/pq/connection.hpp>
 #include <tao/pq/exception.hpp>
 #include <tao/pq/internal/unreachable.hpp>
diff --git a/src/lib/pq/table_row.cpp b/src/lib/pq/table_row.cpp
index c00a1a0..3827a71 100644
--- a/src/lib/pq/table_row.cpp
+++ b/src/lib/pq/table_row.cpp
@@ -2,10 +2,13 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
-#include <tao/pq/table_reader.hpp>
 #include <tao/pq/table_row.hpp>
 
+#include <cstddef>
 #include <format>
+#include <stdexcept>
+
+#include <tao/pq/table_reader.hpp>
 
 namespace tao::pq
 {
diff --git a/src/lib/pq/table_writer.cpp b/src/lib/pq/table_writer.cpp
index 2663ae5..d6d10bb 100644
--- a/src/lib/pq/table_writer.cpp
+++ b/src/lib/pq/table_writer.cpp
@@ -5,6 +5,9 @@
 #include <tao/pq/table_writer.hpp>
 
 #include <chrono>
+#include <cstddef>
+#include <memory>
+#include <string_view>
 #include <tuple>
 
 #include <libpq-fe.h>
diff --git a/src/lib/pq/transaction.cpp b/src/lib/pq/transaction.cpp
index b9ca162..ab87fee 100644
--- a/src/lib/pq/transaction.cpp
+++ b/src/lib/pq/transaction.cpp
@@ -2,11 +2,19 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
-#include <stdexcept>
+#include <tao/pq/transaction.hpp>
+
+#include <chrono>
+#include <cstdio>
+#include <exception>
+#include <memory>
+#include <utility>
+
+#include <libpq-fe.h>
 
 #include <tao/pq/connection.hpp>
 #include <tao/pq/oid.hpp>
-#include <tao/pq/transaction.hpp>
+#include <tao/pq/result.hpp>
 
 namespace tao::pq
 {
diff --git a/src/test/compare.hpp b/src/test/compare.hpp
index 407fac6..99db069 100644
--- a/src/test/compare.hpp
+++ b/src/test/compare.hpp
@@ -12,7 +12,7 @@
 namespace tao::pq::internal
 {
    template< typename T, typename U >
-   [[nodiscard]] bool compare( const T& lhs, const U& rhs ) noexcept
+   [[nodiscard]] auto compare( const T& lhs, const U& rhs ) noexcept -> bool
    {
       if( lhs.size() != rhs.size() ) {
          return false;
diff --git a/src/test/pq/basic_datatypes.cpp b/src/test/pq/basic_datatypes.cpp
index b3cb0f7..91717ed 100644
--- a/src/test/pq/basic_datatypes.cpp
+++ b/src/test/pq/basic_datatypes.cpp
@@ -2,11 +2,13 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
-#include <array>
+#include <chrono>
 #include <cmath>
+#include <exception>
+#include <iostream>
 #include <limits>
-#include <stdexcept>
-#include <vector>
+#include <memory>
+#include <string>
 
 #include "../compare.hpp"
 #include "../getenv.hpp"
diff --git a/src/test/pq/exception.cpp b/src/test/pq/exception.cpp
index cbf103f..691a3d0 100644
--- a/src/test/pq/exception.cpp
+++ b/src/test/pq/exception.cpp
@@ -2,6 +2,9 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
+#include <exception>
+#include <iostream>
+
 #include "../getenv.hpp"
 #include "../macros.hpp"
 
diff --git a/src/test/pq/table_writer.cpp b/src/test/pq/table_writer.cpp
index cfde40d..75eef4d 100644
--- a/src/test/pq/table_writer.cpp
+++ b/src/test/pq/table_writer.cpp
@@ -2,6 +2,11 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
+#include <cstddef>
+#include <exception>
+#include <iostream>
+#include <memory>
+
 #include "../getenv.hpp"
 #include "../macros.hpp"