diff --git a/include/mysql/connection.hpp b/include/mysql/connection.hpp
index 6ec0ac3b..a2e5d64b 100644
--- a/include/mysql/connection.hpp
+++ b/include/mysql/connection.hpp
@@ -48,6 +48,6 @@ public:
 
 }
 
-#include "mysql/impl/connection_impl.hpp"
+#include "mysql/impl/connection.ipp"
 
 #endif /* INCLUDE_MYSQL_CONNECTION_HPP_ */
diff --git a/include/mysql/error.hpp b/include/mysql/error.hpp
index a555d6d3..0802192e 100644
--- a/include/mysql/error.hpp
+++ b/include/mysql/error.hpp
@@ -27,6 +27,6 @@ using error_code = boost::system::error_code;
 
 }
 
-#include "mysql/impl/error_impl.hpp"
+#include "mysql/impl/error.hpp"
 
 #endif /* INCLUDE_ERROR_HPP_ */
diff --git a/include/mysql/impl/auth.hpp b/include/mysql/impl/auth.hpp
index fefb10d9..63346ad0 100644
--- a/include/mysql/impl/auth.hpp
+++ b/include/mysql/impl/auth.hpp
@@ -28,6 +28,6 @@ inline void compute_auth_string(std::string_view password, const void* challenge
 } // detail
 } // mysql
 
-#include "mysql/impl/auth_impl.hpp"
+#include "mysql/impl/auth.ipp"
 
 #endif /* INCLUDE_AUTH_HPP_ */
diff --git a/include/mysql/impl/auth_impl.hpp b/include/mysql/impl/auth.ipp
similarity index 88%
rename from include/mysql/impl/auth_impl.hpp
rename to include/mysql/impl/auth.ipp
index d85253a9..0b0bc849 100644
--- a/include/mysql/impl/auth_impl.hpp
+++ b/include/mysql/impl/auth.ipp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_AUTH_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_AUTH_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_AUTH_IPP_
+#define INCLUDE_MYSQL_IMPL_AUTH_IPP_
 
 #include <openssl/sha.h>
 #include <cstring>
@@ -35,4 +35,4 @@ inline void mysql::detail::mysql_native_password::compute_auth_string(
 
 
 
-#endif /* INCLUDE_MYSQL_IMPL_AUTH_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_AUTH_IPP_ */
diff --git a/include/mysql/impl/channel.hpp b/include/mysql/impl/channel.hpp
index 6733c5f4..fc1bf050 100644
--- a/include/mysql/impl/channel.hpp
+++ b/include/mysql/impl/channel.hpp
@@ -57,6 +57,6 @@ public:
 }
 }
 
-#include "mysql/impl/channel_impl.hpp"
+#include "mysql/impl/channel.ipp"
 
 #endif /* INCLUDE_MYSQL_STREAM_HPP_ */
diff --git a/include/mysql/impl/channel_impl.hpp b/include/mysql/impl/channel.ipp
similarity index 100%
rename from include/mysql/impl/channel_impl.hpp
rename to include/mysql/impl/channel.ipp
diff --git a/include/mysql/impl/connection_impl.hpp b/include/mysql/impl/connection.ipp
similarity index 92%
rename from include/mysql/impl/connection_impl.hpp
rename to include/mysql/impl/connection.ipp
index d03268fb..bab5d263 100644
--- a/include/mysql/impl/connection_impl.hpp
+++ b/include/mysql/impl/connection.ipp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_CONNECTION_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_CONNECTION_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_CONNECTION_IPP_
+#define INCLUDE_MYSQL_IMPL_CONNECTION_IPP_
 
 #include "mysql/impl/handshake.hpp"
 #include "mysql/impl/query.hpp"
@@ -82,4 +82,4 @@ mysql::connection<Stream>::async_query(
 }
 
 
-#endif /* INCLUDE_MYSQL_IMPL_CONNECTION_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_CONNECTION_IPP_ */
diff --git a/include/mysql/impl/deserialize_row.hpp b/include/mysql/impl/deserialize_row.hpp
index 4185c321..f2084014 100644
--- a/include/mysql/impl/deserialize_row.hpp
+++ b/include/mysql/impl/deserialize_row.hpp
@@ -1,11 +1,11 @@
 #ifndef INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_HPP_
 #define INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_HPP_
 
