diff --git a/services/herdd/service.c b/services/herdd/service.c
index 0a9d36f..6eac611 100644
--- a/services/herdd/service.c
+++ b/services/herdd/service.c
@@ -5,7 +5,8 @@
 #include <errno.h>
 #include <fx/collections/array.h>
 #include <fx/collections/hashtable.h>
-#include <fx/serial.h>
+#include <fx/serial/ctx.h>
+#include <fx/serial/toml.h>
 #include <fx/string.h>
 #include <fx/stringstream.h>
 #include <launch.h>
diff --git a/services/herdd/target.c b/services/herdd/target.c
index dde35f2..a55c74d 100644
--- a/services/herdd/target.c
+++ b/services/herdd/target.c
@@ -6,7 +6,8 @@
 #include <errno.h>
 #include <fx/collections/array.h>
 #include <fx/collections/hashtable.h>
-#include <fx/serial.h>
+#include <fx/serial/ctx.h>
+#include <fx/serial/toml.h>
 #include <fx/string.h>
 #include <fx/stringstream.h>
 #include <magenta/log.h>