diff --git a/include/tao/pq/table_writer.hpp b/include/tao/pq/table_writer.hpp
index 56e93c8..6ed172c 100644
--- a/include/tao/pq/table_writer.hpp
+++ b/include/tao/pq/table_writer.hpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
-#if !defined( __cpp_pack_indexing )
+#if !defined( __cpp_pack_indexing ) && ( __cplusplus >= 202302L )
 #include <tuple>
 #endif
 #include <type_traits>
@@ -27,7 +27,7 @@ namespace tao::pq
       std::shared_ptr< transaction > m_previous;
       std::shared_ptr< transaction > m_transaction;
 
-#if defined( __cpp_pack_indexing )
+#if defined( __cpp_pack_indexing ) && ( __cplusplus >= 202302L )
 
       template< std::size_t... Os, std::size_t... Is >
       void insert_indexed( std::index_sequence< Os... > /*unused*/,
diff --git a/include/tao/pq/transaction.hpp b/include/tao/pq/transaction.hpp
index aae0f92..b58042a 100644
--- a/include/tao/pq/transaction.hpp
+++ b/include/tao/pq/transaction.hpp
@@ -10,7 +10,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
-#if !defined( __cpp_pack_indexing )
+#if !defined( __cpp_pack_indexing ) && ( __cplusplus >= 202302L )
 #include <tuple>
 #endif
 #include <type_traits>
@@ -68,7 +68,7 @@ namespace tao::pq
                         const int lengths[],
                         const int formats[] );
 
-#if defined( __cpp_pack_indexing )
+#if defined( __cpp_pack_indexing ) && ( __cplusplus >= 202302L )
 
       template< std::size_t... Os, std::size_t... Is >
       void send_indexed( const char* statement,