12 files changed, 21 insertions, 16 deletions
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
index df21eaf291..7d009e7596 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
@@ -28,6 +28,7 @@
 #include "DVDClock.h"
 #include "Application.h"
 #include "utils/log.h"
+#include <arpa/inet.h>
 
 extern "C" {
 #include "lib/libhts/net.h"
diff --git a/xbmc/filesystem/SAPDirectory.cpp b/xbmc/filesystem/SAPDirectory.cpp
index 1771ff1287..eed98e12c7 100644
--- a/xbmc/filesystem/SAPDirectory.cpp
+++ b/xbmc/filesystem/SAPDirectory.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #include <vector>
 
 //using namespace std; On VS2010, bind conflicts with std::bind
diff --git a/xbmc/filesystem/VTPFile.cpp b/xbmc/filesystem/VTPFile.cpp
index c75b84d809..5a3306d55d 100644
--- a/xbmc/filesystem/VTPFile.cpp
+++ b/xbmc/filesystem/VTPFile.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "system.h" // WIN32INCLUDES - this is for SD_BOTH primarily, and must be included prior to VTPFile.h for some reason
+#include "system.h"
 #include "VTPFile.h"
 #include "VTPSession.h"
 #include "utils/URIUtils.h"
@@ -27,10 +27,6 @@
 #include "utils/log.h"
 #include "video/VideoInfoTag.h"
 
-#ifdef _LINUX
-#define SD_BOTH SHUT_RDWR
-#endif
-
 using namespace XFILE;
 using namespace std;
 
@@ -157,7 +153,7 @@ bool CVTPFile::NextChannel()
 
     if(m_socket != INVALID_SOCKET)
     {
-      shutdown(m_socket, SD_BOTH);
+      shutdown(m_socket, SHUT_RDWR);
       m_session->AbortStreamLive();
       closesocket(m_socket);
     }
@@ -185,7 +181,7 @@ bool CVTPFile::PrevChannel()
 
     if(m_socket != INVALID_SOCKET)
     {
-      shutdown(m_socket, SD_BOTH);
+      shutdown(m_socket, SHUT_RDWR);
       m_session->AbortStreamLive();
       closesocket(m_socket);
     }
@@ -207,7 +203,7 @@ bool CVTPFile::SelectChannel(unsigned int channel)
 
   if(m_socket != INVALID_SOCKET)
   {
-    shutdown(m_socket, SD_BOTH);
+    shutdown(m_socket, SHUT_RDWR);
     m_session->AbortStreamLive();
     closesocket(m_socket);
   }
diff --git a/xbmc/filesystem/VTPFile.h b/xbmc/filesystem/VTPFile.h
index 02ab6fb1af..236e46b771 100644
--- a/xbmc/filesystem/VTPFile.h
+++ b/xbmc/filesystem/VTPFile.h
@@ -23,6 +23,7 @@
 #include "IFile.h"
 #include "ILiveTV.h"
 
+#include <sys/socket.h>
 
 class CVTPSession;
 
diff --git a/xbmc/filesystem/VTPSession.cpp b/xbmc/filesystem/VTPSession.cpp
index f149b17113..c3916906ee 100644
--- a/xbmc/filesystem/VTPSession.cpp
+++ b/xbmc/filesystem/VTPSession.cpp
@@ -30,6 +30,7 @@
 
 #include <sys/socket.h>
 #include <netdb.h>
+#include <arpa/inet.h>
 
 //using namespace std; On VS2010, bind conflicts with std::bind
 
diff --git a/xbmc/linux/XLCDproc.cpp b/xbmc/linux/XLCDproc.cpp
index 97efeeb374..38652ba20c 100644
--- a/xbmc/linux/XLCDproc.cpp
+++ b/xbmc/linux/XLCDproc.cpp
@@ -26,6 +26,8 @@
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
 
+#include <netdb.h>
+
 #define SCROLL_SPEED_IN_MSEC 250
 
 
diff --git a/xbmc/network/DNSNameCache.cpp b/xbmc/network/DNSNameCache.cpp
index bbb5d20fd6..a6befa8969 100644
--- a/xbmc/network/DNSNameCache.cpp
+++ b/xbmc/network/DNSNameCache.cpp
@@ -24,6 +24,9 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 
+#include <arpa/inet.h>
+#include <netdb.h>
+
 CDNSNameCache g_DNSCache;
 
 CCriticalSection CDNSNameCache::m_critical;
diff --git a/xbmc/network/Network.cpp b/xbmc/network/Network.cpp
index bd731f0512..9760f89bac 100644
--- a/xbmc/network/Network.cpp
+++ b/xbmc/network/Network.cpp
@@ -28,6 +28,8 @@
 #include "utils/log.h"
 #include "guilib/LocalizeStrings.h"
 
+#include <arpa/inet.h>
+
 using namespace std;
 
 /* slightly modified in_ether taken from the etherboot project (http://sourceforge.net/projects/etherboot) */
diff --git a/xbmc/network/UdpClient.cpp b/xbmc/network/UdpClient.cpp
index 78351a7f18..23ad81fb4e 100644
--- a/xbmc/network/UdpClient.cpp
+++ b/xbmc/network/UdpClient.cpp
@@ -28,6 +28,8 @@
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
 
+#include <arpa/inet.h>
+
 #define UDPCLIENT_DEBUG_LEVEL LOGDEBUG
 
 CUdpClient::CUdpClient(void) : CThread()
diff --git a/xbmc/network/UdpClient.h b/xbmc/network/UdpClient.h
index 053b93d9ec..14b304e41c 100644
--- a/xbmc/network/UdpClient.h
+++ b/xbmc/network/UdpClient.h
@@ -22,6 +22,8 @@
 
 #include "utils/StdString.h"
 #include "threads/Thread.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 class CUdpClient : CThread
 {
diff --git a/xbmc/system.h b/xbmc/system.h
index 7df1185b48..6f6277c688 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -163,9 +163,6 @@
  ****************************************/
 
 #ifdef _WIN32
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))
-#include <winsock2.h>
-#endif
 #include <windows.h>
 #define DIRECTINPUT_VERSION 0x0800
 #include "mmsystem.h"
@@ -183,13 +180,8 @@
 #endif
 
 #ifdef _LINUX
-#include <unistd.h>
 #include <time.h>
 #include <sys/time.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <errno.h>
 #include "PlatformInclude.h"
diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
index 1de51964da..33c3ccb990 100644
--- a/xbmc/utils/URIUtils.cpp
+++ b/xbmc/utils/URIUtils.cpp
@@ -31,6 +31,8 @@
 #include "settings/Settings.h"
 #include "URL.h"
 
+#include <arpa/inet.h>
+
 using namespace std;
 using namespace XFILE;