memorypool: refactored includes, moved out unrelated function

3 files changed, 18 insertions, 16 deletions

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 8ec310cc..2729bb21 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -235,6 +235,21 @@ MHD_default_logger_ (void *cls,
 
 
 /**
+ * Free the memory given by @a ptr. Calls "free(ptr)".  This function
+ * should be used to free the username returned by
+ * #MHD_digest_auth_get_username().
+ * @note Since v0.9.56
+ *
+ * @param ptr pointer to free.
+ */
+_MHD_EXTERN void
+MHD_free (void *ptr)
+{
+  free (ptr);
+}
+
+
+/**
  * Trace up to and return master daemon. If the supplied daemon
  * is a master, then return the daemon itself.
  *
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index 9639d552..415b8aa5 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -25,6 +25,7 @@
  * @author Karlson2k (Evgeny Grin)
  */
 #include "memorypool.h"
+#include "internal.h"
 #include "mhd_assert.h"
 
 /* define MAP_ANONYMOUS for Mac OS X */
@@ -81,21 +82,6 @@ struct MemoryPool
 
 
 /**
- * Free the memory given by @a ptr. Calls "free(ptr)".  This function
- * should be used to free the username returned by
- * #MHD_digest_auth_get_username().
- * @note Since v0.9.56
- *
- * @param ptr pointer to free.
- */
-_MHD_EXTERN void
-MHD_free (void *ptr)
-{
-  free (ptr);
-}
-
-
-/**
  * Create a memory pool.
  *
  * @param max maximum size of the pool
diff --git a/src/microhttpd/memorypool.h b/src/microhttpd/memorypool.h
index 69b7e851..2863b2f3 100644
--- a/src/microhttpd/memorypool.h
+++ b/src/microhttpd/memorypool.h
@@ -30,7 +30,8 @@
 #ifndef MEMORYPOOL_H
 #define MEMORYPOOL_H
 
-#include "internal.h"
+#include "mhd_options.h"
+#include <stddef.h>
 
 /**
  * Opaque handle for a memory pool.