diff --git a/src/ecmascript/libdom/mujs/mapa.cpp b/src/ecmascript/libdom/mujs/mapa.cpp
index fb975109..af041190 100644
--- a/src/ecmascript/libdom/mujs/mapa.cpp
+++ b/src/ecmascript/libdom/mujs/mapa.cpp
@@ -4,6 +4,14 @@
 #include "config.h"
 #endif
 
+#include "elinks.h"
+
+#include "ecmascript/libdom/mujs/mapa.h"
+#include "ecmascript/mujs.h"
+#include "ecmascript/mujs/xhr.h"
+#include "util/memory.h"
+#include "util/string.h"
+
 #include <cstddef>
 #include <iostream>
 #include <map>
@@ -11,12 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "ecmascript/libdom/mujs/mapa.h"
-#include "ecmascript/mujs.h"
-#include "ecmascript/mujs/xhr.h"
-#include "util/memory.h"
-#include "util/string.h"
-
 void
 attr_save_in_map(void *m, void *node, void *value)
 {
diff --git a/src/ecmascript/libdom/quickjs/mapa.cpp b/src/ecmascript/libdom/quickjs/mapa.cpp
index ab1cf42a..3fcf6767 100644
--- a/src/ecmascript/libdom/quickjs/mapa.cpp
+++ b/src/ecmascript/libdom/quickjs/mapa.cpp
@@ -4,6 +4,14 @@
 #include "config.h"
 #endif
 
+#include "elinks.h"
+
+#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs.h"
+#include "ecmascript/quickjs/xhr.h"
+#include "util/memory.h"
+#include "util/string.h"
+
 #include <cstddef>
 #include <iostream>
 #include <map>
@@ -11,12 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "ecmascript/libdom/quickjs/mapa.h"
-#include "ecmascript/quickjs.h"
-#include "ecmascript/quickjs/xhr.h"
-#include "util/memory.h"
-#include "util/string.h"
-
 void
 attr_save_in_map(void *m, void *node, JSValueConst value)
 {
diff --git a/src/terminal/window.c b/src/terminal/window.c
index 6c02a13f..9966c2d2 100644
--- a/src/terminal/window.c
+++ b/src/terminal/window.c
@@ -182,7 +182,7 @@ add_empty_window(struct terminal *term, void (*fn)(void *), void *data)
 	add_window(term, empty_window_handler, ewd);
 }
 
-#if CONFIG_DEBUG
+#ifdef CONFIG_DEBUG
 /** Check that terminal.windows are in the documented order.  */
 void
 assert_window_stacking(struct terminal *term)
diff --git a/src/terminal/window.h b/src/terminal/window.h
index 5296c4c6..bf20a946 100644
--- a/src/terminal/window.h
+++ b/src/terminal/window.h
@@ -98,7 +98,7 @@ void get_parent_ptr(struct window *, int *, int *);
 
 void add_empty_window(struct terminal *, void (*)(void *), void *);
 
-#if CONFIG_DEBUG
+#ifdef CONFIG_DEBUG
 void assert_window_stacking(struct terminal *);
 #else
 #define assert_window_stacking(t) ((void) (t))