diff --git a/benchmarks/scan_benchmark.cpp b/benchmarks/scan_benchmark.cpp
index d44b31cb..2c30861e 100644
--- a/benchmarks/scan_benchmark.cpp
+++ b/benchmarks/scan_benchmark.cpp
@@ -26,7 +26,7 @@
 #include "support/path_pool.h"
 #include "syntax/dependency_graph.h"
 
-#include "kota/codec/json/serializer.h"
+#include "kota/codec/json/json.h"
 #include "kota/deco/deco.h"
 #include "llvm/Support/FileSystem.h"
 
diff --git a/src/server/compiler.h b/src/server/compiler.h
index 2ee5bf33..c0c7b71d 100644
--- a/src/server/compiler.h
+++ b/src/server/compiler.h
@@ -14,7 +14,7 @@
 #include "syntax/completion.h"
 
 #include "kota/async/async.h"
-#include "kota/codec/raw_value.h"
+#include "kota/codec/json/json.h"
 #include "kota/ipc/codec/json.h"
 #include "kota/ipc/lsp/protocol.h"
 #include "kota/ipc/peer.h"
diff --git a/src/server/config.cpp b/src/server/config.cpp
index 00ee41b5..a2d8087c 100644
--- a/src/server/config.cpp
+++ b/src/server/config.cpp
@@ -7,7 +7,7 @@
 #include "support/logging.h"
 
 #include "kota/codec/json/json.h"
-#include "kota/codec/toml.h"
+#include "kota/codec/toml/toml.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
diff --git a/src/server/master_server.h b/src/server/master_server.h
index 7a892f75..94106fff 100644
--- a/src/server/master_server.h
+++ b/src/server/master_server.h
@@ -12,7 +12,7 @@
 #include "server/workspace.h"
 
 #include "kota/async/async.h"
-#include "kota/codec/raw_value.h"
+#include "kota/codec/json/json.h"
 #include "kota/ipc/peer.h"
 #include "llvm/ADT/DenseMap.h"
 
diff --git a/src/server/protocol.h b/src/server/protocol.h
index 641c0344..1a2774c7 100644
--- a/src/server/protocol.h
+++ b/src/server/protocol.h
@@ -9,7 +9,7 @@
 
 #include "syntax/token.h"
 
-#include "kota/codec/raw_value.h"
+#include "kota/codec/json/json.h"
 #include "kota/ipc/lsp/protocol.h"
 #include "kota/ipc/protocol.h"
 
diff --git a/src/server/worker_common.h b/src/server/worker_common.h
index fb73e40d..45bfa3a4 100644
--- a/src/server/worker_common.h
+++ b/src/server/worker_common.h
@@ -8,8 +8,7 @@
 
 #include "compile/compilation.h"
 
-#include "kota/codec/json/serializer.h"
-#include "kota/codec/raw_value.h"
+#include "kota/codec/json/json.h"
 #include "kota/ipc/codec/json.h"
 
 namespace clice {
diff --git a/tests/unit/server/config_tests.cpp b/tests/unit/server/config_tests.cpp
index f29f8101..1cfb550a 100644
--- a/tests/unit/server/config_tests.cpp
+++ b/tests/unit/server/config_tests.cpp
@@ -6,7 +6,7 @@
 #include "support/filesystem.h"
 
 #include "kota/codec/json/json.h"
-#include "kota/codec/toml.h"
+#include "kota/codec/toml/toml.h"
 
 namespace clice::testing {
 
diff --git a/tests/unit/server/stateful_worker_tests.cpp b/tests/unit/server/stateful_worker_tests.cpp
index 8ef42608..d16f6c62 100644
--- a/tests/unit/server/stateful_worker_tests.cpp
+++ b/tests/unit/server/stateful_worker_tests.cpp
@@ -5,7 +5,7 @@
 #include "server/protocol.h"
 #include "server/worker_test_helpers.h"
 
-#include "kota/codec/raw_value.h"
+#include "kota/codec/json/json.h"
 
 namespace clice::testing {
 
diff --git a/tests/unit/server/stateless_worker_tests.cpp b/tests/unit/server/stateless_worker_tests.cpp
index e79a6b79..0cc8b484 100644
--- a/tests/unit/server/stateless_worker_tests.cpp
+++ b/tests/unit/server/stateless_worker_tests.cpp
@@ -6,7 +6,6 @@
 #include "server/worker_test_helpers.h"
 
 #include "kota/codec/bincode/bincode.h"
-#include "kota/codec/raw_value.h"
 
 namespace clice::testing {