diff --git a/src/engine/audio/Audio_DirectSound.cpp b/src/engine/audio/Audio_DirectSound.cpp
index 91590369..05462417 100644
--- a/src/engine/audio/Audio_DirectSound.cpp
+++ b/src/engine/audio/Audio_DirectSound.cpp
@@ -10,6 +10,7 @@
 #include "../Helper/HL_Exception.h"
 #include "../Helper/HL_Log.h"
 
+#include <assert.h>
 #include <dsconf.h>
 #include <process.h>
 #pragma comment(lib, "dsound.lib")
diff --git a/src/engine/audio/Audio_WavFile.cpp b/src/engine/audio/Audio_WavFile.cpp
index 247eceec..f96560c4 100644
--- a/src/engine/audio/Audio_WavFile.cpp
+++ b/src/engine/audio/Audio_WavFile.cpp
@@ -26,7 +26,9 @@ typedef struct {
   WORD  nBlockAlign;
   WORD  wBitsPerSample;
   WORD  cbSize;
-}WAVEFORMATEX;
+}
+WaveFormatEx;
+
 #define WAVE_FORMAT_PCM 1
 
 #define LOG_SUBSYSTEM "WavFileReader"
@@ -293,7 +295,7 @@ bool WavFileWriter::open(const std::tstring& filename, int rate, int channels)
   DWORD dwFmtSize = 16; /*= 16L*/;
   checkWriteResult( fwrite(&dwFmtSize, sizeof(dwFmtSize), 1, mHandle) );
 
-  WAVEFORMATEX format;
+  WaveFormatEx format;
   format.wFormatTag = WAVE_FORMAT_PCM; 
   checkWriteResult( fwrite(&format.wFormatTag, sizeof(format.wFormatTag), 1, mHandle) );
   
diff --git a/src/engine/helper/HL_NetworkFrame.h b/src/engine/helper/HL_NetworkFrame.h
index 5dc5b571..06ca0d77 100644
--- a/src/engine/helper/HL_NetworkFrame.h
+++ b/src/engine/helper/HL_NetworkFrame.h
@@ -35,7 +35,11 @@ public:
     uint16_t  mEtherType; /* IP? ARP? RARP? etc */
   };
 
+#if defined(TARGET_WIN)
+  struct /*__attribute__((packed))*/ LinuxSllHeader
+#else
   struct __attribute__((packed)) LinuxSllHeader
