diff --git a/src/Tiny_httpd.ml b/src/Tiny_httpd.ml
index 85c7c3fe..cbffe69b 100644
--- a/src/Tiny_httpd.ml
+++ b/src/Tiny_httpd.ml
@@ -1,16 +1,20 @@
 module Buf = Buf
-include Server
-module Util = Util
-module Dir = Tiny_httpd_unix.Dir
-
-module type VFS = Tiny_httpd_unix.Dir.VFS
-
 module Html = Tiny_httpd_html
 module IO = Tiny_httpd_core.IO
+module Request = Tiny_httpd_core.Request
+module Response = Tiny_httpd_core.Response
+module Response_code = Tiny_httpd_core.Response_code
+module Route = Tiny_httpd_core.Route
+module Headers = Tiny_httpd_core.Headers
+module Meth = Tiny_httpd_core.Meth
 module Pool = Tiny_httpd_core.Pool
 module Log = Tiny_httpd_core.Log
 module Server = Tiny_httpd_core.Server
+module Util = Tiny_httpd_core.Util
 include Server
+module Dir = Tiny_httpd_unix.Dir
+
+module type VFS = Tiny_httpd_unix.Dir.VFS
 
 open struct
   let get_max_connection_ ?(max_connections = 64) () : int =
diff --git a/src/Tiny_httpd.mli b/src/Tiny_httpd.mli
index 584d0188..2490646e 100644
--- a/src/Tiny_httpd.mli
+++ b/src/Tiny_httpd.mli
@@ -89,13 +89,6 @@ module IO = Tiny_httpd_core.IO
 
 module Log = Tiny_httpd_core.Log
 
-(** {2 Main Server Type} *)
-
-(** @inline *)
-include module type of struct
-  include Tiny_httpd_core.Server
-end
-
 (** {2 Utils} *)
 
 module Util = Tiny_httpd_core.Util
@@ -118,8 +111,15 @@ module Html = Tiny_httpd_html
 
 (** {2 Main server types} *)
 
+module Request = Tiny_httpd_core.Request
+module Response = Tiny_httpd_core.Response
+module Response_code = Tiny_httpd_core.Response_code
+module Route = Tiny_httpd_core.Route
+module Headers = Tiny_httpd_core.Headers
+module Meth = Tiny_httpd_core.Meth
 module Server = Tiny_httpd_core.Server
 
+(** @inline *)
 include module type of struct
   include Server
 end