diff --git a/src/compat/platform_time.c b/src/compat/platform_time.c
index 2f5a0207c..fe40ed140 100644
--- a/src/compat/platform_time.c
+++ b/src/compat/platform_time.c
@@ -37,9 +37,9 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "config_unix.h"
 #include "config_win32.h"
-#endif
 #include "debug.h"
 
 #include <time.h>
diff --git a/src/debug.cpp b/src/debug.cpp
index e04357686..7a77435d4 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -41,7 +41,9 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif // defined HAVE_CONFIG_H
 #include "config_unix.h"
 #include "config_win32.h"
 
diff --git a/src/video_codec.c b/src/video_codec.c
index 53f8aa830..3b8a396a3 100644
--- a/src/video_codec.c
+++ b/src/video_codec.c
@@ -54,10 +54,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif // HAVE_CONFIG_H
 #include "config_unix.h"
 #include "config_win32.h"
-#endif // HAVE_CONFIG_H
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>