diff --git a/ffserver.c b/ffserver.c
index aa8e72c896..33508ec5eb 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -17,10 +17,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #define HAVE_AV_CONFIG_H
+#include <netinet/in.h>
 #include "avformat.h"
 
 #include <stdarg.h>
-#include <netinet/in.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -31,7 +31,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <arpa/inet.h>
+#ifndef __BEOS__
+# include <arpa/inet.h>
+#else
+# include "libav/barpainet.h"
+#endif
 #include <netdb.h>
 #include <ctype.h>
 #include <signal.h>
diff --git a/libav/http.c b/libav/http.c
index 7271a6da81..64025f2258 100644
--- a/libav/http.c
+++ b/libav/http.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtp.c b/libav/rtp.c
index 714787c88b..b42065fbea 100644
--- a/libav/rtp.c
+++ b/libav/rtp.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtpproto.c b/libav/rtpproto.c
index 41823fc829..25b10b8bf2 100644
--- a/libav/rtpproto.c
+++ b/libav/rtpproto.c
@@ -16,12 +16,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 
 #include <unistd.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtsp.c b/libav/rtsp.c
index 81b59f8916..667a3c095a 100644
--- a/libav/rtsp.c
+++ b/libav/rtsp.c
@@ -16,10 +16,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <netinet/in.h>
 #include "avformat.h"
 
 #include <sys/time.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/tcp.c b/libav/tcp.c
index 61d8665525..6f4c037dcb 100644
--- a/libav/tcp.c
+++ b/libav/tcp.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/udp.c b/libav/udp.c
index 8df93a8a8a..6e91a22350 100644
--- a/libav/udp.c
+++ b/libav/udp.c
@@ -16,10 +16,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>