Ensure all *.[ch] files include config.h

Including config.h is necessary to get e.g. the _GNU_SOURCE define and
any other definitions that autoconf declares. Hence, config.h needs to
be included as the first header in each file.

This is done either via:
1. Including "common.h" (i3bar)
2. Including "libi3.h"
3. Including "all.h" (i3)
4. Including <config.h> directly

Also remove now-unused I3__FILE__, add copyright/license statement
where missing and switch include/all.h to #pragma once.

i3-config-wizard/main.c

@@ -8,6 +8,8 @@
  *                   keysyms.
  *
  */
+#include <config.h>
+
 #if defined(__FreeBSD__)
 #include <sys/param.h>
 #endif

i3-dump-log/main.c

@@ -7,6 +7,8 @@
  * i3-dump-log/main.c: Dumps the i3 SHM log to stdout.
  *
  */
+#include <config.h>
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <sys/types.h>

i3-input/i3-input.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <config.h>
+
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);

i3-input/main.c

@@ -8,6 +8,8 @@
  *                  to i3.
  *
  */
+#include "libi3.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
@@ -31,8 +33,6 @@
 
 #include "i3-input.h"
 
-#include "libi3.h"
-
 /* IPC format string. %s will be replaced with what the user entered, then
  * the command will be sent to i3 */
 static char *format;

i3-msg/main.c

@@ -14,6 +14,8 @@
  * Additionally, it’s even useful sometimes :-).
  *
  */
+#include "libi3.h"
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <sys/types.h>
@@ -34,7 +36,6 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
-#include "libi3.h"
 #include <i3/ipc.h>
 
 static char *socket_path;

i3-nagbar/i3-nagbar.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <config.h>
+
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);

i3-nagbar/main.c

@@ -8,6 +8,8 @@
  * when the user has an error in their configuration file.
  *
  */
+#include "libi3.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,7 +32,6 @@
 #include <xcb/randr.h>
 #include <xcb/xcb_cursor.h>
 
-#include "libi3.h"
 #include "i3-nagbar.h"
 
 /** This is the equivalent of XC_left_ptr. I’m not sure why xcb doesn’t have a

i3bar/include/child.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdbool.h>
 
 #define STDIN_CHUNK_SIZE 1024

i3bar/include/common.h

@@ -7,6 +7,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdbool.h>
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>

i3bar/include/configuration.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "common.h"
 
 typedef enum {

i3bar/include/ipc.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdint.h>
 
 /*

i3bar/include/mode.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <xcb/xproto.h>
 
 #include "common.h"

i3bar/include/outputs.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <xcb/xcb.h>
 #include <cairo/cairo-xcb.h>
 

i3bar/include/parse_json_header.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdint.h>
 
 /**

i3bar/include/util.h

@@ -7,6 +7,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "queue.h"
 
 /* Get the maximum/minimum of x and y */

i3bar/include/workspaces.h

@@ -9,10 +9,10 @@
  */
 #pragma once
 
-#include <xcb/xproto.h>
-
 #include "common.h"
 
+#include <xcb/xproto.h>
+
 typedef struct i3_ws i3_ws;
 
 TAILQ_HEAD(ws_head, i3_ws);

i3bar/include/xcb.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdint.h>
 //#include "outputs.h"
 

i3bar/src/child.c

@@ -7,6 +7,8 @@
  * child.c: Getting input for the statusline
  *
  */
+#include "common.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -25,8 +27,6 @@
 #include <yajl/yajl_gen.h>
 #include <paths.h>
 
-#include "common.h"
-
 /* Global variables for child_*() */
 i3bar_child child;
 

i3bar/src/config.c

@@ -7,6 +7,8 @@
  * config.c: Parses the configuration (received from i3).
  *
  */
+#include "common.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -17,8 +19,6 @@
 
 #include <X11/Xlib.h>
 
-#include "common.h"
-
 static char *cur_key;
 static bool parsing_bindings;
 static bool parsing_tray_outputs;

i3bar/src/ipc.c

@@ -7,6 +7,8 @@
  * ipc.c: Communicating with i3
  *
  */
+#include "common.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -21,8 +23,6 @@
 #include <sanitizer/lsan_interface.h>
 #endif
 
-#include "common.h"
-
 ev_io *i3_connection;
 
 const char *sock_path;

i3bar/src/main.c

@@ -5,6 +5,8 @@
  * © 2010 Axel Wagner and contributors (see also: LICENSE)
  *
  */
+#include "common.h"
+
 #include <stdio.h>
 #include <i3/ipc.h>
 #include <string.h>
@@ -15,8 +17,6 @@
 #include <getopt.h>
 #include <glob.h>
 
