Unified feature test macro requirements

image.c

@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _IMAGE_CONFIG
-
 #include <unistd.h>
 
 #ifdef HAVE_GIFLIB
@@ -30,6 +28,8 @@
 #include "image.h"
 #include "options.h"
 #include "util.h"
+
+#define _IMAGE_CONFIG
 #include "config.h"
 
 enum { MIN_GIF_DELAY = 50 };

options.c

@@ -16,16 +16,17 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _XOPEN_SOURCE
-#define _IMAGE_CONFIG
+#define _POSIX_C_SOURCE 2 /* for getopt(3) */
+#include <unistd.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "options.h"
 #include "util.h"
+
+#define _IMAGE_CONFIG
 #include "config.h"
 
 options_t _options;

thumbs.c

@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _THUMBS_CONFIG
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -27,6 +25,8 @@
 
 #include "thumbs.h"
 #include "util.h"
+
+#define _THUMBS_CONFIG
 #include "config.h"
 
 #ifdef __NetBSD__

window.c

@@ -16,16 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _WINDOW_CONFIG
-
 #include <string.h>
-
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 
 #include "options.h"
 #include "util.h"
 #include "window.h"
+
+#define _WINDOW_CONFIG
 #include "config.h"
 
 static Cursor carrow;