diff --git a/Cargo.lock b/Cargo.lock
index 2dd1a32..04280b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -405,7 +405,6 @@ dependencies = [
  "bytes",
  "imap-codec",
  "imap-next",
- "imap-types",
  "lazy_static",
  "tokio",
  "tracing",
@@ -662,7 +661,6 @@ dependencies = [
  "colored",
  "imap-codec",
  "imap-next",
- "imap-types",
  "once_cell",
  "rustls-native-certs",
  "rustls-pemfile",
diff --git a/integration-test/Cargo.toml b/integration-test/Cargo.toml
index 6d08e5c..5329c4b 100644
--- a/integration-test/Cargo.toml
+++ b/integration-test/Cargo.toml
@@ -9,7 +9,6 @@ bstr = { version = "1.9.1", default-features = false }
 bytes = "1.6.0"
 imap-codec = { version = "2.0.0-alpha.1", git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6" }
 imap-next = { path = ".." }
-imap-types = { version = "2.0.0-alpha.1", git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6" }
 tokio = { version = "1.38.0", features = ["macros", "net", "rt", "time"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
diff --git a/integration-test/src/client_tester.rs b/integration-test/src/client_tester.rs
index 235a08a..9471af5 100644
--- a/integration-test/src/client_tester.rs
+++ b/integration-test/src/client_tester.rs
@@ -3,9 +3,9 @@ use std::net::SocketAddr;
 use bstr::ByteSlice;
 use imap_next::{
     client::{self, Client, CommandHandle},
+    imap_types::{command::Command, ToStatic},
     stream::{self, Stream},
 };
-use imap_types::{command::Command, ToStatic};
 use tokio::net::TcpStream;
 use tracing::trace;
 
diff --git a/integration-test/src/codecs.rs b/integration-test/src/codecs.rs
index 80ceca6..a48da1e 100644
--- a/integration-test/src/codecs.rs
+++ b/integration-test/src/codecs.rs
@@ -3,7 +3,7 @@ use imap_codec::{
     decode::Decoder, encode::Encoder, AuthenticateDataCodec, CommandCodec, GreetingCodec,
     ResponseCodec,
 };
-use imap_types::{
+use imap_next::imap_types::{
     auth::AuthenticateData,
     command::Command,
     response::{CommandContinuationRequest, Data, Greeting, Response, Status},
diff --git a/integration-test/src/server_tester.rs b/integration-test/src/server_tester.rs
index 77e5411..ca0409e 100644
--- a/integration-test/src/server_tester.rs
+++ b/integration-test/src/server_tester.rs
@@ -1,9 +1,9 @@
 use bstr::ByteSlice;
 use imap_next::{
+    imap_types::{response::Response, ToStatic},
     server::{self, ResponseHandle, Server},
     stream::{self, Stream},
 };
-use imap_types::{response::Response, ToStatic};
 use tokio::net::TcpListener;
 use tracing::trace;
 
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index 79ae662..fafb531 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -10,7 +10,6 @@ argh = "0.1.12"
 colored = "2.1.0"
 imap-codec = { version = "2.0.0-alpha.1", features = ["quirk_crlf_relaxed", "ext_id"], git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6" }
 imap-next = { path = ".." }
-imap-types = { version = "2.0.0-alpha.1", features = ["ext_id"], git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6"  }
 once_cell = "1.19.0"
 rustls-native-certs = "0.7.1"
 rustls-pemfile = "2.1.2"
diff --git a/proxy/src/proxy.rs b/proxy/src/proxy.rs
index 9a2d327..dcdc3ba 100644
--- a/proxy/src/proxy.rs
+++ b/proxy/src/proxy.rs
@@ -3,15 +3,15 @@ use std::{net::SocketAddr, sync::Arc};
 use colored::Colorize;
 use imap_next::{
     client::{self, Client},
+    imap_types::{
+        command::{Command, CommandBody},
+        extensions::idle::IdleDone,
+        response::{Code, Status},
+        ToStatic,
+    },
     server::{self, Server},
     stream::{self, Stream},
 };
-use imap_types::{
-    command::{Command, CommandBody},
-    extensions::idle::IdleDone,
-    response::{Code, Status},
-    ToStatic,
-};
 use once_cell::sync::Lazy;
 use thiserror::Error;
 use tokio::net::{TcpListener, TcpStream};
diff --git a/proxy/src/util.rs b/proxy/src/util.rs
index 3f96cae..d647673 100644
--- a/proxy/src/util.rs
+++ b/proxy/src/util.rs
@@ -1,6 +1,6 @@
 use std::{fs::File, io::BufReader, path::Path};
 
-use imap_types::{
+use imap_next::imap_types::{
     auth::AuthMechanism,
     core::Vec1,
     response::{
diff --git a/src/lib.rs b/src/lib.rs
index 192fcbf..f22b632 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,6 +14,9 @@ pub mod stream;
 mod tests;
 pub mod types;
 
+// Re-export(s)
+pub use imap_codec::imap_types;
+
 // Test examples from imap-next's README.
 #[doc = include_str!("../README.md")]
 #[cfg(doctest)]