diff --git a/src/libs/zeroconf/embed/CommonServices.h b/src/libs/zeroconf/embed/CommonServices.h
index 1261f1d5ab3..a1c1f7a11d2 100644
--- a/src/libs/zeroconf/embed/CommonServices.h
+++ b/src/libs/zeroconf/embed/CommonServices.h
@@ -766,7 +766,7 @@
 	typedef uint32_t					uint_fast32_t;
 	typedef uint64_t					uint_fast64_t;
 
-	#if( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE )
+	#if (( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE ) && !defined( _WIN32 ) )
 		typedef long int				intptr_t;
 		typedef unsigned long int		uintptr_t;
 	#endif
diff --git a/src/libs/zeroconf/embed/dnssd_clientlib.c b/src/libs/zeroconf/embed/dnssd_clientlib.c
index 2a5dd956abe..6bd7465c344 100644
--- a/src/libs/zeroconf/embed/dnssd_clientlib.c
+++ b/src/libs/zeroconf/embed/dnssd_clientlib.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dns_sd_types.h"
+#include "../dns_sd_types.h"
 
 #if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
 //#pragma export on
@@ -49,7 +49,7 @@
  *********************************************************************************************/
 namespace ZeroConf { namespace embeddedLib {
 
-#include "dns_sd_funct.h"
+#include "../dns_sd_funct.h"
 
 #define mDNSIsDigit(X)     ((X) >= '0' && (X) <= '9')
 
diff --git a/src/libs/zeroconf/embed/dnssd_clientstub.c b/src/libs/zeroconf/embed/dnssd_clientstub.c
index 7c94862be8f..42df2b6f82c 100644
--- a/src/libs/zeroconf/embed/dnssd_clientstub.c
+++ b/src/libs/zeroconf/embed/dnssd_clientstub.c
@@ -36,15 +36,15 @@
 #include "dnssd_ipc.h"
 
 namespace ZeroConf { namespace embeddedLib {
-#include "dns_sd_funct.h"
+#include "../dns_sd_funct.h"
 static int gDaemonErr = kDNSServiceErr_NoError;
         }}
 
 #if defined(_WIN32)
 
         #define _SSIZE_T
-        #include "embed/CommonServices.h"
-        #include "embed/DebugServices.h"
+        #include "CommonServices.h"
+        #include "DebugServices.h"
         #include <winsock2.h>
         #include <ws2tcpip.h>
         #include <windows.h>
diff --git a/src/libs/zeroconf/embed/dnssd_ipc.h b/src/libs/zeroconf/embed/dnssd_ipc.h
index 833b51f050e..e116515e35e 100644
--- a/src/libs/zeroconf/embed/dnssd_ipc.h
+++ b/src/libs/zeroconf/embed/dnssd_ipc.h
@@ -29,7 +29,7 @@
 #ifndef DNSSD_IPC_H
 #define DNSSD_IPC_H
 
-#include "dns_sd_types.h"
+#include "../dns_sd_types.h"
 
 //
 // Common cross platform services