+#include "mysql/impl/serialization.hpp"
 #include "mysql/error.hpp"
 #include "mysql/value.hpp"
 #include "mysql/metadata.hpp"
 #include "mysql/value.hpp"
-#include "mysql/impl/basic_serialization.hpp"
 #include <vector>
 
 namespace mysql
@@ -28,6 +28,6 @@ inline error_code deserialize_text_row(
 }
 }
 
-#include "mysql/impl/deserialize_row_impl.hpp"
+#include "mysql/impl/deserialize_row.ipp"
 
 #endif /* INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_HPP_ */
diff --git a/include/mysql/impl/deserialize_row_impl.hpp b/include/mysql/impl/deserialize_row.ipp
similarity index 97%
rename from include/mysql/impl/deserialize_row_impl.hpp
rename to include/mysql/impl/deserialize_row.ipp
index 83d39b9c..88b6d1c8 100644
--- a/include/mysql/impl/deserialize_row_impl.hpp
+++ b/include/mysql/impl/deserialize_row.ipp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IPP_
+#define INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IPP_
 
 #include <cstdlib>
 #include <cmath>
@@ -237,4 +237,4 @@ mysql::error_code mysql::detail::deserialize_text_row(
 
 
 
-#endif /* INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_DESERIALIZE_ROW_IPP_ */
diff --git a/include/mysql/impl/error_impl.hpp b/include/mysql/impl/error.hpp
similarity index 100%
rename from include/mysql/impl/error_impl.hpp
rename to include/mysql/impl/error.hpp
diff --git a/include/mysql/impl/handshake.hpp b/include/mysql/impl/handshake.hpp
index 286e9d5c..919e6e77 100644
--- a/include/mysql/impl/handshake.hpp
+++ b/include/mysql/impl/handshake.hpp
@@ -41,7 +41,7 @@ async_handshake(
 }
 }
 
-#include "mysql/impl/handshake_impl.hpp"
+#include "mysql/impl/handshake.ipp"
 
 
 #endif /* INCLUDE_MYSQL_IMPL_HANDSHAKE_HPP_ */
diff --git a/include/mysql/impl/handshake_impl.hpp b/include/mysql/impl/handshake.ipp
similarity index 98%
rename from include/mysql/impl/handshake_impl.hpp
rename to include/mysql/impl/handshake.ipp
index be911a65..3d54a5b6 100644
--- a/include/mysql/impl/handshake_impl.hpp
+++ b/include/mysql/impl/handshake.ipp
@@ -1,13 +1,13 @@
-#ifndef INCLUDE_MYSQL_IMPL_HANDSHAKE_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_HANDSHAKE_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_HANDSHAKE_IPP_
+#define INCLUDE_MYSQL_IMPL_HANDSHAKE_IPP_
 
-#include "mysql/impl/basic_serialization.hpp"
 #include "mysql/impl/capabilities.hpp"
 #include "mysql/impl/auth.hpp"
 #include "mysql/error.hpp"
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/yield.hpp>
 #include <boost/beast/core/async_base.hpp>
+#include "mysql/impl/serialization.hpp"
 
 namespace mysql
 {
@@ -409,4 +409,4 @@ mysql::detail::async_handshake(
 #include <boost/asio/unyield.hpp>
 
 
-#endif /* INCLUDE_MYSQL_IMPL_HANDSHAKE_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_HANDSHAKE_IPP_ */
diff --git a/include/mysql/impl/messages.hpp b/include/mysql/impl/messages.hpp
index 962b18cf..52412d29 100644
--- a/include/mysql/impl/messages.hpp
+++ b/include/mysql/impl/messages.hpp
@@ -1,13 +1,13 @@
 #ifndef MESSAGES_H_
 #define MESSAGES_H_
 
+#include "mysql/impl/serialization.hpp"
 #include <string>
 #include <vector>
 #include <variant>
 #include <tuple>
 #include "mysql/impl/basic_types.hpp"
 #include "mysql/impl/constants.hpp"
-#include "mysql/impl/basic_serialization.hpp"
 #include "mysql/collation.hpp"
 
 namespace mysql
@@ -265,7 +265,7 @@ struct StmtClose
 } // detail
 } // mysql
 
