Merge branch 'config-h-fix' into 'main'

Include config.h automatically

See merge request plymouth/plymouth!254

64 files changed, 1 insertions, 63 deletions

diff --git a/meson.build b/meson.build
index 650ad189..522abb8d 100644
--- a/meson.build
+++ b/meson.build
@@ -62,6 +62,7 @@ endif
 # Global C flags
 add_project_arguments([
     '-D_GNU_SOURCE',
+    '-include', 'config.h',
   ],
   language: 'c'
 )
diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c
index 270d1d7a..c9d5e81e 100644
--- a/src/client/ply-boot-client.c
+++ b/src/client/ply-boot-client.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-boot-client.h"
 
 #include <assert.h>
diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index 817ca5fa..82f7d920 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
index 716ca663..9084b1f4 100644
--- a/src/libply-splash-core/ply-boot-splash.c
+++ b/src/libply-splash-core/ply-boot-splash.c
@@ -20,7 +20,6 @@
  * Written by: Ray Strode <rstrode@redhat.com>
  *             Soeren Sandmann <sandmann@redhat.com>
  */
-#include "config.h"
 #include "ply-boot-splash.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index fc74c964..99433345 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include "config.h"
 #include "ply-device-manager.h"
 #include "ply-renderer.h"
 
diff --git a/src/libply-splash-core/ply-keyboard.c b/src/libply-splash-core/ply-keyboard.c
index 477bfaaa..128d3ced 100644
--- a/src/libply-splash-core/ply-keyboard.c
+++ b/src/libply-splash-core/ply-keyboard.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-keyboard.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-pixel-buffer.c b/src/libply-splash-core/ply-pixel-buffer.c
index 0ba03fd4..503c93b4 100644
--- a/src/libply-splash-core/ply-pixel-buffer.c
+++ b/src/libply-splash-core/ply-pixel-buffer.c
@@ -22,7 +22,6 @@
  *             Kristian Høgsberg <krh@redhat.com>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-list.h"
 #include "ply-pixel-buffer.h"
 #include "ply-logger.h"
diff --git a/src/libply-splash-core/ply-pixel-display.c b/src/libply-splash-core/ply-pixel-display.c
index 62119bcc..62398038 100644
--- a/src/libply-splash-core/ply-pixel-display.c
+++ b/src/libply-splash-core/ply-pixel-display.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-pixel-display.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-renderer.c b/src/libply-splash-core/ply-renderer.c
index 75492885..40a2c813 100644
--- a/src/libply-splash-core/ply-renderer.c
+++ b/src/libply-splash-core/ply-renderer.c
@@ -22,7 +22,6 @@
  *             Kristian Høgsberg <krh@redhat.com>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-renderer.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index 1a57c6ad..f3fbcebb 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-terminal.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-text-display.c b/src/libply-splash-core/ply-text-display.c
index 09650744..d4373afa 100644
--- a/src/libply-splash-core/ply-text-display.c
+++ b/src/libply-splash-core/ply-text-display.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-text-display.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-core/ply-text-progress-bar.c b/src/libply-splash-core/ply-text-progress-bar.c
index 1bfd4cca..5e30eae7 100644
--- a/src/libply-splash-core/ply-text-progress-bar.c
+++ b/src/libply-splash-core/ply-text-progress-bar.c
@@ -22,7 +22,6 @@
  *             Ray Strode <rstrode@redhat.com>
  *             Soeren Sandmann <sandmann@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply-splash-core/ply-text-step-bar.c b/src/libply-splash-core/ply-text-step-bar.c
index 5ce62827..add4d4fb 100644
--- a/src/libply-splash-core/ply-text-step-bar.c
+++ b/src/libply-splash-core/ply-text-step-bar.c
@@ -17,7 +17,6 @@
  * 02111-1307, USA.
  *
  */
