diff --git a/lib/mammoth/ipc/endpoint_server.h b/lib/mammoth/ipc/endpoint_server.h
index cb18949..44a70bc 100644
--- a/lib/mammoth/ipc/endpoint_server.h
+++ b/lib/mammoth/ipc/endpoint_server.h
@@ -5,8 +5,8 @@
 #include <ztypes.h>
 
 #include "mammoth/ipc/endpoint_client.h"
-#include "mammoth/request_context.h"
-#include "mammoth/response_context.h"
+#include "mammoth/ipc/request_context.h"
+#include "mammoth/ipc/response_context.h"
 #include "mammoth/thread.h"
 
 class EndpointServer {
diff --git a/lib/mammoth/include/mammoth/request_context.h b/lib/mammoth/ipc/request_context.h
similarity index 100%
rename from lib/mammoth/include/mammoth/request_context.h
rename to lib/mammoth/ipc/request_context.h
diff --git a/lib/mammoth/include/mammoth/response_context.h b/lib/mammoth/ipc/response_context.h
similarity index 100%
rename from lib/mammoth/include/mammoth/response_context.h
rename to lib/mammoth/ipc/response_context.h
diff --git a/sys/denali/ahci/command.h b/sys/denali/ahci/command.h
index 2f85d82..8cb4b9c 100644
--- a/sys/denali/ahci/command.h
+++ b/sys/denali/ahci/command.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <mammoth/memory_region.h>
-#include <mammoth/response_context.h>
 #include <mammoth/sync/semaphore.h>
 #include <stdint.h>