diff --git a/commands.h b/commands.h
index 74e2638..c4c3973 100644
--- a/commands.h
+++ b/commands.h
@@ -44,7 +44,7 @@ bool ct_scroll(arg_t);
 bool ct_drag_mark_image(arg_t);
 bool ct_select(arg_t);
 
-#ifdef _MAPPINGS_CONFIG
+#ifdef INCLUDE_MAPPINGS_CONFIG
 /* global */
 #define g_change_gamma { cg_change_gamma, MODE_ALL }
 #define g_first { cg_first, MODE_ALL }
diff --git a/config.def.h b/config.def.h
index 1e102fe..8db8983 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,4 +1,4 @@
-#ifdef _WINDOW_CONFIG
+#ifdef INCLUDE_WINDOW_CONFIG
 
 /* default window dimensions (overwritten via -g option): */
 static const int WIN_WIDTH  = 800;
@@ -20,7 +20,7 @@ static const bool TOP_STATUSBAR = false;
 #endif /* HAVE_LIBFONTS */
 
 #endif
-#ifdef _IMAGE_CONFIG
+#ifdef INCLUDE_IMAGE_CONFIG
 
 /* levels (in percent) to use when zooming via '-' and '+':
  * (first/last value is used as min/max zoom level)
@@ -62,7 +62,7 @@ static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024;   /* but not above 256MiB
 static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */
 
 #endif
-#ifdef _THUMBS_CONFIG
+#ifdef INCLUDE_THUMBS_CONFIG
 
 /* thumbnail sizes in pixels (width == height): */
 static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
@@ -71,7 +71,7 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
 static const int THUMB_SIZE = 3;
 
 #endif
-#ifdef _MAPPINGS_CONFIG
+#ifdef INCLUDE_MAPPINGS_CONFIG
 
 /* these modifiers will be used when processing keybindings */
 static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask;
diff --git a/image.c b/image.c
index 02e3957..2f469b1 100644
--- a/image.c
+++ b/image.c
@@ -18,7 +18,7 @@
  */
 
 #include "nsxiv.h"
-#define _IMAGE_CONFIG
+#define INCLUDE_IMAGE_CONFIG
 #include "config.h"
 
 #include <errno.h>
diff --git a/main.c b/main.c
index 1b50dd6..64710f2 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,7 @@
  */
 
 #include "nsxiv.h"
-#define _MAPPINGS_CONFIG
+#define INCLUDE_MAPPINGS_CONFIG
 #include "commands.h"
 #include "config.h"
 
diff --git a/thumbs.c b/thumbs.c
index d6b97ea..b8ba2d1 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -18,7 +18,7 @@
  */
 
 #include "nsxiv.h"
-#define _THUMBS_CONFIG
+#define INCLUDE_THUMBS_CONFIG
 #include "config.h"
 
 #include <errno.h>
diff --git a/window.c b/window.c
index e13dd83..3cfa188 100644
--- a/window.c
+++ b/window.c
@@ -18,7 +18,7 @@
  */
 
 #include "nsxiv.h"
-#define _WINDOW_CONFIG
+#define INCLUDE_WINDOW_CONFIG
 #include "config.h"
 #include "icon/data.h"