-#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/libply-splash-graphics/ply-animation.c b/src/libply-splash-graphics/ply-animation.c
index f9c13c90..45967c1e 100644
--- a/src/libply-splash-graphics/ply-animation.c
+++ b/src/libply-splash-graphics/ply-animation.c
@@ -19,7 +19,6 @@
  *
  * Written by: William Jon McCann <jmccann@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply-splash-graphics/ply-capslock-icon.c b/src/libply-splash-graphics/ply-capslock-icon.c
index c8760d50..c3a5afa9 100644
--- a/src/libply-splash-graphics/ply-capslock-icon.c
+++ b/src/libply-splash-graphics/ply-capslock-icon.c
@@ -19,7 +19,6 @@
  *
  * Written by: Hans de Goede <hdegoede@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/src/libply-splash-graphics/ply-entry.c b/src/libply-splash-graphics/ply-entry.c
index a434d4da..1d4d8070 100644
--- a/src/libply-splash-graphics/ply-entry.c
+++ b/src/libply-splash-graphics/ply-entry.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply-splash-graphics/ply-image.c b/src/libply-splash-graphics/ply-image.c
index 53f850c8..2995fefb 100644
--- a/src/libply-splash-graphics/ply-image.c
+++ b/src/libply-splash-graphics/ply-image.c
@@ -25,7 +25,6 @@
  *             Ray Strode <rstrode@redhat.com>
  *             Carl D. Worth <cworth@cworth.org>
  */
-#include "config.h"
 #include "ply-image.h"
 #include "ply-pixel-buffer.h"
 
diff --git a/src/libply-splash-graphics/ply-keymap-icon.c b/src/libply-splash-graphics/ply-keymap-icon.c
index cd10e7c0..d0891c48 100644
--- a/src/libply-splash-graphics/ply-keymap-icon.c
+++ b/src/libply-splash-graphics/ply-keymap-icon.c
@@ -19,7 +19,6 @@
  *
  * Written by: Hans de Goede <hdegoede@redhat.com>
  */
-#include "config.h"
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/libply-splash-graphics/ply-label.c b/src/libply-splash-graphics/ply-label.c
index 5f783087..acdae83b 100644
--- a/src/libply-splash-graphics/ply-label.c
+++ b/src/libply-splash-graphics/ply-label.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-label.h"
 
 #include <assert.h>
diff --git a/src/libply-splash-graphics/ply-progress-animation.c b/src/libply-splash-graphics/ply-progress-animation.c
index 169c2a19..62a333f1 100644
--- a/src/libply-splash-graphics/ply-progress-animation.c
+++ b/src/libply-splash-graphics/ply-progress-animation.c
@@ -20,7 +20,6 @@
  * Written by: William Jon McCann <jmccann@redhat.com>
  *
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply-splash-graphics/ply-progress-bar.c b/src/libply-splash-graphics/ply-progress-bar.c
index c7e8c925..4cce9716 100644
--- a/src/libply-splash-graphics/ply-progress-bar.c
+++ b/src/libply-splash-graphics/ply-progress-bar.c
@@ -21,7 +21,6 @@
  *             Will Woods <wwoods@redhat.com>
  *             Hans de Goede <hdegoede@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply-splash-graphics/ply-throbber.c b/src/libply-splash-graphics/ply-throbber.c
index fb930894..b0217be1 100644
--- a/src/libply-splash-graphics/ply-throbber.c
+++ b/src/libply-splash-graphics/ply-throbber.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/src/libply/ply-array.c b/src/libply/ply-array.c
index 9a8fd1a9..84f94de2 100644
--- a/src/libply/ply-array.c
+++ b/src/libply/ply-array.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-array.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-bitarray.c b/src/libply/ply-bitarray.c
index e176ac31..c214ee3e 100644
--- a/src/libply/ply-bitarray.c
+++ b/src/libply/ply-bitarray.c
@@ -19,7 +19,6 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#include "config.h"
 #include "ply-bitarray.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-buffer.c b/src/libply/ply-buffer.c