-#include "mysql/impl/messages_impl.hpp"
+#include "mysql/impl/messages.ipp"
 
 
 #endif /* MESSAGES_H_ */
diff --git a/include/mysql/impl/messages_impl.hpp b/include/mysql/impl/messages.ipp
similarity index 96%
rename from include/mysql/impl/messages_impl.hpp
rename to include/mysql/impl/messages.ipp
index fb029d48..3cbdbe8c 100644
--- a/include/mysql/impl/messages_impl.hpp
+++ b/include/mysql/impl/messages.ipp
@@ -1,7 +1,7 @@
-#ifndef INCLUDE_MYSQL_IMPL_MESSAGES_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_MESSAGES_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_MESSAGES_IPP_
+#define INCLUDE_MYSQL_IMPL_MESSAGES_IPP_
 
-#include "mysql/impl/basic_serialization.hpp"
+#include "mysql/impl/serialization.hpp"
 #include <cassert>
 
 inline mysql::Error mysql::detail::deserialize(
@@ -218,4 +218,4 @@ inline mysql::error_code mysql::detail::process_error_packet(
 }
 
 
-#endif /* INCLUDE_MYSQL_IMPL_MESSAGES_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_MESSAGES_IPP_ */
diff --git a/include/mysql/impl/metadata_impl.hpp b/include/mysql/impl/metadata.hpp
similarity index 94%
rename from include/mysql/impl/metadata_impl.hpp
rename to include/mysql/impl/metadata.hpp
index d4e2ff31..35e3a285 100644
--- a/include/mysql/impl/metadata_impl.hpp
+++ b/include/mysql/impl/metadata.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_METADATA_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_METADATA_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_METADATA_HPP_
+#define INCLUDE_MYSQL_IMPL_METADATA_HPP_
 
 namespace mysql
 {
@@ -76,4 +76,4 @@ inline mysql::field_type mysql::field_metadata::type() const noexcept
 	return field_type_;
 }
 
-#endif /* INCLUDE_MYSQL_IMPL_METADATA_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_METADATA_HPP_ */
diff --git a/include/mysql/impl/query.hpp b/include/mysql/impl/query.hpp
index 8ba316cc..a6750b13 100644
--- a/include/mysql/impl/query.hpp
+++ b/include/mysql/impl/query.hpp
@@ -65,6 +65,6 @@ async_fetch_text_row(
 }
 }
 
-#include "mysql/impl/query_impl.hpp"
+#include "mysql/impl/query.ipp"
 
 #endif /* INCLUDE_MYSQL_IMPL_QUERY_HPP_ */
diff --git a/include/mysql/impl/query_impl.hpp b/include/mysql/impl/query.ipp
similarity index 98%
rename from include/mysql/impl/query_impl.hpp
rename to include/mysql/impl/query.ipp
index f9d8864f..46884f9e 100644
--- a/include/mysql/impl/query_impl.hpp
+++ b/include/mysql/impl/query.ipp
@@ -1,10 +1,10 @@
-#ifndef INCLUDE_MYSQL_IMPL_QUERY_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_QUERY_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_QUERY_IPP_
+#define INCLUDE_MYSQL_IMPL_QUERY_IPP_
 
 #include "mysql/impl/messages.hpp"
-#include "mysql/impl/basic_serialization.hpp"
 #include "mysql/impl/deserialize_row.hpp"
 #include <boost/asio/yield.hpp>