-#include "common.h"
-
 /*
  * Having verboselog(), errorlog() and debuglog() is necessary when using libi3.
  *

i3bar/src/mode.c

@@ -7,6 +7,8 @@
  * mode.c: Handle mode event and show current binding mode in the bar
  *
  */
+#include "common.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -14,8 +16,6 @@
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "common.h"
-
 /* A datatype to pass through the callbacks to save the state */
 struct mode_json_params {
     char *json;

i3bar/src/outputs.c

@@ -7,6 +7,8 @@
  * outputs.c: Maintaining the outputs list
  *
  */
+#include "common.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,8 +17,6 @@
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "common.h"
-
 /* A datatype to pass through the callbacks to save the state */
 struct outputs_json_params {
     struct outputs_head *outputs;

i3bar/src/parse_json_header.c

@@ -8,6 +8,8 @@
  *                      protocol version and features.
  *
  */
+#include "common.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -25,8 +27,6 @@
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "common.h"
-
 static enum {
     KEY_VERSION,
     KEY_STOP_SIGNAL,

i3bar/src/workspaces.c

@@ -7,6 +7,8 @@
  * workspaces.c: Maintaining the workspace lists
  *
  */
+#include "common.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -14,8 +16,6 @@
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "common.h"
-
 /* A datatype to pass through the callbacks to save the state */
 struct workspaces_json_params {
     struct ws_head *workspaces;

i3bar/src/xcb.c

@@ -7,6 +7,8 @@
  * xcb.c: Communicating with X
  *
  */
+#include "common.h"
+
 #include <xcb/xcb.h>
 #include <xcb/xkb.h>
 #include <xcb/xproto.h>
@@ -32,7 +34,6 @@
 #include <sanitizer/lsan_interface.h>
 #endif
 
-#include "common.h"
 #include "libi3.h"
 
 /** This is the equivalent of XC_left_ptr. I’m not sure why xcb doesn’t have a

include/all.h

@@ -10,8 +10,9 @@
  * compile-time.
  *
  */
-#ifndef I3_ALL_H
-#define I3_ALL_H
+#pragma once
+
+#include <config.h>
 
 #include <assert.h>
 #include <stdbool.h>
@@ -81,5 +82,3 @@
 #include "display_version.h"
 #include "restore_layout.h"
 #include "main.h"
-
-#endif

include/assignments.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Checks the list of assignments for the given window and runs all matching
  * ones (unless they have already been run for this specific window).

include/bindings.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 extern pid_t command_error_nagbar_pid;
 
 /**

include/click.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * The button press X callback. This function determines whether the floating
  * modifier is pressed and where the user clicked (decoration, border, inside

include/cmdparse.h

@@ -9,4 +9,6 @@
  */
 #pragma once
 
+#include <config.h>
+
 char *parse_cmd(const char *new);

include/commands.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "commands_parser.h"
 
 /** The beginning of the prototype for every cmd_ function. */

include/commands_parser.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <yajl/yajl_gen.h>
 
 /*

include/con.h

@@ -11,6 +11,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Create a new container (and attach it to the given parent, if not NULL).
  * This function only initializes the data structures.

include/config_directives.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "config_parser.h"
 
 /**

include/config_parser.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <yajl/yajl_gen.h>
 
 SLIST_HEAD(variables_head, Variable);

include/configuration.h

@@ -12,10 +12,11 @@
  */
 #pragma once
 
+#include "libi3.h"
+
 #include <stdbool.h>
 #include "queue.h"
 #include "i3.h"
-#include "libi3.h"
 
 typedef struct Config Config;
 typedef struct Barconfig Barconfig;

include/data.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include "libi3.h"
+
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-launcher.h>
 
@@ -17,7 +19,6 @@
 #include <pcre.h>
 #include <sys/time.h>
 
-#include "libi3.h"
 #include "queue.h"
 
 /*

include/debug.h

@@ -10,4 +10,6 @@
  */
 #pragma once
 
+#include <config.h>
+
 int handle_event(void *ignored, xcb_connection_t *c, xcb_generic_event_t *e);

include/display_version.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Connects to i3 to find out the currently running version. Useful since it
  * might be different from the version compiled into this binary (maybe the

include/ewmh.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Updates _NET_CURRENT_DESKTOP with the current desktop number.
  *

include/fake_outputs.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Creates outputs according to the given specification.
  * The specification must be in the format wxh+x+y, for example 1024x768+0+0,

include/floating.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "tree.h"
 
 /** Callback for dragging */

include/handlers.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <xcb/randr.h>
 
 extern int randr_base;

include/i3.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/resource.h>
 

include/ipc.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <ev.h>
 #include <stdbool.h>
 #include <yajl/yajl_gen.h>

include/key_press.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * There was a key press. We compare this key code with our bindings table and pass
  * the bound action to parse_command().

include/libi3.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stdio.h>

include/load_layout.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 typedef enum {
     // We could not determine the content of the JSON file. This typically
     // means it’s unreadable or contains garbage.

include/log.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdarg.h>
 #include <stdbool.h>
 

include/main.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Enable or disable the main X11 event handling function.
  * This is used by drag_pointer() which has its own, modal event handler, which

include/manage.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 
 /**

include/match.h

@@ -13,6 +13,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /*
  * Initializes the Match data structure. This function is necessary because the
  * members representing boolean values (like dock) need to be initialized with

include/move.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Moves the given container in the given direction (TOK_LEFT, TOK_RIGHT,
  * TOK_UP, TOK_DOWN from cmdparse.l)

include/output.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Returns the output container below the given output container.
  *

include/randr.h

@@ -11,6 +11,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 #include <xcb/randr.h>
 

include/regex.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Creates a new 'regex' struct containing the given pattern and a PCRE
  * compiled regular expression. Also, calls pcre_study because this regex will

include/render.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /* This is used to keep a state to pass around when rendering a con in render_con(). */
 typedef struct render_params {
     /* A copy of the coordinates of the container which is being rendered. */

include/resize.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 bool resize_find_tiling_participants(Con **current, Con **other, direction_t direction);
 
 int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, const xcb_button_press_event_t *event);

include/restore_layout.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Opens a separate connection to X11 for placeholder windows when restoring
  * layouts. This is done as a safety measure (users can xkill a placeholder

include/scratchpad.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Moves the specified window to the __i3_scratch workspace, making it floating
  * and setting the appropriate scratchpad_state.

include/shmlog.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <stdint.h>
 #if !defined(__OpenBSD__)
 #include <pthread.h>

include/sighandler.h

@@ -11,6 +11,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Setup signal handlers to safely handle SIGSEGV and SIGFPE
  *

include/startup.h

@@ -12,6 +12,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-monitor.h>
 

include/tree.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 extern Con *croot;
 /* TODO: i am not sure yet how much access to the focused container should
  * be permitted to source files */

include/util.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <err.h>
 
 #include "data.h"

include/window.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /**
  * Frees an i3Window and all its members.
  *

include/workspace.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 #include "tree.h"
 #include "randr.h"

include/x.h

@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 /** Stores the X11 window ID of the currently focused window */
 extern xcb_window_t focused_id;
 

include/xcb.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 #include "xcursor.h"
 

include/xcursor.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <xcb/xcb_cursor.h>
 
 enum xcursor_cursor_t {

include/xinerama.h

@@ -11,6 +11,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 
 /**

include/yajl_utils.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>

libi3/dpi.c

@@ -6,6 +6,7 @@
  *
  */
 #include "libi3.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <xcb/xcb_xrm.h>

libi3/draw_util.c

@@ -6,6 +6,8 @@
  * draw.c: Utility for drawing.
  *
  */
+#include "libi3.h"
+
 #include <stdlib.h>
 #include <err.h>
 #include <string.h>
@@ -13,8 +15,6 @@
 #include <xcb/xcb_aux.h>
 #include <cairo/cairo-xcb.h>
 
-#include "libi3.h"
-
 /* The default visual_type to use if none is specified when creating the surface. Must be defined globally. */
 xcb_visualtype_t *visual_type;
 

libi3/fake_configure_notify.c

@@ -5,14 +5,14 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <stdlib.h>
 #include <stdbool.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
 
-#include "libi3.h"
-
 /*
  * Generates a configure_notify event and sends it to the given window
  * Applications need this to think they’ve configured themselves correctly.

libi3/font.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -15,8 +17,6 @@
 #include <cairo/cairo-xcb.h>
 #include <pango/pangocairo.h>
 
-#include "libi3.h"
-
 static const i3Font *savedFont = NULL;
 
 static xcb_visualtype_t *root_visual_type;

libi3/format_placeholders.c

@@ -5,12 +5,12 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "libi3.h"
-
 #ifndef STARTS_WITH
 #define STARTS_WITH(string, needle) (strncasecmp((string), (needle), strlen((needle))) == 0)
 #endif

libi3/get_colorpixel.c

@@ -5,13 +5,13 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "queue.h"
-#include "libi3.h"
-
 struct Colorpixel {
     char hex[8];
     uint32_t pixel;

libi3/get_config_path.c

@@ -6,6 +6,7 @@
  *
  */
 #include "libi3.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>

libi3/get_exe_path.c

@@ -1,3 +1,12 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ */
+#include "libi3.h"
+
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
@@ -5,8 +14,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "libi3.h"
-
 /*
  * This function returns the absolute path to the executable it is running in.
  *

libi3/get_mod_mask.c

@@ -5,13 +5,13 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
 
-#include "libi3.h"
-
 /*
  * All-in-one function which returns the modifier mask (XCB_MOD_MASK_*) for the
  * given keysymbol, for example for XCB_NUM_LOCK (usually configured to mod2).

libi3/get_process_filename.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -17,8 +19,6 @@
 #include <unistd.h>
 #include <err.h>
 
-#include "libi3.h"
-
 /*
  * Returns the name of a temporary file with the specified prefix.
  *

libi3/ipc_connect.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -14,8 +16,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "libi3.h"
-
 /*
  * Connects to the i3 IPC socket and returns the file descriptor for the
  * socket. die()s if anything goes wrong.

libi3/ipc_recv_message.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -14,8 +16,6 @@
 
 #include <i3/ipc.h>
 
-#include "libi3.h"
-
 /*
  * Reads a message from the given socket file descriptor and stores its length
  * (reply_length) as well as a pointer to its contents (reply).

libi3/ipc_send_message.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -14,8 +16,6 @@
 
 #include <i3/ipc.h>
 
-#include "libi3.h"
-
 /*
  * Formats a message (payload) of the given size and type and sends it to i3 via
  * the given socket file descriptor.

libi3/is_debug_build.c

@@ -1,3 +1,12 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ */
+#include "libi3.h"
+
 #include <string.h>
 #include <stdbool.h>
 

libi3/mkdirp.c

@@ -1,4 +1,12 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ */
 #include "libi3.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

libi3/resolve_tilde.c

@@ -5,8 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
-
 #include "libi3.h"
+
 #include <err.h>
 #include <glob.h>
 #include <stdlib.h>

libi3/root_atom_contents.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
@@ -15,8 +17,6 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
-#include "libi3.h"
-
 /*
  * Try to get the contents of the given atom (for example I3_SOCKET_PATH) from
  * the X11 root window and return NULL if it doesn’t work.

libi3/safewrappers.c

@@ -5,6 +5,8 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -13,8 +15,6 @@
 #include <err.h>
 #include <errno.h>
 
-#include "libi3.h"
-
 /*
  * The s* functions (safe) are wrappers around malloc, strdup, …, which exits if one of
  * the called functions returns NULL, meaning that there is no more memory available

libi3/string.c

@@ -9,14 +9,13 @@
  *           others want UTF-8 (Pango).
  *
  */
+#include "libi3.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
 
-#include "libi3.h"
-
 struct _i3String {
     char *utf8;
     xcb_char2b_t *ucs2;

libi3/strndup.c

@@ -5,11 +5,11 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <sys/types.h>
 #include <string.h>
 
-#include "libi3.h"
-
 #if defined(__APPLE__)
 
 /*

libi3/ucs2_conversion.c

@@ -5,14 +5,14 @@
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
+#include "libi3.h"
+
 #include <err.h>
 #include <errno.h>
 #include <iconv.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "libi3.h"
-
 static iconv_t utf8_conversion_descriptor = (iconv_t)-1;
 static iconv_t ucs2_conversion_descriptor = (iconv_t)-1;
 

src/assignments.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "assignments.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/click.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "click.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/commands.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "commands.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -9,6 +7,8 @@
  * commands.c: all command functions (see commands_parser.c)
  *
  */
+#include "all.h"
+
 #include <stdint.h>
 #include <float.h>
 #include <stdarg.h>
@@ -17,7 +17,6 @@
 #include <sanitizer/lsan_interface.h>
 #endif
 
-#include "all.h"
 #include "shmlog.h"
 
 // Macros to make the YAJL API a bit easier to use.

src/commands_parser.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "commands_parser.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -25,6 +23,8 @@
  * instead of actually calling any function).
  *
  */
+#include "all.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,8 +32,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "all.h"
-
 // Macros to make the YAJL API a bit easier to use.
 #define y(x, ...) (command_output.json_gen != NULL ? yajl_gen_##x(command_output.json_gen, ##__VA_ARGS__) : 0)
 #define ystr(str) (command_output.json_gen != NULL ? yajl_gen_string(command_output.json_gen, (unsigned char *)str, strlen(str)) : 0)

src/con.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "con.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -12,6 +10,7 @@
  *
  */
 #include "all.h"
+
 #include "yajl_utils.h"
 
 static void con_on_remove_child(Con *con);

src/config.c

@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "config.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -11,6 +9,7 @@
  *
  */
 #include "all.h"
+
 #include <xkbcommon/xkbcommon.h>
 
 char *current_configpath = NULL;