index e91eb0d6..034a7b1d 100644
--- a/src/libply/ply-buffer.c
+++ b/src/libply/ply-buffer.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-buffer.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-command-parser.c b/src/libply/ply-command-parser.c
index 0b306b79..218b86ad 100644
--- a/src/libply/ply-command-parser.c
+++ b/src/libply/ply-command-parser.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-command-parser.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-event-loop.c b/src/libply/ply-event-loop.c
index e2cdc671..6c8cffab 100644
--- a/src/libply/ply-event-loop.c
+++ b/src/libply/ply-event-loop.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-event-loop.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-hashtable.c b/src/libply/ply-hashtable.c
index 43053c17..21e10bc5 100644
--- a/src/libply/ply-hashtable.c
+++ b/src/libply/ply-hashtable.c
@@ -19,7 +19,6 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#include "config.h"
 #include "ply-hashtable.h"
 #include "ply-utils.h"
 #include "ply-bitarray.h"
diff --git a/src/libply/ply-key-file.c b/src/libply/ply-key-file.c
index e263833e..28a4885c 100644
--- a/src/libply/ply-key-file.c
+++ b/src/libply/ply-key-file.c
@@ -21,7 +21,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-key-file.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-list.c b/src/libply/ply-list.c
index 0da7952d..e742b14b 100644
--- a/src/libply/ply-list.c
+++ b/src/libply/ply-list.c
@@ -21,7 +21,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-list.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-logger.c b/src/libply/ply-logger.c
index 958679f3..173c06de 100644
--- a/src/libply/ply-logger.c
+++ b/src/libply/ply-logger.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-logger.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-progress.c b/src/libply/ply-progress.c
index 8bee143e..f0f64722 100644
--- a/src/libply/ply-progress.c
+++ b/src/libply/ply-progress.c
@@ -23,7 +23,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include <assert.h>
diff --git a/src/libply/ply-rectangle.c b/src/libply/ply-rectangle.c
index e3e89c3e..e2619598 100644
--- a/src/libply/ply-rectangle.c
+++ b/src/libply/ply-rectangle.c
@@ -23,7 +23,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-list.h"
 #include "ply-rectangle.h"
 
diff --git a/src/libply/ply-region.c b/src/libply/ply-region.c
index 0e4ceea7..922dd5e7 100644
--- a/src/libply/ply-region.c
+++ b/src/libply/ply-region.c
@@ -23,7 +23,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-region.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
index 264dcf43..c0c350a0 100644
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-terminal-session.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-trigger.c b/src/libply/ply-trigger.c
index 2a660a3f..31484959 100644
--- a/src/libply/ply-trigger.c
+++ b/src/libply/ply-trigger.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-trigger.h"
 
 #include <assert.h>
diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
index abbc8b5a..ae50213b 100644
--- a/src/libply/ply-utils.c
+++ b/src/libply/ply-utils.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include <config.h>
 
 #include "ply-utils.h"
 
diff --git a/src/main.c b/src/main.c
index 86a24aa9..4617dfcf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
index aef34f8c..dfe4f3f0 100644
--- a/src/plugins/controls/label-freetype/plugin.c
+++ b/src/plugins/controls/label-freetype/plugin.c
@@ -21,7 +21,6 @@
  * Written by: Ray Strode <rstrode@redhat.com>
  * Written by: Fabian Vogt <fvogt@suse.com>
  */
-#include "config.h"
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/plugins/controls/label-pango/plugin.c b/src/plugins/controls/label-pango/plugin.c
index 57194689..04fb01a1 100644
--- a/src/plugins/controls/label-pango/plugin.c
+++ b/src/plugins/controls/label-pango/plugin.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index edf9eb17..60684af9 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -24,7 +24,6 @@
  *             Ray Strode <rstrode@redhat.com>
  *             Hans de Goede <hdegoede@redhat.com>
  */
