10 files changed, 21 insertions, 18 deletions
diff --git a/src/lib/asio/asio_async_handshake_op.h b/src/lib/tls/asio/asio_async_handshake_op.h
index 61a8077d9..6ef7fdf94 100644
--- a/src/lib/asio/asio_async_handshake_op.h
+++ b/src/lib/tls/asio/asio_async_handshake_op.h
@@ -1,10 +1,10 @@
 #ifndef BOTAN_ASIO_ASYNC_HANDSHAKE_OP_H_
 #define BOTAN_ASIO_ASYNC_HANDSHAKE_OP_H_
 
-#include <botan/asio_async_write_op.h>
-#include <botan/asio_convert_exceptions.h>
-#include <botan/asio_stream_core.h>
-#include <botan/asio_includes.h>
+#include <botan/internal/asio_async_write_op.h>
+#include <botan/internal/asio_convert_exceptions.h>
+#include <botan/internal/asio_stream_core.h>
+#include <botan/internal/asio_includes.h>
 
 namespace Botan {
 template <class Channel, class StreamLayer, class Handler>
diff --git a/src/lib/asio/asio_async_read_op.h b/src/lib/tls/asio/asio_async_read_op.h
index 78b761037..56e5da7b6 100644
--- a/src/lib/asio/asio_async_read_op.h
+++ b/src/lib/tls/asio/asio_async_read_op.h
@@ -1,9 +1,9 @@
 #ifndef BOTAN_ASIO_ASYNC_READ_OP_H_
 #define BOTAN_ASIO_ASYNC_READ_OP_H_
 
-#include <botan/asio_convert_exceptions.h>
-#include <botan/asio_includes.h>
-#include <botan/asio_stream_core.h>
+#include <botan/internal/asio_convert_exceptions.h>
+#include <botan/internal/asio_includes.h>
+#include <botan/internal/asio_stream_core.h>
 
 namespace Botan {
 
diff --git a/src/lib/asio/asio_async_write_op.h b/src/lib/tls/asio/asio_async_write_op.h
index 9bbe74a15..28611fe1f 100644
--- a/src/lib/asio/asio_async_write_op.h
+++ b/src/lib/tls/asio/asio_async_write_op.h
@@ -1,8 +1,8 @@
 #ifndef BOTAN_ASIO_ASYNC_WRITE_OP_H_
 #define BOTAN_ASIO_ASYNC_WRITE_OP_H_
 
-#include <botan/asio_stream_core.h>
-#include <botan/asio_includes.h>
+#include <botan/internal/asio_stream_core.h>
+#include <botan/internal/asio_includes.h>
 
 namespace Botan {
 
diff --git a/src/lib/asio/asio_convert_exceptions.h b/src/lib/tls/asio/asio_convert_exceptions.h
index 3a054be10..3a054be10 100644
--- a/src/lib/asio/asio_convert_exceptions.h
+++ b/src/lib/tls/asio/asio_convert_exceptions.h
diff --git a/src/lib/asio/asio_error.h b/src/lib/tls/asio/asio_error.h
index a285dff43..a285dff43 100644
--- a/src/lib/asio/asio_error.h
+++ b/src/lib/tls/asio/asio_error.h
diff --git a/src/lib/asio/asio_includes.h b/src/lib/tls/asio/asio_includes.h
index 796aca10e..796aca10e 100644
--- a/src/lib/asio/asio_includes.h
+++ b/src/lib/tls/asio/asio_includes.h
diff --git a/src/lib/asio/asio_stream.h b/src/lib/tls/asio/asio_stream.h
index 0235ba5ad..f6bac7b27 100644
--- a/src/lib/asio/asio_stream.h
+++ b/src/lib/tls/asio/asio_stream.h
@@ -1,13 +1,13 @@
 #ifndef BOTAN_ASIO_STREAM_H_
 #define BOTAN_ASIO_STREAM_H_
 
-#include <botan/asio_async_handshake_op.h>
-#include <botan/asio_async_read_op.h>
-#include <botan/asio_async_write_op.h>
-#include <botan/asio_convert_exceptions.h>
-#include <botan/asio_includes.h>
-#include <botan/asio_stream_base.h>
-#include <botan/asio_stream_core.h>
+#include <botan/internal/asio_async_handshake_op.h>
+#include <botan/internal/asio_async_read_op.h>
+#include <botan/internal/asio_async_write_op.h>
+#include <botan/internal/asio_convert_exceptions.h>
+#include <botan/internal/asio_includes.h>
+#include <botan/internal/asio_stream_base.h>
+#include <botan/internal/asio_stream_core.h>
 
 #include <memory>
 #include <thread>
diff --git a/src/lib/asio/asio_stream_base.h b/src/lib/tls/asio/asio_stream_base.h
index 93a14bd5c..93a14bd5c 100644
--- a/src/lib/asio/asio_stream_base.h
+++ b/src/lib/tls/asio/asio_stream_base.h
diff --git a/src/lib/asio/asio_stream_core.h b/src/lib/tls/asio/asio_stream_core.h
index ddfc8b0ec..caac6d06a 100644
--- a/src/lib/asio/asio_stream_core.h
+++ b/src/lib/tls/asio/asio_stream_core.h
@@ -1,7 +1,7 @@
 #ifndef BOTAN_ASIO_STREAM_CORE_H_
 #define BOTAN_ASIO_STREAM_CORE_H_
 
-#include <botan/asio_includes.h>
+#include <botan/internal/asio_includes.h>
 #include <botan/tls_callbacks.h>
 #include <mutex>
 #include <vector>
diff --git a/src/lib/asio/info.txt b/src/lib/tls/asio/info.txt
index 454dbdc1f..a78f5c85c 100644
--- a/src/lib/asio/info.txt
+++ b/src/lib/tls/asio/info.txt
@@ -5,6 +5,9 @@ ASIO -> 20181218
 <header:public>
 asio_stream.h
 asio_error.h
+</header:public>
+
+<header:internal>
 asio_async_handshake_op.h
 asio_async_read_op.h
 asio_async_write_op.h
@@ -12,7 +15,7 @@ asio_convert_exceptions.h
 asio_stream_base.h
 asio_stream_core.h
 asio_includes.h
-</header:public>
+</header:internal>
 
 <requires>
 boost