2 files changed, 14 insertions, 1 deletions

diff --git a/src/microhttpd/tsearch.c b/src/microhttpd/tsearch.c
index 2ab9a467..8889f32d 100644
--- a/src/microhttpd/tsearch.c
+++ b/src/microhttpd/tsearch.c
@@ -11,9 +11,11 @@
  * Totally public domain.
  */
 
+#ifndef _MSC_FULL_VER
 #include <sys/cdefs.h>
+#endif //! _MSC_FULL_VER
 #define _SEARCH_PRIVATE
-#include <tsearch.h>
+#include "tsearch.h"
 #include <stdlib.h>
 
 /* find or insert datum into search tree */
diff --git a/src/microhttpd/tsearch.h b/src/microhttpd/tsearch.h
index 824f9a2d..ec9c92de 100644
--- a/src/microhttpd/tsearch.h
+++ b/src/microhttpd/tsearch.h
@@ -9,7 +9,18 @@
 #ifndef _SEARCH_H_
 #define _SEARCH_H_
 
+#ifndef _MSC_FULL_VER
 #include <sys/cdefs.h>
+#endif  /* _MSC_FULL_VER */
+#if !defined(__BEGIN_DECLS) || !defined(__END_DECLS)
+#if defined(__cplusplus)
+#define __BEGIN_DECLS   extern "C" {
+#define __END_DECLS     };
+#else  /* !__cplusplus */
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif /* !__cplusplus */
+#endif /* !__BEGIN_DECLS || !__END_DECLS */
 #include <sys/types.h>
 
 typedef enum {