diff --git a/meshcore/KVM/MacOS/mac_events.h b/meshcore/KVM/MacOS/mac_events.h
index d6bb5348..5284b505 100644
--- a/meshcore/KVM/MacOS/mac_events.h
+++ b/meshcore/KVM/MacOS/mac_events.h
@@ -1,13 +1,14 @@
 /*
- * linux_events.h
+ * mac_events.h
  *
  *  Created on: Jul 8, 2011
  *      Author: Intel
  */
 
-#ifndef LINUX_EVENTS_H_
-#define LINUX_EVENTS_H_
+#ifndef MAC_EVENTS_H_
+#define MAC_EVENTS_H_
 
+#ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #include <string.h>
 #include <stdio.h>
@@ -379,4 +380,7 @@ extern void MouseAction(double absX, double absY, int button, short wheel);
 extern void KeyAction(unsigned char vk, int up);
 extern void KeyActionUnicode(uint16_t unicode, int up);
 
-#endif /* LINUX_EVENTS_H_ */
+#endif /* __APPLE__ */
+
+#endif /* MAC_EVENTS_H_ */
+
diff --git a/microstack/ILibAsyncServerSocket.c b/microstack/ILibAsyncServerSocket.c
index f639b4b1..ec556346 100644
--- a/microstack/ILibAsyncServerSocket.c
+++ b/microstack/ILibAsyncServerSocket.c
@@ -19,6 +19,7 @@ limitations under the License.
 #include <crtdbg.h>
 #endif
 
+#if defined(WIN32)
 #if defined(WINSOCK2)
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -26,6 +27,7 @@ limitations under the License.
 #include <winsock.h>
 #include <wininet.h>
 #endif
+#endif
 
 #include "ILibParsers.h"
 #include "ILibAsyncServerSocket.h"
@@ -791,3 +793,4 @@ void ILibAsyncServerSocket_SSL_SetSink(ILibAsyncServerSocket_ServerModule AsyncS
 	((struct ILibAsyncServerSocketModule*)AsyncServerSocketModule)->OnSSLContext = handler;
 }
 #endif
+
diff --git a/samples/webrtc/C# Sample/WebRTC.cpp b/samples/webrtc/C# Sample/WebRTC.cpp
index 3ee6d37d..5357c717 100644
--- a/samples/webrtc/C# Sample/WebRTC.cpp	
+++ b/samples/webrtc/C# Sample/WebRTC.cpp	
@@ -21,10 +21,9 @@ limitations under the License.
 #include "stdafx.h"
 #include "WebRTC.h"
 
+#if defined(WIN32)
 #include <WinSock2.h>
 #include <WS2tcpip.h>
-
-#if defined(WIN32)
 #define _CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
 #endif
@@ -469,4 +468,4 @@ extern "C"
 		return(ILibSCTP_Debug_SetDebugCallback(((void**)connection)[0], debugField, handler));
 	}
 #endif
-}
\ No newline at end of file
+}