diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 11e2a940b7439ad3fcac11edcdbb75a598a50330..dc7d93970b0ebf599a44f3ec8fcad227d479f508 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -56,6 +56,8 @@
 #include <dvdread/nav_read.h>
 #include <dvdread/nav_print.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/access/http.c b/modules/access/http.c
index 4a1e7845d0890317be34262d9c25f09d19ca7c3e..9b28a2360fc921231bb2b060f0753f722f0e57e2 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -50,6 +50,8 @@
 #   include <zlib.h>
 #endif
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 3f2dc941de2763f4c720a47c12b320238ffe94f7..8dc7a20be2ffdee87346e6bfc92c22fb938a3861 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -34,6 +34,8 @@
 
 #include <pulse/pulseaudio.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * aout_sys_t: Pulseaudio output method descriptor
  *****************************************************************************
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 5669c29fd4be58ba1d343b6f39efa9b14f1bc1c7..337ccad7e31e03037170f9be3975d5465d93c247 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -52,6 +52,8 @@
 #include <errno.h>
 #include <string.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
diff --git a/modules/codec/cmml/xtag.c b/modules/codec/cmml/xtag.c
index 812e280a264e5fe3a9a2b725fd80a512222d49a9..a7e3b97633f1fe41d9dcb14487c292bbe14a63c0 100644
--- a/modules/codec/cmml/xtag.c
+++ b/modules/codec/cmml/xtag.c
@@ -36,6 +36,8 @@
 
 #include <xlist.h>
 
+#include <assert.h>
+
 #undef XTAG_DEBUG
 
 #undef FALSE
diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 15b950a97b8eaeb32408e68bf8b179217f9c29c6..a69e126a0a082f7dae203041d05f23649139e6d3 100644
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -57,6 +57,8 @@
 
 #include <math.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 877c0e71979e9b5e1ff432857dda0290fbaf521a..9aab7046ffe3b67e791c9eb04c2b61077ac3a7ce 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -29,6 +29,8 @@
 #include "http.h"
 #include <vlc_plugin.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 143d38673cd71fc13293f234c05b1f73b69d2173..ae655816d8bb09210735cf77e1c6361e89325ad1 100644
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -29,6 +29,8 @@
 #include "http.h"
 #include <limits.h>
 