+#include "mysql/impl/serialization.hpp"
 
 namespace mysql
 {
@@ -447,4 +447,4 @@ mysql::detail::async_fetch_text_row(
 #include <boost/asio/unyield.hpp>
 
 
-#endif /* INCLUDE_MYSQL_IMPL_QUERY_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_QUERY_IPP_ */
diff --git a/include/mysql/impl/resultset_impl.hpp b/include/mysql/impl/resultset.hpp
similarity index 97%
rename from include/mysql/impl/resultset_impl.hpp
rename to include/mysql/impl/resultset.hpp
index 18a775f2..97380365 100644
--- a/include/mysql/impl/resultset_impl.hpp
+++ b/include/mysql/impl/resultset.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_RESULTSET_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_RESULTSET_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_RESULTSET_HPP_
+#define INCLUDE_MYSQL_IMPL_RESULTSET_HPP_
 
 #include "mysql/impl/query.hpp"
 #include <boost/asio/coroutine.hpp>
@@ -281,4 +281,4 @@ mysql::resultset<StreamType>::async_fetch_all(
 #include <boost/asio/unyield.hpp>
 
 
-#endif /* INCLUDE_MYSQL_IMPL_RESULTSET_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_RESULTSET_HPP_ */
diff --git a/include/mysql/impl/basic_serialization.hpp b/include/mysql/impl/serialization.hpp
similarity index 100%
rename from include/mysql/impl/basic_serialization.hpp
rename to include/mysql/impl/serialization.hpp
diff --git a/include/mysql/impl/value_impl.hpp b/include/mysql/impl/value.hpp
similarity index 94%
rename from include/mysql/impl/value_impl.hpp
rename to include/mysql/impl/value.hpp
index 0b2cb70c..bc26e7cc 100644
--- a/include/mysql/impl/value_impl.hpp
+++ b/include/mysql/impl/value.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_MYSQL_IMPL_VALUE_IMPL_HPP_
-#define INCLUDE_MYSQL_IMPL_VALUE_IMPL_HPP_
+#ifndef INCLUDE_MYSQL_IMPL_VALUE_HPP_
+#define INCLUDE_MYSQL_IMPL_VALUE_HPP_
 
 #include "mysql/impl/container_equals.hpp"
 
@@ -89,4 +89,4 @@ inline std::ostream& mysql::operator<<(
 }
 
 
-#endif /* INCLUDE_MYSQL_IMPL_VALUE_IMPL_HPP_ */
+#endif /* INCLUDE_MYSQL_IMPL_VALUE_HPP_ */
diff --git a/include/mysql/metadata.hpp b/include/mysql/metadata.hpp
index 27a4ff67..88af904a 100644
--- a/include/mysql/metadata.hpp
+++ b/include/mysql/metadata.hpp
@@ -60,6 +60,6 @@ public:
 } // detail
 } // mysql
 
-#include "mysql/impl/metadata_impl.hpp"
+#include "mysql/impl/metadata.hpp"
 
 #endif /* INCLUDE_MYSQL_METADATA_HPP_ */
diff --git a/include/mysql/resultset.hpp b/include/mysql/resultset.hpp
index 3f230f03..0898e1e5 100644
--- a/include/mysql/resultset.hpp
+++ b/include/mysql/resultset.hpp
@@ -61,6 +61,6 @@ public:
 
 }
 
-#include "mysql/impl/resultset_impl.hpp"
+#include "mysql/impl/resultset.hpp"
 
 #endif /* INCLUDE_MYSQL_RESULTSET_HPP_ */
diff --git a/include/mysql/value.hpp b/include/mysql/value.hpp
index a8306cea..1975a0c2 100644
--- a/include/mysql/value.hpp
+++ b/include/mysql/value.hpp
@@ -41,7 +41,7 @@ inline std::ostream& operator<<(std::ostream& os, const value& value);
 
 }
 
-#include "mysql/impl/value_impl.hpp"
+#include "mysql/impl/value.hpp"
 
 
 #endif /* INCLUDE_MYSQL_VALUE_HPP_ */
diff --git a/test/metadata.cpp b/test/metadata.cpp
index 2a95700d..148aafad 100644
--- a/test/metadata.cpp
+++ b/test/metadata.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "mysql/metadata.hpp"
-#include "mysql/impl/basic_serialization.hpp"
 #include <gtest/gtest.h>
+#include "mysql/impl/serialization.hpp"
 
 using namespace testing;
 using namespace mysql;
diff --git a/test/serialization_test_common.hpp b/test/serialization_test_common.hpp
index 96c53df7..2ded6b94 100644
--- a/test/serialization_test_common.hpp
+++ b/test/serialization_test_common.hpp
@@ -1,12 +1,12 @@
 #ifndef TEST_SERIALIZATION_TEST_COMMON_HPP_
 #define TEST_SERIALIZATION_TEST_COMMON_HPP_
 
-#include "mysql/impl/basic_serialization.hpp"
 #include "mysql/impl/messages.hpp"
 #include "mysql/impl/constants.hpp"
 #include <gtest/gtest.h>
 #include <string>
 #include <boost/type_index.hpp>
+#include "mysql/impl/serialization.hpp"
 
 namespace mysql
 {