diff --git a/client/iOS/.gitignore b/client/iOS/.gitignore
index fe0e7b029..8bcaf57e4 100644
--- a/client/iOS/.gitignore
+++ b/client/iOS/.gitignore
@@ -1,4 +1,5 @@
 # XCode files
+DerivedData
 project.xcworkspace/
 xcuserdata/
 bin/
diff --git a/winpr/include/winpr/interlocked.h b/winpr/include/winpr/interlocked.h
index c9a798b23..0fea91a72 100644
--- a/winpr/include/winpr/interlocked.h
+++ b/winpr/include/winpr/interlocked.h
@@ -23,9 +23,15 @@
 #include <winpr/spec.h>
 #include <winpr/winpr.h>
 #include <winpr/wtypes.h>
+#include <winpr/platform.h>
 
 #ifndef _WIN32
 
+/* workaround for SLIST_ENTRY conflict */
+
+#include <sys/queue.h>
+#undef SLIST_ENTRY
+
 #ifndef CONTAINING_RECORD
 #define CONTAINING_RECORD(address, type, field) \
 		((type *)(((ULONG_PTR) address) - (ULONG_PTR)(&(((type *) 0)->field))))