diff --git a/src/mhd2/daemon_options.h b/src/mhd2/daemon_options.h
index a156b194..5cad1b28 100644
--- a/src/mhd2/daemon_options.h
+++ b/src/mhd2/daemon_options.h
@@ -11,8 +11,10 @@
 #ifndef MHD_DAEMON_OPTIONS_H
 #define MHD_DAEMON_OPTIONS_H 1
 
-#include "microhttpd2.h"
-#include "internal.h"
+#include "mhd_sys_options.h"
+
+#include "mhd_public_api.h"
+
 
 struct DaemonOptions {
   /**
diff --git a/src/mhd2/response_options.h b/src/mhd2/response_options.h
index fc755ff0..d3c55558 100644
--- a/src/mhd2/response_options.h
+++ b/src/mhd2/response_options.h
@@ -11,8 +11,10 @@
 #ifndef MHD_RESPONSE_OPTIONS_H
 #define MHD_RESPONSE_OPTIONS_H 1
 
-#include "microhttpd2.h"
-#include "internal.h"
+#include "mhd_sys_options.h"
+
+#include "mhd_public_api.h"
+
 
 struct ResponseOptions {
   /**