+#endif
   {
     uint16_t mPacketType;
     uint16_t mARPHRD;
diff --git a/src/engine/helper/HL_NetworkSocket.cpp b/src/engine/helper/HL_NetworkSocket.cpp
index 86f58d3d..e4b7f725 100644
--- a/src/engine/helper/HL_NetworkSocket.cpp
+++ b/src/engine/helper/HL_NetworkSocket.cpp
@@ -14,7 +14,9 @@
 # include <fcntl.h>
 #endif
 
-#include <unistd.h>
+#if !defined(TARGET_WIN)
+# include <unistd.h>
+#endif
 #include <assert.h>
 
 DatagramSocket::DatagramSocket()
diff --git a/src/engine/helper/HL_Rtp.cpp b/src/engine/helper/HL_Rtp.cpp
index 4db4a4b5..9889e197 100644
--- a/src/engine/helper/HL_Rtp.cpp
+++ b/src/engine/helper/HL_Rtp.cpp
@@ -9,7 +9,9 @@
 
 #include "jrtplib/src/rtprawpacket.h"
 #include "jrtplib/src/rtpipv4address.h"
-#include <alloca.h>
+#if !defined(TARGET_WIN)
+# include <alloca.h>
+#endif
 #include <sstream>
 #include <tuple>
 
diff --git a/src/engine/helper/HL_SocketHeap.cpp b/src/engine/helper/HL_SocketHeap.cpp
index b643c53b..4ca30919 100644
--- a/src/engine/helper/HL_SocketHeap.cpp
+++ b/src/engine/helper/HL_SocketHeap.cpp
@@ -10,7 +10,10 @@
 #endif
 #include <set>
 #include <assert.h>
-#include <unistd.h> // Responsible for close() call on Linux
+
+#if !defined(TARGET_WIN)
+# include <unistd.h> // Responsible for close() call on Linux
+#endif
 
 #include "HL_SocketHeap.h"
 #include "HL_Log.h"
diff --git a/src/engine/helper/HL_Uuid.cpp b/src/engine/helper/HL_Uuid.cpp
index b727fa55..9998fce1 100644
--- a/src/engine/helper/HL_Uuid.cpp
+++ b/src/engine/helper/HL_Uuid.cpp
@@ -4,7 +4,7 @@
 Uuid::Uuid()
 {
 #if defined(TARGET_WIN) || defined(TARGET_LINUX) || defined(TARGET_OSX)
-  memset(mUuid, 0, sizeof mUuid);
+  memset(&mUuid, 0, sizeof mUuid);
 #endif
 }
 
diff --git a/src/engine/media/CMakeLists.txt b/src/engine/media/CMakeLists.txt
index 63552206..0b21e150 100644
--- a/src/engine/media/CMakeLists.txt
+++ b/src/engine/media/CMakeLists.txt
@@ -7,7 +7,7 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
 file(GLOB MEDIA_LIB_SOURCES "*.cpp" "*.h")
 
 # SRTP requires this
-add_definitions(-DHAVE_STDINT_H -DHAVE_UINT64_T -DHAVE_NETINET_IN_H)
+add_definitions(-DHAVE_STDINT_H -DHAVE_UINT64_T)
 
 if(CMAKE_SYSTEM MATCHES "Linux*")
     add_definitions(-DHAVE_NETINET_IN_H)
diff --git a/src/engine/media/MT_AudioCodec.cpp b/src/engine/media/MT_AudioCodec.cpp
index cab9993e..2c333109 100644
--- a/src/engine/media/MT_AudioCodec.cpp
+++ b/src/engine/media/MT_AudioCodec.cpp
@@ -1,8 +1,10 @@
-/* Copyright(C) 2007-2017 VoIPobjects (voipobjects.com)
+/* Copyright(C) 2007-2018 VoIPobjects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#define NOMINMAX
+
 #include "../config.h"
 #include "MT_AudioCodec.h"
 #include "MT_CodecList.h"
@@ -23,6 +25,7 @@
 #include <assert.h>
 #include <memory.h>
 #include <string.h>
+#include <algorithm>
 
 #define LOG_SUBSYSTEM "Codec"
 
@@ -1430,4 +1433,4 @@ PCodec GsmHrCodec::GsmHrFactory::create()
 {
   return PCodec(new GsmHrCodec());
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp
index 4ef52374..f1b1994e 100644
--- a/src/engine/media/MT_AudioReceiver.cpp
+++ b/src/engine/media/MT_AudioReceiver.cpp
@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#define NOMINMAX
 
 #include "../config.h"
 #include "MT_AudioReceiver.h"
@@ -16,6 +17,8 @@
 # include "MT_AmrCodec.h"
 #endif
 
+#include <algorithm>
+
 #define LOG_SUBSYSTEM "AudioReceiver"
 
 //#define DUMP_DECODED
diff --git a/src/engine/media/MT_SevanaMos.cpp b/src/engine/media/MT_SevanaMos.cpp
index 67c9cef7..3f2baa7a 100644
--- a/src/engine/media/MT_SevanaMos.cpp
+++ b/src/engine/media/MT_SevanaMos.cpp
@@ -1,3 +1,5 @@
+#define NOMINMAX
+
 //#include "config.h"
 #include "MT_SevanaMos.h"
 
@@ -19,6 +21,7 @@ using namespace boost::filesystem;
 #include <streambuf>
 #include <iostream>
 #include <atomic>
+#include <algorithm>
 
 #if defined(PVQA_SERVER)
 extern std::string IntervalCacheDir;
diff --git a/src/libs/ice/ICEStunMessage.cpp b/src/libs/ice/ICEStunMessage.cpp
index 45ffe715..dc84e921 100644
--- a/src/libs/ice/ICEStunMessage.cpp
+++ b/src/libs/ice/ICEStunMessage.cpp
@@ -14,6 +14,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
+#include <algorithm>
 
 #ifndef _WIN32
 # include <arpa/inet.h>