-#include "config.h"
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
index 1cd83ec4..149c3333 100644
--- a/src/plugins/renderers/frame-buffer/plugin.c
+++ b/src/plugins/renderers/frame-buffer/plugin.c
@@ -23,7 +23,6 @@
  *             Peter Jones <pjones@redhat.com>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/src/plugins/renderers/x11/plugin.c b/src/plugins/renderers/x11/plugin.c
index ab8b70ba..a673a40d 100644
--- a/src/plugins/renderers/x11/plugin.c
+++ b/src/plugins/renderers/x11/plugin.c
@@ -23,7 +23,6 @@
  *             Peter Jones <pjones@redhat.com>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c
index 8321456c..9e150b5c 100644
--- a/src/plugins/splash/details/plugin.c
+++ b/src/plugins/splash/details/plugin.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/fade-throbber/plugin.c b/src/plugins/splash/fade-throbber/plugin.c
index 4b423f71..df8fe28d 100644
--- a/src/plugins/splash/fade-throbber/plugin.c
+++ b/src/plugins/splash/fade-throbber/plugin.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/script/plugin.c b/src/plugins/splash/script/plugin.c
index 083fc0b9..2ff10292 100644
--- a/src/plugins/splash/script/plugin.c
+++ b/src/plugins/splash/script/plugin.c
@@ -21,7 +21,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/script/script-debug.c b/src/plugins/splash/script/script-debug.c
index 245ee794..6b38de0d 100644
--- a/src/plugins/splash/script/script-debug.c
+++ b/src/plugins/splash/script/script-debug.c
@@ -20,7 +20,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include "ply-hashtable.h"
diff --git a/src/plugins/splash/script/script-execute.c b/src/plugins/splash/script/script-execute.c
index cbaae002..591a1bb2 100644
--- a/src/plugins/splash/script/script-execute.c
+++ b/src/plugins/splash/script/script-execute.c
@@ -21,7 +21,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include "ply-hashtable.h"
diff --git a/src/plugins/splash/script/script-lib-image.c b/src/plugins/splash/script/script-lib-image.c
index c09b3708..f83ab5eb 100644
--- a/src/plugins/splash/script/script-lib-image.c
+++ b/src/plugins/splash/script/script-lib-image.c
@@ -20,7 +20,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
 
-#include "config.h"
 
 #include "ply-image.h"
 #include "ply-label.h"
diff --git a/src/plugins/splash/script/script-lib-math.c b/src/plugins/splash/script/script-lib-math.c
index 292aa6d4..209f23a9 100644
--- a/src/plugins/splash/script/script-lib-math.c
+++ b/src/plugins/splash/script/script-lib-math.c
@@ -20,7 +20,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
 
-#include "config.h"
 
 #include "ply-utils.h"
 #include "script.h"
diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
index 36db5fa1..9198415c 100644
--- a/src/plugins/splash/script/script-lib-plymouth.c
+++ b/src/plugins/splash/script/script-lib-plymouth.c
@@ -21,7 +21,6 @@
  */
 #pragma weak ply_keyboard_get_capslock_state
 
-#include "config.h"
 
 #include "ply-boot-splash-plugin.h"
 #include "ply-utils.h"
diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
index c7e83172..b9d71655 100644
--- a/src/plugins/splash/script/script-lib-sprite.c
+++ b/src/plugins/splash/script/script-lib-sprite.c
@@ -19,7 +19,6 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#include "config.h"
 #include "ply-image.h"
 #include "ply-utils.h"
 #include "ply-logger.h"
diff --git a/src/plugins/splash/script/script-lib-string.c b/src/plugins/splash/script/script-lib-string.c
index dc926fe6..b174d28d 100644
--- a/src/plugins/splash/script/script-lib-string.c
+++ b/src/plugins/splash/script/script-lib-string.c
@@ -20,7 +20,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
 