+#include <assert.h>
+
 /* Utility function for scandir */
 static int Filter( const char *foo )
 {
diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index 7ff632f4e57844991a83e4343bc8e9433f7e2710..dbf6884d46d96bf1ae45009c06cf615d12521fd8 100644
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -31,6 +31,8 @@
 #include <vlc_charset.h>
 #include <limits.h>
 
+#include <assert.h>
+
 #define TEMPO_MIN  20
 #define TEMPO_MAX 250 /* Beats per minute */
 
diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index c30b601d401eac7f3943fdf28a5c38330fe24c7b..af620291d740c660ea627f434b3acdcd997a330b 100644
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -47,6 +47,8 @@
 #include "vlc_input.h"
 #include "../codec/cc.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 75696d8ffba2715df60d81aa6532223bfdd52b48..e2792965a7f19d8c80ab709b64a5a8e1aa590380 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -57,6 +57,8 @@
 #include <vlc_playlist.h>
 #include <vlc_meta.h>
 
+#include <assert.h>
+
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/modules/gui/skins2/unzip/unzip.c b/modules/gui/skins2/unzip/unzip.c
index cdb2efd531a5adcbf85d025017f14a4197436344..72f2dff331f2982f1f9459de48e73a6c871ab78b 100644
--- a/modules/gui/skins2/unzip/unzip.c
+++ b/modules/gui/skins2/unzip/unzip.c
@@ -49,6 +49,7 @@ woven in by Terry Thorsen 1/2003.
 #   include <errno.h>
 #endif
 
+#include <assert.h>
 
 #ifndef local
 #  define local static
diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index 9f5d8ef371268219a50468d43fe09bd682d2fff8..257c2a6e0bd746b40f16f4bea3ee7d06b0848d3f 100644
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -38,6 +38,8 @@
 
 #include "musicbrainz/mb_c.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 218337ecacb2ab385d274d7f65af98862bda2018..f90ac48ab919137f16deb697b153f3fdff898093 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -73,6 +73,8 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
+#include <assert.h>
+
 typedef struct line_desc_t line_desc_t;
 
 /*****************************************************************************
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 629d470181a1c8afee09db4076aff6919e6af9bc..465a13e0d5d6153cd8cec7fce1de53e0d59002e1 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -65,6 +65,8 @@
 
 #include "dhparams.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 532cfd75da5fc0e8139de1a4fc6b46e02fa8b1c0..05b6b210c98dfcc7c2bf70e55746694cfe11347c 100644
--- a/modules/misc/playlist/m3u.c
+++ b/modules/misc/playlist/m3u.c
@@ -37,6 +37,8 @@
 
 #include <errno.h>                                                 /* ENOMEM */
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c
index e2a7886c6ab93667dfc7c4b0519c56252991fdb7..d854de27a471524d27c22d683f41d230b9249205 100644
--- a/modules/misc/playlist/xspf.c
+++ b/modules/misc/playlist/xspf.c
@@ -40,6 +40,8 @@
 #include <vlc_charset.h>
 #include "xspf.h"
 
+#include <assert.h>
+
 /**
  * \brief Prints the XSPF header to file, writes each item by xspf_export_item()
  * and closes the open xml elements
diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index e1a06b9331e22e7e4c2577468e3e242e0a618939..ef33b2a05156c7098791e54cd14cd5c658eecda6 100644
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -40,6 +40,8 @@
 #include <ctype.h>
 #include <stdarg.h>
 
+#include <assert.h>
+
 #undef XTAG_DEBUG
 
 typedef struct _XList
diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 304be30ad29a50f85eecc465d142acbb4f88e1eb..c9b16d7d36933e89a4e2583521f02aee07bdc9cb 100644
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -42,6 +42,8 @@
 
 #include "vlc_block_helper.h"
 
+#include <assert.h>
+
 /* AAC Config in ES:
  *
  * AudioObjectType          5 bits
diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index 288567dc134972d2ddae36fe929c29a9ceda5a9d..935734708a59ff8923968724cd9b9533010a19f9 100644
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -35,6 +35,8 @@
 #include <vlc_block.h>
 #include <vlc_sout.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
diff --git a/modules/stream_out/rtcp.c b/modules/stream_out/rtcp.c
index 1bc580ad60ec17f34a6d5e7ea597028e49180357..8458f77f4c9e505cc2315fb3e3b291043befb3b3 100644
--- a/modules/stream_out/rtcp.c
+++ b/modules/stream_out/rtcp.c
@@ -34,6 +34,8 @@
 #include <vlc_sout.h>
 #include "rtp.h"
 
+#include <assert.h>
+
 /*
  * NOTE on RTCP implementation:
  * - there is a single sender (us), no conferencing here! => n = sender = 1,
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index d8dcc1c9a3e785ccd6d0f12f953d02a6c3072cbc..1cd6ee53b7e547004364398d473546dc19f19ce0 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -61,6 +61,8 @@
 
 #include <errno.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index ccedc51d3c0c498a766cae0686ed15432fe7854f..60d721fcee376bc3cfadffd2e5bd1030f215d3b1 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -45,6 +45,8 @@
 
 #define MASTER_SYNC_MAX_DRIFT 100000
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index acb96b3749c045304acbacf57d6f5a184b5241b5..bf665df338dfd4a1ada7a2ee865c53f2e8a8cb37 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -40,6 +40,8 @@
 #include "configuration.h"
 #include "modules/modules.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * config_LoadCmdLine: parse command line
  *****************************************************************************