diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 963510599d..f0594c0f48 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -118,6 +118,7 @@ videocodec divx4
 videocodec ffdivx
   info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
   status working
+  fourcc MPG3,mpg3 div3
   fourcc MP43,mp43 div3   ; M$ MPEG4 v3   (fourcc mapping to div3)
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
diff --git a/asf_streaming.c b/asf_streaming.c
index 6da59efa4a..5205a143b6 100644
--- a/asf_streaming.c
+++ b/asf_streaming.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "url.h"
 #include "http.h"
diff --git a/asfheader.c b/asfheader.c
index 8b20958221..469aa98370 100644
--- a/asfheader.c
+++ b/asfheader.c
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/aviheader.c b/aviheader.c
index 72484b34fe..95dcab0c66 100644
--- a/aviheader.c
+++ b/aviheader.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/aviprint.c b/aviprint.c
index be4361886d..b0945ff3c2 100644
--- a/aviprint.c
+++ b/aviprint.c
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 //extern int verbose; // defined in mplayer.c
 
diff --git a/dec_audio.c b/dec_audio.c
index 6f2d5bde29..d79c581e92 100644
--- a/dec_audio.c
+++ b/dec_audio.c
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "libao2/afmt.h"
diff --git a/dec_video.c b/dec_video.c
index b6474e49ed..2751f540d0 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "config.h"
 
diff --git a/demux_asf.c b/demux_asf.c
index 6d2dee5c81..4b61e6c21f 100644
--- a/demux_asf.c
+++ b/demux_asf.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/demux_avi.c b/demux_avi.c
index 8120e97098..8c95e52034 100644
--- a/demux_avi.c
+++ b/demux_avi.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/demux_mpg.c b/demux_mpg.c
index 385a105118..e23ca06a9e 100644
--- a/demux_mpg.c
+++ b/demux_mpg.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/demuxer.c b/demuxer.c
index 47c269be00..d86b952f8b 100644
--- a/demuxer.c
+++ b/demuxer.c
@@ -1,10 +1,11 @@
 //=================== DEMUXER v2.5 =========================
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/dll_init.c b/dll_init.c
index fac99b531d..d31e42c16a 100644
--- a/dll_init.c
+++ b/dll_init.c
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "config.h"
 
diff --git a/mplayer.c b/mplayer.c
index a8deb9485d..0441b423b8 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1,7 +1,9 @@
 // AVI & MPEG Player    v0.18   (C) 2000-2001. by A'rpi/ESP-team
 
-#include "version.h"
-#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -15,11 +17,9 @@
 #include <time.h>
 
 #include <fcntl.h>
-#include <unistd.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "version.h"
+#include "config.h"
 
 #ifdef __FreeBSD__
 #include <sys/cdrio.h>
diff --git a/network.c b/network.c
index 54da6fbe79..e3fbd7a861 100644
--- a/network.c
+++ b/network.c
@@ -6,7 +6,11 @@
 
 //#define DUMP2FILE
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
+
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -19,9 +23,6 @@
 
 #include <errno.h>
 #include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/parse_es.c b/parse_es.c
index e92bc5ddfc..49a8cd21cb 100644
--- a/parse_es.c
+++ b/parse_es.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/seek.c b/seek.c
index 7667a74cf3..af390eb00c 100644
--- a/seek.c
+++ b/seek.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern int verbose; // defined in mplayer.c
 
diff --git a/stream.c b/stream.c
index b83f1405d6..9c3bef8b18 100644
--- a/stream.c
+++ b/stream.c
@@ -1,14 +1,14 @@
 
-#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <unistd.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "config.h"
 
 #include "stream.h"