-#include "config.h"
 
 #include "script.h"
 #include "script-parse.h"
diff --git a/src/plugins/splash/script/script-object.c b/src/plugins/splash/script/script-object.c
index ba3784e7..aa005a01 100644
--- a/src/plugins/splash/script/script-object.c
+++ b/src/plugins/splash/script/script-object.c
@@ -21,7 +21,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include "ply-hashtable.h"
diff --git a/src/plugins/splash/script/script-parse.c b/src/plugins/splash/script/script-parse.c
index f317b9ec..220ba539 100644
--- a/src/plugins/splash/script/script-parse.c
+++ b/src/plugins/splash/script/script-parse.c
@@ -21,7 +21,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include "ply-hashtable.h"
diff --git a/src/plugins/splash/script/script-scan.c b/src/plugins/splash/script/script-scan.c
index 4e562ff8..d047e807 100644
--- a/src/plugins/splash/script/script-scan.c
+++ b/src/plugins/splash/script/script-scan.c
@@ -20,7 +20,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include <stdio.h>
diff --git a/src/plugins/splash/script/script.c b/src/plugins/splash/script/script.c
index 09c228c6..8415b383 100644
--- a/src/plugins/splash/script/script.c
+++ b/src/plugins/splash/script/script.c
@@ -21,7 +21,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #endif
 
 #include "ply-hashtable.h"
diff --git a/src/plugins/splash/space-flares/plugin.c b/src/plugins/splash/space-flares/plugin.c
index f5f1666e..a4a0d309 100644
--- a/src/plugins/splash/space-flares/plugin.c
+++ b/src/plugins/splash/space-flares/plugin.c
@@ -21,7 +21,6 @@
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 9f887352..30a2743f 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -17,7 +17,6 @@
  * 02111-1307, USA.
  *
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/tribar/plugin.c b/src/plugins/splash/tribar/plugin.c
index 07a0b7ec..a555197a 100644
--- a/src/plugins/splash/tribar/plugin.c
+++ b/src/plugins/splash/tribar/plugin.c
@@ -20,7 +20,6 @@
  * Written by: Adam Jackson <ajax@redhat.com>
  *             Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index f0c7ae85..9d9df84e 100644
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -20,7 +20,6 @@
  * Written by: William Jon McCann, Hans de Goede <hdegoede@redhat.com>
  *
  */
-#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/ply-boot-server.c b/src/ply-boot-server.c
index 07aa8c4d..a2c42ab7 100644
--- a/src/ply-boot-server.c
+++ b/src/ply-boot-server.c
@@ -19,7 +19,6 @@
  *
  * Written by: Ray Strode <rstrode@redhat.com>
  */
-#include "config.h"
 #include "ply-boot-server.h"
 
 #include <assert.h>
diff --git a/src/upstart-bridge/ply-upstart-monitor.c b/src/upstart-bridge/ply-upstart-monitor.c
index bc75c49b..02ff1657 100644
--- a/src/upstart-bridge/ply-upstart-monitor.c
+++ b/src/upstart-bridge/ply-upstart-monitor.c
@@ -19,7 +19,6 @@
  *
  * Written by: Colin Watson <cjwatson@ubuntu.com>
  */
-#include "config.h"
 #include "ply-upstart-monitor.h"
 
 #include <assert.h>
diff --git a/src/upstart-bridge/plymouth-upstart-bridge.c b/src/upstart-bridge/plymouth-upstart-bridge.c
index b2aa769b..88a5b8fe 100644
--- a/src/upstart-bridge/plymouth-upstart-bridge.c
+++ b/src/upstart-bridge/plymouth-upstart-bridge.c
@@ -19,7 +19,6 @@
  *
  * Written by: Colin Watson <cjwatson@ubuntu.com>
  */
-#include "config.h"
 
 #include <stdbool.h>
 #include <signal.h>