diff --git a/common.c b/common.c
index e6f1f2e0f..1a13c1497 100644
--- a/common.c
+++ b/common.c
@@ -3,6 +3,9 @@
 Various functions, mostly string utilities, that are used by most
 parts of fish.
 */
+
+#include "config.h"
+
 #include <stdlib.h>
 #include <termios.h>
 #include <wchar.h>
@@ -39,7 +42,6 @@ parts of fish.
 #include <term.h>
 
 
-#include "config.h"
 #include "util.h"
 #include "wutil.h"
 #include "common.h"
diff --git a/env.c b/env.c
index c00e7b39a..10d232a4f 100644
--- a/env.c
+++ b/env.c
@@ -2,6 +2,8 @@
 	Functions for setting and getting environment variables.
 */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <wchar.h>
 #include <string.h>
@@ -26,7 +28,6 @@
 
 #include <term.h>
 
-#include "config.h"
 #include "util.h"
 #include "wutil.h"
 #include "proc.h"