Commit 9fe71ed8 for guacamole.apache.org

commit 9fe71ed8711e4e65e4448ab549c027d0ba86b801
Author: Michael Jumper <mjumper@apache.org>
Date:   Sat Jul 11 16:48:57 2026 -0700

    GUACAMOLE-2182: Automatically include config.h in every relevant .c file.

diff --git a/src/common-ssh/Makefile.am b/src/common-ssh/Makefile.am
index 5d1a88d1..efa38f46 100644
--- a/src/common-ssh/Makefile.am
+++ b/src/common-ssh/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 noinst_LTLIBRARIES = libguac_common_ssh.la
diff --git a/src/common-ssh/buffer.c b/src/common-ssh/buffer.c
index b7763f69..72e9fc26 100644
--- a/src/common-ssh/buffer.c
+++ b/src/common-ssh/buffer.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <openssl/bn.h>
 #include <openssl/ossl_typ.h>

diff --git a/src/common-ssh/key.c b/src/common-ssh/key.c
index a7f861d8..4ac979c3 100644
--- a/src/common-ssh/key.c
+++ b/src/common-ssh/key.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common-ssh/buffer.h"
 #include "common-ssh/key.h"

diff --git a/src/common-ssh/tests/Makefile.am b/src/common-ssh/tests/Makefile.am
index 8424268a..7ad3bd82 100644
--- a/src/common-ssh/tests/Makefile.am
+++ b/src/common-ssh/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 6f17b653..527e0f87 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 noinst_LTLIBRARIES = libguac_common.la
diff --git a/src/common/blank_cursor.c b/src/common/blank_cursor.c
index c65db0cb..c5026f50 100644
--- a/src/common/blank_cursor.c
+++ b/src/common/blank_cursor.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/layer.h>
diff --git a/src/common/clipboard.c b/src/common/clipboard.c
index 69233138..81a611bf 100644
--- a/src/common/clipboard.c
+++ b/src/common/clipboard.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/clipboard.h"

 #include <guacamole/client.h>
diff --git a/src/common/dot_cursor.c b/src/common/dot_cursor.c
index fde79b01..d3154f1c 100644
--- a/src/common/dot_cursor.c
+++ b/src/common/dot_cursor.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/layer.h>
diff --git a/src/common/ibar_cursor.c b/src/common/ibar_cursor.c
index 6494591b..9d6c158a 100644
--- a/src/common/ibar_cursor.c
+++ b/src/common/ibar_cursor.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/layer.h>
diff --git a/src/common/iconv.c b/src/common/iconv.c
index 9580d794..3cd347c7 100644
--- a/src/common/iconv.c
+++ b/src/common/iconv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/iconv.h"

 #include <guacamole/unicode.h>
diff --git a/src/common/io.c b/src/common/io.c
index a81a131c..ede5fc4c 100644
--- a/src/common/io.c
+++ b/src/common/io.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/io.h"

 #include <guacamole/error.h>
diff --git a/src/common/json.c b/src/common/json.c
index 0d2cb0b4..7cbffe83 100644
--- a/src/common/json.c
+++ b/src/common/json.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common/json.h"

 #include <assert.h>
diff --git a/src/common/list.c b/src/common/list.c
index f1012437..9e4c5685 100644
--- a/src/common/list.c
+++ b/src/common/list.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/list.h"

 #include <guacamole/mem.h>
diff --git a/src/common/pointer_cursor.c b/src/common/pointer_cursor.c
index fbcb6023..5e15d617 100644
--- a/src/common/pointer_cursor.c
+++ b/src/common/pointer_cursor.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/layer.h>
diff --git a/src/common/rect.c b/src/common/rect.c
index a7ca7da5..defe9eb8 100644
--- a/src/common/rect.c
+++ b/src/common/rect.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/rect.h"

 void guac_common_rect_init(guac_common_rect* rect, int x, int y, int width, int height) {
diff --git a/src/common/string.c b/src/common/string.c
index 87bfff5c..bbff5da5 100644
--- a/src/common/string.c
+++ b/src/common/string.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common/string.h"

 #include <guacamole/mem.h>
diff --git a/src/common/surface.c b/src/common/surface.c
index 3ec5517e..8d26b121 100644
--- a/src/common/surface.c
+++ b/src/common/surface.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/rect.h"
 #include "common/surface.h"

diff --git a/src/common/tests/Makefile.am b/src/common/tests/Makefile.am
index 27ac75cd..cc406788 100644
--- a/src/common/tests/Makefile.am
+++ b/src/common/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #
diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am
index b39b2db5..72d6d9ec 100644
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
@@ -25,6 +25,8 @@

 AUTOMAKE_OPTIONS = foreign

+AM_CPPFLAGS = -include config.h
+
 sbin_PROGRAMS = guacd

 man_MANS =           \
diff --git a/src/guacd/conf-args.c b/src/guacd/conf-args.c
index c4509737..a338e365 100644
--- a/src/guacd/conf-args.c
+++ b/src/guacd/conf-args.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "conf.h"
 #include "conf-args.h"
 #include "conf-parse.h"
diff --git a/src/guacd/conf-file.c b/src/guacd/conf-file.c
index 874a39ba..2f162ccc 100644
--- a/src/guacd/conf-file.c
+++ b/src/guacd/conf-file.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "conf.h"
 #include "conf-file.h"
 #include "conf-parse.h"
diff --git a/src/guacd/conf-parse.c b/src/guacd/conf-parse.c
index 8381aba4..af5fc451 100644
--- a/src/guacd/conf-parse.c
+++ b/src/guacd/conf-parse.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "conf.h"
 #include "conf-parse.h"

diff --git a/src/guacd/connection.c b/src/guacd/connection.c
index 7f5e7e86..c61dca32 100644
--- a/src/guacd/connection.c
+++ b/src/guacd/connection.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "connection.h"
 #include "log.h"
 #include "move-fd.h"
diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c
index 5e7d6c06..ec5f531b 100644
--- a/src/guacd/daemon.c
+++ b/src/guacd/daemon.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "conf.h"
 #include "conf-args.h"
 #include "conf-file.h"
diff --git a/src/guacd/log.c b/src/guacd/log.c
index 81c313b8..93fe498a 100644
--- a/src/guacd/log.c
+++ b/src/guacd/log.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "log.h"

 #include <guacamole/client.h>
diff --git a/src/guacd/move-fd.c b/src/guacd/move-fd.c
index 3d155797..5ed3307a 100644
--- a/src/guacd/move-fd.c
+++ b/src/guacd/move-fd.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "move-fd.h"

 /* Required for CMSG_* macros on BSD */
diff --git a/src/guacd/proc-map.c b/src/guacd/proc-map.c
index ea5f2e9a..b1773336 100644
--- a/src/guacd/proc-map.c
+++ b/src/guacd/proc-map.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "common/list.h"
 #include "proc.h"
 #include "proc-map.h"
diff --git a/src/guacd/proc.c b/src/guacd/proc.c
index ec717d78..39534cd4 100644
--- a/src/guacd/proc.c
+++ b/src/guacd/proc.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "log.h"
 #include "move-fd.h"
 #include "proc.h"
diff --git a/src/guacenc/Makefile.am b/src/guacenc/Makefile.am
index 34aeaf6a..275adcea 100644
--- a/src/guacenc/Makefile.am
+++ b/src/guacenc/Makefile.am
@@ -25,6 +25,8 @@

 AUTOMAKE_OPTIONS = foreign

+AM_CPPFLAGS = -include config.h
+
 bin_PROGRAMS = guacenc

 man_MANS =        \
diff --git a/src/guacenc/buffer.c b/src/guacenc/buffer.c
index eace8aaf..9f484de8 100644
--- a/src/guacenc/buffer.c
+++ b/src/guacenc/buffer.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"

 #include <cairo/cairo.h>
diff --git a/src/guacenc/cursor.c b/src/guacenc/cursor.c
index e47f44c6..7afd79c7 100644
--- a/src/guacenc/cursor.c
+++ b/src/guacenc/cursor.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"
 #include "cursor.h"

diff --git a/src/guacenc/display-buffers.c b/src/guacenc/display-buffers.c
index c8530430..af800259 100644
--- a/src/guacenc/display-buffers.c
+++ b/src/guacenc/display-buffers.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "buffer.h"
 #include "layer.h"
diff --git a/src/guacenc/display-flatten.c b/src/guacenc/display-flatten.c
index 2a9261a3..55413212 100644
--- a/src/guacenc/display-flatten.c
+++ b/src/guacenc/display-flatten.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "layer.h"
 #include "log.h"
diff --git a/src/guacenc/display-image-streams.c b/src/guacenc/display-image-streams.c
index 2c765491..b75b70e0 100644
--- a/src/guacenc/display-image-streams.c
+++ b/src/guacenc/display-image-streams.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "image-stream.h"
 #include "log.h"
diff --git a/src/guacenc/display-layers.c b/src/guacenc/display-layers.c
index c9c7541a..94e61e40 100644
--- a/src/guacenc/display-layers.c
+++ b/src/guacenc/display-layers.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "layer.h"
 #include "log.h"
diff --git a/src/guacenc/display-sync.c b/src/guacenc/display-sync.c
index fcaa6c49..029df020 100644
--- a/src/guacenc/display-sync.c
+++ b/src/guacenc/display-sync.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "layer.h"
 #include "log.h"
diff --git a/src/guacenc/display.c b/src/guacenc/display.c
index e3be0b75..de5b011a 100644
--- a/src/guacenc/display.c
+++ b/src/guacenc/display.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "cursor.h"
 #include "display.h"
 #include "video.h"
diff --git a/src/guacenc/encode.c b/src/guacenc/encode.c
index 3de9d796..e3aed4a8 100644
--- a/src/guacenc/encode.c
+++ b/src/guacenc/encode.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "instructions.h"
 #include "log.h"
diff --git a/src/guacenc/ffmpeg-compat.c b/src/guacenc/ffmpeg-compat.c
index 9f851c8e..4263b347 100644
--- a/src/guacenc/ffmpeg-compat.c
+++ b/src/guacenc/ffmpeg-compat.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "ffmpeg-compat.h"
 #include "log.h"
 #include "video.h"
diff --git a/src/guacenc/guacenc.c b/src/guacenc/guacenc.c
index 7662f916..1e757db3 100644
--- a/src/guacenc/guacenc.c
+++ b/src/guacenc/guacenc.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode.h"
 #include "guacenc.h"
 #include "log.h"
diff --git a/src/guacenc/image-stream.c b/src/guacenc/image-stream.c
index 6b617b5f..5ebca8c7 100644
--- a/src/guacenc/image-stream.c
+++ b/src/guacenc/image-stream.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "image-stream.h"
 #include "jpeg.h"
diff --git a/src/guacenc/instruction-blob.c b/src/guacenc/instruction-blob.c
index 87be8550..7c33d7ff 100644
--- a/src/guacenc/instruction-blob.c
+++ b/src/guacenc/instruction-blob.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-cfill.c b/src/guacenc/instruction-cfill.c
index 04855917..13e2e6be 100644
--- a/src/guacenc/instruction-cfill.c
+++ b/src/guacenc/instruction-cfill.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-copy.c b/src/guacenc/instruction-copy.c
index d1829e72..a5eeabfd 100644
--- a/src/guacenc/instruction-copy.c
+++ b/src/guacenc/instruction-copy.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-cursor.c b/src/guacenc/instruction-cursor.c
index 3307371a..819ac278 100644
--- a/src/guacenc/instruction-cursor.c
+++ b/src/guacenc/instruction-cursor.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"
 #include "cursor.h"
 #include "display.h"
diff --git a/src/guacenc/instruction-dispose.c b/src/guacenc/instruction-dispose.c
index df0b8f6a..8d1db490 100644
--- a/src/guacenc/instruction-dispose.c
+++ b/src/guacenc/instruction-dispose.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-end.c b/src/guacenc/instruction-end.c
index 7617ad48..b92e7aa7 100644
--- a/src/guacenc/instruction-end.c
+++ b/src/guacenc/instruction-end.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "image-stream.h"
 #include "log.h"
diff --git a/src/guacenc/instruction-img.c b/src/guacenc/instruction-img.c
index 3dd5e01d..a1314c00 100644
--- a/src/guacenc/instruction-img.c
+++ b/src/guacenc/instruction-img.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-mouse.c b/src/guacenc/instruction-mouse.c
index 9b9c526a..44f92bae 100644
--- a/src/guacenc/instruction-mouse.c
+++ b/src/guacenc/instruction-mouse.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "cursor.h"
 #include "display.h"
 #include "log.h"
diff --git a/src/guacenc/instruction-move.c b/src/guacenc/instruction-move.c
index ac6f41af..76b5f0c5 100644
--- a/src/guacenc/instruction-move.c
+++ b/src/guacenc/instruction-move.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-rect.c b/src/guacenc/instruction-rect.c
index dbb8413b..fac79189 100644
--- a/src/guacenc/instruction-rect.c
+++ b/src/guacenc/instruction-rect.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"
 #include "display.h"
 #include "log.h"
diff --git a/src/guacenc/instruction-shade.c b/src/guacenc/instruction-shade.c
index be117d37..c918cfd1 100644
--- a/src/guacenc/instruction-shade.c
+++ b/src/guacenc/instruction-shade.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-size.c b/src/guacenc/instruction-size.c
index eb2a29d2..e35508f6 100644
--- a/src/guacenc/instruction-size.c
+++ b/src/guacenc/instruction-size.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instruction-sync.c b/src/guacenc/instruction-sync.c
index c27ad145..6e374ba6 100644
--- a/src/guacenc/instruction-sync.c
+++ b/src/guacenc/instruction-sync.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"
 #include "parse.h"
diff --git a/src/guacenc/instruction-transfer.c b/src/guacenc/instruction-transfer.c
index 04dde699..3c65110b 100644
--- a/src/guacenc/instruction-transfer.c
+++ b/src/guacenc/instruction-transfer.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "log.h"

diff --git a/src/guacenc/instructions.c b/src/guacenc/instructions.c
index 6ad4835a..21341d8e 100644
--- a/src/guacenc/instructions.c
+++ b/src/guacenc/instructions.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display.h"
 #include "instructions.h"
 #include "log.h"
diff --git a/src/guacenc/jpeg.c b/src/guacenc/jpeg.c
index a472ae0b..98a44def 100644
--- a/src/guacenc/jpeg.c
+++ b/src/guacenc/jpeg.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "jpeg.h"
 #include "log.h"

diff --git a/src/guacenc/layer.c b/src/guacenc/layer.c
index 7a81fc59..0a3e03f4 100644
--- a/src/guacenc/layer.c
+++ b/src/guacenc/layer.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"
 #include "layer.h"

diff --git a/src/guacenc/log.c b/src/guacenc/log.c
index b2503976..5de3b017 100644
--- a/src/guacenc/log.c
+++ b/src/guacenc/log.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guacenc.h"
 #include "log.h"

diff --git a/src/guacenc/parse.c b/src/guacenc/parse.c
index 8f05d38f..2ff08c5d 100644
--- a/src/guacenc/parse.c
+++ b/src/guacenc/parse.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <guacamole/timestamp.h>

 #include <errno.h>
diff --git a/src/guacenc/png.c b/src/guacenc/png.c
index 5c904cf4..c452d6ac 100644
--- a/src/guacenc/png.c
+++ b/src/guacenc/png.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "log.h"
 #include "png.h"

diff --git a/src/guacenc/video.c b/src/guacenc/video.c
index 61e1842e..cd7fcfc9 100644
--- a/src/guacenc/video.c
+++ b/src/guacenc/video.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "buffer.h"
 #include "ffmpeg-compat.h"
 #include "log.h"
diff --git a/src/guacenc/webp.c b/src/guacenc/webp.c
index 0728756c..a7c2c98b 100644
--- a/src/guacenc/webp.c
+++ b/src/guacenc/webp.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "log.h"
 #include "webp.h"

diff --git a/src/guaclog/Makefile.am b/src/guaclog/Makefile.am
index af5c5a76..1e617a90 100644
--- a/src/guaclog/Makefile.am
+++ b/src/guaclog/Makefile.am
@@ -25,6 +25,8 @@

 AUTOMAKE_OPTIONS = foreign

+AM_CPPFLAGS = -include config.h
+
 bin_PROGRAMS = guaclog

 man_MANS =        \
diff --git a/src/guaclog/guaclog.c b/src/guaclog/guaclog.c
index 43502897..6459a5e3 100644
--- a/src/guaclog/guaclog.c
+++ b/src/guaclog/guaclog.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guaclog.h"
 #include "interpret.h"
 #include "log.h"
diff --git a/src/guaclog/instruction-key.c b/src/guaclog/instruction-key.c
index 0e8501b0..4a6969b4 100644
--- a/src/guaclog/instruction-key.c
+++ b/src/guaclog/instruction-key.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "log.h"
 #include "state.h"

diff --git a/src/guaclog/instructions.c b/src/guaclog/instructions.c
index 257e1343..4e32ae11 100644
--- a/src/guaclog/instructions.c
+++ b/src/guaclog/instructions.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "state.h"
 #include "instructions.h"
 #include "log.h"
diff --git a/src/guaclog/interpret.c b/src/guaclog/interpret.c
index d996c245..2a91fc88 100644
--- a/src/guaclog/interpret.c
+++ b/src/guaclog/interpret.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "instructions.h"
 #include "log.h"
 #include "state.h"
diff --git a/src/guaclog/keydef.c b/src/guaclog/keydef.c
index b9fc1db2..635f88f1 100644
--- a/src/guaclog/keydef.c
+++ b/src/guaclog/keydef.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "keydef.h"
 #include "log.h"

diff --git a/src/guaclog/log.c b/src/guaclog/log.c
index e99abacc..a80714ae 100644
--- a/src/guaclog/log.c
+++ b/src/guaclog/log.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guaclog.h"
 #include "log.h"

diff --git a/src/guaclog/state.c b/src/guaclog/state.c
index 6b353dd1..da524d7b 100644
--- a/src/guaclog/state.c
+++ b/src/guaclog/state.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "keydef.h"
 #include "log.h"
 #include "state.h"
diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am
index 28984445..af9e7fed 100644
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac.la
diff --git a/src/libguac/argv.c b/src/libguac/argv.c
index 98eb49c2..82777a71 100644
--- a/src/libguac/argv.c
+++ b/src/libguac/argv.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/argv.h"
 #include "guacamole/client.h"
diff --git a/src/libguac/audio.c b/src/libguac/audio.c
index a3cef3cc..10fe547b 100644
--- a/src/libguac/audio.c
+++ b/src/libguac/audio.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/audio.h"
 #include "guacamole/client.h"
diff --git a/src/libguac/client.c b/src/libguac/client.c
index e9635c2a..b2919c44 100644
--- a/src/libguac/client.c
+++ b/src/libguac/client.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode-jpeg.h"
 #include "encode-png.h"
 #include "encode-webp.h"
diff --git a/src/libguac/display-render-thread.c b/src/libguac/display-render-thread.c
index 933442ad..c7a98ada 100644
--- a/src/libguac/display-render-thread.c
+++ b/src/libguac/display-render-thread.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display-priv.h"
 #include "guacamole/client.h"
 #include "guacamole/display.h"
diff --git a/src/libguac/display.c b/src/libguac/display.c
index 5c0c1cef..9c7b8c43 100644
--- a/src/libguac/display.c
+++ b/src/libguac/display.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "display-plan.h"
 #include "display-priv.h"
 #include "guacamole/client.h"
diff --git a/src/libguac/encode-jpeg.c b/src/libguac/encode-jpeg.c
index 45f23255..bafc2d3e 100644
--- a/src/libguac/encode-jpeg.c
+++ b/src/libguac/encode-jpeg.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode-jpeg.h"
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
diff --git a/src/libguac/encode-png.c b/src/libguac/encode-png.c
index e930c058..9c7d6398 100644
--- a/src/libguac/encode-png.c
+++ b/src/libguac/encode-png.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode-png.h"
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
diff --git a/src/libguac/encode-webp.c b/src/libguac/encode-webp.c
index 02411cdd..ab98e0db 100644
--- a/src/libguac/encode-webp.c
+++ b/src/libguac/encode-webp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode-webp.h"
 #include "guacamole/error.h"
 #include "guacamole/protocol.h"
diff --git a/src/libguac/error.c b/src/libguac/error.c
index 9be6ca0c..bbc06f7d 100644
--- a/src/libguac/error.c
+++ b/src/libguac/error.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/error.h"

diff --git a/src/libguac/fips.c b/src/libguac/fips.c
index b087e11c..f1dbc9e3 100644
--- a/src/libguac/fips.c
+++ b/src/libguac/fips.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guacamole/fips.h"

 /* If OpenSSL is available, include header for version numbers */
diff --git a/src/libguac/hash.c b/src/libguac/hash.c
index c8f4e69c..24271d78 100644
--- a/src/libguac/hash.c
+++ b/src/libguac/hash.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include <cairo/cairo.h>

 #include <stdint.h>
diff --git a/src/libguac/id.c b/src/libguac/id.c
index 699a9b0e..3c8805c5 100644
--- a/src/libguac/id.c
+++ b/src/libguac/id.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
 #include "id.h"
diff --git a/src/libguac/palette.c b/src/libguac/palette.c
index 1c56d828..1d5199a9 100644
--- a/src/libguac/palette.c
+++ b/src/libguac/palette.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "palette.h"

diff --git a/src/libguac/parser.c b/src/libguac/parser.c
index 0a031192..762da9d2 100644
--- a/src/libguac/parser.c
+++ b/src/libguac/parser.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
 #include "guacamole/parser.h"
diff --git a/src/libguac/pool.c b/src/libguac/pool.c
index 29112918..45ee81e0 100644
--- a/src/libguac/pool.c
+++ b/src/libguac/pool.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/assert.h"
 #include "guacamole/mem.h"
 #include "guacamole/pool.h"
diff --git a/src/libguac/proctitle.c b/src/libguac/proctitle.c
index 79ac17fe..990527e9 100644
--- a/src/libguac/proctitle.c
+++ b/src/libguac/proctitle.c
@@ -16,8 +16,6 @@
  * limitations under the License.
  */

-#include "config.h"
-
 #include "guacamole/proctitle.h"

 #include <guacamole/mem.h>
diff --git a/src/libguac/protocol.c b/src/libguac/protocol.c
index b415dac8..76f0b9df 100644
--- a/src/libguac/protocol.c
+++ b/src/libguac/protocol.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/error.h"
 #include "guacamole/layer.h"
 #include "guacamole/object.h"
diff --git a/src/libguac/raw_encoder.c b/src/libguac/raw_encoder.c
index 8fdefc75..86b22d00 100644
--- a/src/libguac/raw_encoder.c
+++ b/src/libguac/raw_encoder.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/audio.h"
 #include "guacamole/client.h"
diff --git a/src/libguac/socket-broadcast.c b/src/libguac/socket-broadcast.c
index 99736ac2..b87a6717 100644
--- a/src/libguac/socket-broadcast.c
+++ b/src/libguac/socket-broadcast.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/client.h"
 #include "guacamole/error.h"
diff --git a/src/libguac/socket-fd.c b/src/libguac/socket-fd.c
index b8bb04ef..e8d8707c 100644
--- a/src/libguac/socket-fd.c
+++ b/src/libguac/socket-fd.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "wait-fd.h"

 #include "guacamole/mem.h"
diff --git a/src/libguac/socket-nest.c b/src/libguac/socket-nest.c
index 8bf94352..3193bb7e 100644
--- a/src/libguac/socket-nest.c
+++ b/src/libguac/socket-nest.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/protocol.h"
 #include "guacamole/socket.h"
diff --git a/src/libguac/socket-ssl.c b/src/libguac/socket-ssl.c
index cdcd9f36..5da4a91e 100644
--- a/src/libguac/socket-ssl.c
+++ b/src/libguac/socket-ssl.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
 #include "guacamole/socket-ssl.h"
diff --git a/src/libguac/socket-tee.c b/src/libguac/socket-tee.c
index bbdb1cf5..c6450b70 100644
--- a/src/libguac/socket-tee.c
+++ b/src/libguac/socket-tee.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/socket.h"

diff --git a/src/libguac/socket.c b/src/libguac/socket.c
index 4dfc2567..1d51168a 100644
--- a/src/libguac/socket.c
+++ b/src/libguac/socket.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guacamole/mem.h"
 #include "guacamole/error.h"
 #include "guacamole/proctitle.h"
diff --git a/src/libguac/string.c b/src/libguac/string.c
index 7cb26cca..c4b57eda 100644
--- a/src/libguac/string.c
+++ b/src/libguac/string.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"

 #include <stddef.h>
diff --git a/src/libguac/tcp.c b/src/libguac/tcp.c
index b4b12ba6..7b68ccf3 100644
--- a/src/libguac/tcp.c
+++ b/src/libguac/tcp.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guacamole/error.h"
 #include "guacamole/tcp.h"

diff --git a/src/libguac/tests/Makefile.am b/src/libguac/tests/Makefile.am
index 1d5c244e..b5be8e7d 100644
--- a/src/libguac/tests/Makefile.am
+++ b/src/libguac/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #
diff --git a/src/libguac/timestamp.c b/src/libguac/timestamp.c
index ee207f28..044ebd96 100644
--- a/src/libguac/timestamp.c
+++ b/src/libguac/timestamp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/error.h"
 #include "guacamole/timestamp.h"

diff --git a/src/libguac/unicode.c b/src/libguac/unicode.c
index fdc0fffd..d3967933 100644
--- a/src/libguac/unicode.c
+++ b/src/libguac/unicode.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/unicode.h"

 #include <stddef.h>
diff --git a/src/libguac/user-handlers.c b/src/libguac/user-handlers.c
index b9013bc7..bafaae73 100644
--- a/src/libguac/user-handlers.c
+++ b/src/libguac/user-handlers.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/client.h"
 #include "guacamole/object.h"
diff --git a/src/libguac/user-handshake.c b/src/libguac/user-handshake.c
index f0aa35ce..4b79ccae 100644
--- a/src/libguac/user-handshake.c
+++ b/src/libguac/user-handshake.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/mem.h"
 #include "guacamole/client.h"
 #include "guacamole/error.h"
diff --git a/src/libguac/user.c b/src/libguac/user.c
index 96a3add0..ff1d3ece 100644
--- a/src/libguac/user.c
+++ b/src/libguac/user.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "encode-jpeg.h"
 #include "encode-png.h"
 #include "encode-webp.h"
diff --git a/src/libguac/wait-fd.c b/src/libguac/wait-fd.c
index 05359951..1d62e44a 100644
--- a/src/libguac/wait-fd.c
+++ b/src/libguac/wait-fd.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "guacamole/error.h"
 #include <errno.h>

diff --git a/src/libguac/wol.c b/src/libguac/wol.c
index 0b301a3c..d6167d05 100644
--- a/src/libguac/wol.c
+++ b/src/libguac/wol.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "guacamole/error.h"
 #include "guacamole/tcp.h"
 #include "guacamole/timestamp.h"
diff --git a/src/protocols/kubernetes/Makefile.am b/src/protocols/kubernetes/Makefile.am
index e9316ce4..7299c384 100644
--- a/src/protocols/kubernetes/Makefile.am
+++ b/src/protocols/kubernetes/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-client-kubernetes.la
diff --git a/src/protocols/kubernetes/argv.c b/src/protocols/kubernetes/argv.c
index 9b2bfcfc..43b066d7 100644
--- a/src/protocols/kubernetes/argv.c
+++ b/src/protocols/kubernetes/argv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "kubernetes.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/kubernetes/kubernetes.c b/src/protocols/kubernetes/kubernetes.c
index af2005f7..be61a6c7 100644
--- a/src/protocols/kubernetes/kubernetes.c
+++ b/src/protocols/kubernetes/kubernetes.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "client.h"
 #include "io.h"
diff --git a/src/protocols/kubernetes/tests/Makefile.am b/src/protocols/kubernetes/tests/Makefile.am
index ec0c3a8b..6e31d0f2 100644
--- a/src/protocols/kubernetes/tests/Makefile.am
+++ b/src/protocols/kubernetes/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index dc9638e3..b0b77614 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-client-rdp.la
diff --git a/src/protocols/rdp/argv.c b/src/protocols/rdp/argv.c
index 16080d91..d85bc13c 100644
--- a/src/protocols/rdp/argv.c
+++ b/src/protocols/rdp/argv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "rdp.h"
 #include "settings.h"
diff --git a/src/protocols/rdp/channels/cliprdr.c b/src/protocols/rdp/channels/cliprdr.c
index 34bacf3b..73e39d07 100644
--- a/src/protocols/rdp/channels/cliprdr.c
+++ b/src/protocols/rdp/channels/cliprdr.c
@@ -21,7 +21,6 @@
 #include "client.h"
 #include "common/clipboard.h"
 #include "common/iconv.h"
-#include "config.h"
 #include "plugins/channels.h"
 #include "rdp.h"

diff --git a/src/protocols/rdp/channels/disp.c b/src/protocols/rdp/channels/disp.c
index f0463b95..da1ca800 100644
--- a/src/protocols/rdp/channels/disp.c
+++ b/src/protocols/rdp/channels/disp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "channels/disp.h"
 #include "plugins/channels.h"
 #include "fs.h"
diff --git a/src/protocols/rdp/channels/rail.c b/src/protocols/rdp/channels/rail.c
index bd7e65a7..63fda9f5 100644
--- a/src/protocols/rdp/channels/rail.c
+++ b/src/protocols/rdp/channels/rail.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "channels/rail.h"
 #include "plugins/channels.h"
 #include "rdp.h"
diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index 8b2e683d..e7ce3874 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -23,7 +23,6 @@
 #include "channels/disp.h"
 #include "channels/pipe-svc.h"
 #include "channels/rail.h"
-#include "config.h"
 #include "fs.h"
 #include "log.h"
 #include "rdp.h"
diff --git a/src/protocols/rdp/color.c b/src/protocols/rdp/color.c
index 7733b2c4..15fcf114 100644
--- a/src/protocols/rdp/color.c
+++ b/src/protocols/rdp/color.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "settings.h"

 #include <freerdp/codec/color.h>
diff --git a/src/protocols/rdp/input-queue.c b/src/protocols/rdp/input-queue.c
index 76994a8e..1606d479 100644
--- a/src/protocols/rdp/input-queue.c
+++ b/src/protocols/rdp/input-queue.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "channels/disp.h"
 #include "channels/rdpei.h"
 #include "input.h"
diff --git a/src/protocols/rdp/input.c b/src/protocols/rdp/input.c
index 63c0be2d..34f9e7c4 100644
--- a/src/protocols/rdp/input.c
+++ b/src/protocols/rdp/input.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "channels/disp.h"
 #include "channels/rdpei.h"
 #include "input.h"
diff --git a/src/protocols/rdp/keyboard.c b/src/protocols/rdp/keyboard.c
index b6058989..3e749bc7 100644
--- a/src/protocols/rdp/keyboard.c
+++ b/src/protocols/rdp/keyboard.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "decompose.h"
 #include "keyboard.h"
 #include "keymap.h"
diff --git a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
index 889e4ed4..ada2e3f5 100644
--- a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
+++ b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "channels/common-svc.h"

 #include <freerdp/svc.h>
diff --git a/src/protocols/rdp/plugins/guacai/guacai.c b/src/protocols/rdp/plugins/guacai/guacai.c
index f45955bf..2abae652 100644
--- a/src/protocols/rdp/plugins/guacai/guacai.c
+++ b/src/protocols/rdp/plugins/guacai/guacai.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "channels/audio-input/audio-buffer.h"
 #include "plugins/guacai/guacai.h"
 #include "plugins/guacai/guacai-messages.h"
diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index 23ed9bc4..f0165a4b 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "beep.h"
 #include "channels/audio-input/audio-buffer.h"
@@ -33,7 +31,6 @@
 #include "channels/rdpsnd/rdpsnd.h"
 #include "client.h"
 #include "color.h"
-#include "config.h"
 #include "error.h"
 #include "fs.h"
 #include "gdi.h"
diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c
index 7490d4d0..451a056b 100644
--- a/src/protocols/rdp/settings.c
+++ b/src/protocols/rdp/settings.c
@@ -20,7 +20,6 @@
 #include "argv.h"
 #include "common/defaults.h"
 #include "common/string.h"
-#include "config.h"
 #include "rdp.h"
 #include "resolution.h"
 #include "settings.h"
diff --git a/src/protocols/rdp/sftp.c b/src/protocols/rdp/sftp.c
index 539cdbbb..0fc25803 100644
--- a/src/protocols/rdp/sftp.c
+++ b/src/protocols/rdp/sftp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common-ssh/sftp.h"
 #include "rdp.h"
 #include "sftp.h"
diff --git a/src/protocols/rdp/tests/Makefile.am b/src/protocols/rdp/tests/Makefile.am
index e1e22e36..bf0f2dc3 100644
--- a/src/protocols/rdp/tests/Makefile.am
+++ b/src/protocols/rdp/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #
diff --git a/src/protocols/rdp/user.c b/src/protocols/rdp/user.c
index 5e115ebf..f46a60a4 100644
--- a/src/protocols/rdp/user.c
+++ b/src/protocols/rdp/user.c
@@ -20,7 +20,6 @@
 #include "channels/audio-input/audio-input.h"
 #include "channels/cliprdr.h"
 #include "channels/pipe-svc.h"
-#include "config.h"
 #include "input.h"
 #include "rdp.h"
 #include "settings.h"
diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am
index 7bb1e349..56f6ccc5 100644
--- a/src/protocols/ssh/Makefile.am
+++ b/src/protocols/ssh/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-client-ssh.la
diff --git a/src/protocols/ssh/argv.c b/src/protocols/ssh/argv.c
index 6082b02f..87119dec 100644
--- a/src/protocols/ssh/argv.c
+++ b/src/protocols/ssh/argv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "ssh.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c
index 991d8746..298189e4 100644
--- a/src/protocols/ssh/client.c
+++ b/src/protocols/ssh/client.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "client.h"
 #include "common-ssh/sftp.h"
diff --git a/src/protocols/ssh/clipboard.c b/src/protocols/ssh/clipboard.c
index 0e236325..7f7a0ba7 100644
--- a/src/protocols/ssh/clipboard.c
+++ b/src/protocols/ssh/clipboard.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "clipboard.h"
 #include "ssh.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/ssh/input.c b/src/protocols/ssh/input.c
index f60e1c9f..e00f9e17 100644
--- a/src/protocols/ssh/input.c
+++ b/src/protocols/ssh/input.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "ssh.h"
 #include "terminal/terminal.h"

diff --git a/src/protocols/ssh/pipe.c b/src/protocols/ssh/pipe.c
index 01569bca..d6b1b8c9 100644
--- a/src/protocols/ssh/pipe.c
+++ b/src/protocols/ssh/pipe.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "pipe.h"
 #include "ssh.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index 099b1200..65c4bfc4 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "client.h"
 #include "common/defaults.h"
diff --git a/src/protocols/ssh/sftp.c b/src/protocols/ssh/sftp.c
index f4173a68..d1bee4be 100644
--- a/src/protocols/ssh/sftp.c
+++ b/src/protocols/ssh/sftp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "ssh.h"
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index cd91bd9f..f4f1d331 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "common-ssh/sftp.h"
 #include "common-ssh/ssh.h"
diff --git a/src/protocols/ssh/ssh_agent.c b/src/protocols/ssh/ssh_agent.c
index 0afbae09..e660dd46 100644
--- a/src/protocols/ssh/ssh_agent.c
+++ b/src/protocols/ssh/ssh_agent.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "client.h"
 #include "ssh_agent.h"
 #include "ssh_buffer.h"
diff --git a/src/protocols/ssh/ttymode.c b/src/protocols/ssh/ttymode.c
index e6731b4a..0903c8ea 100644
--- a/src/protocols/ssh/ttymode.c
+++ b/src/protocols/ssh/ttymode.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "ttymode.h"

 #include <stdarg.h>
diff --git a/src/protocols/ssh/user.c b/src/protocols/ssh/user.c
index 30b8fe59..38f60d0f 100644
--- a/src/protocols/ssh/user.c
+++ b/src/protocols/ssh/user.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "clipboard.h"
 #include "input.h"
diff --git a/src/protocols/telnet/Makefile.am b/src/protocols/telnet/Makefile.am
index d0264f67..e19e39a7 100644
--- a/src/protocols/telnet/Makefile.am
+++ b/src/protocols/telnet/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-client-telnet.la
diff --git a/src/protocols/telnet/argv.c b/src/protocols/telnet/argv.c
index 0424e323..e15f0c21 100644
--- a/src/protocols/telnet/argv.c
+++ b/src/protocols/telnet/argv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "telnet.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/telnet/client.c b/src/protocols/telnet/client.c
index ba1f20f4..cdec94a8 100644
--- a/src/protocols/telnet/client.c
+++ b/src/protocols/telnet/client.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "client.h"
 #include "settings.h"
diff --git a/src/protocols/telnet/clipboard.c b/src/protocols/telnet/clipboard.c
index 08d28b11..3a067020 100644
--- a/src/protocols/telnet/clipboard.c
+++ b/src/protocols/telnet/clipboard.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "clipboard.h"
 #include "telnet.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/telnet/input.c b/src/protocols/telnet/input.c
index 849d1897..c5ef5441 100644
--- a/src/protocols/telnet/input.c
+++ b/src/protocols/telnet/input.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "input.h"
 #include "terminal/terminal.h"
 #include "telnet.h"
diff --git a/src/protocols/telnet/pipe.c b/src/protocols/telnet/pipe.c
index 0293a841..3f1de464 100644
--- a/src/protocols/telnet/pipe.c
+++ b/src/protocols/telnet/pipe.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "pipe.h"
 #include "telnet.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/telnet/settings.c b/src/protocols/telnet/settings.c
index 9faf7a05..8368bcd3 100644
--- a/src/protocols/telnet/settings.c
+++ b/src/protocols/telnet/settings.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "common/defaults.h"
 #include "settings.h"
diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c
index 948cdc4a..e94a6f22 100644
--- a/src/protocols/telnet/telnet.c
+++ b/src/protocols/telnet/telnet.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "telnet.h"
 #include "terminal/terminal.h"
diff --git a/src/protocols/telnet/user.c b/src/protocols/telnet/user.c
index e9d9df46..b3f1d134 100644
--- a/src/protocols/telnet/user.c
+++ b/src/protocols/telnet/user.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "clipboard.h"
 #include "input.h"
diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am
index 64e8147e..ae0e9859 100644
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-client-vnc.la
diff --git a/src/protocols/vnc/argv.c b/src/protocols/vnc/argv.c
index 44fe5ee0..48b54936 100644
--- a/src/protocols/vnc/argv.c
+++ b/src/protocols/vnc/argv.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "argv.h"
 #include "vnc.h"

diff --git a/src/protocols/vnc/auth.c b/src/protocols/vnc/auth.c
index 45dacb64..77344f2f 100644
--- a/src/protocols/vnc/auth.c
+++ b/src/protocols/vnc/auth.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "auth.h"
 #include "vnc.h"
diff --git a/src/protocols/vnc/client.c b/src/protocols/vnc/client.c
index 5573d277..7747b9c2 100644
--- a/src/protocols/vnc/client.c
+++ b/src/protocols/vnc/client.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "client.h"
 #include "user.h"
 #include "vnc.h"
diff --git a/src/protocols/vnc/clipboard.c b/src/protocols/vnc/clipboard.c
index ec18e402..1521f544 100644
--- a/src/protocols/vnc/clipboard.c
+++ b/src/protocols/vnc/clipboard.c
@@ -17,7 +17,6 @@
  * under the License.
  */

-#include "config.h"
 #include "client.h"
 #include "clipboard.h"
 #include "common/clipboard.h"
diff --git a/src/protocols/vnc/cursor.c b/src/protocols/vnc/cursor.c
index 079ddd36..cbb2ec9e 100644
--- a/src/protocols/vnc/cursor.c
+++ b/src/protocols/vnc/cursor.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "client.h"
 #include "vnc.h"

diff --git a/src/protocols/vnc/display.c b/src/protocols/vnc/display.c
index e02c0d33..f151ed8f 100644
--- a/src/protocols/vnc/display.c
+++ b/src/protocols/vnc/display.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "client.h"
 #include "display.h"
 #include "common/iconv.h"
diff --git a/src/protocols/vnc/input.c b/src/protocols/vnc/input.c
index 5c4700b7..63d5bce5 100644
--- a/src/protocols/vnc/input.c
+++ b/src/protocols/vnc/input.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "display.h"
 #include "vnc.h"

diff --git a/src/protocols/vnc/log.c b/src/protocols/vnc/log.c
index afb93d0e..a81c9337 100644
--- a/src/protocols/vnc/log.c
+++ b/src/protocols/vnc/log.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "client.h"
 #include "common/iconv.h"

diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index f3baf2d3..71672129 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "argv.h"
 #include "client.h"
 #include "common/defaults.h"
diff --git a/src/protocols/vnc/sftp.c b/src/protocols/vnc/sftp.c
index e5e768ac..b6b84740 100644
--- a/src/protocols/vnc/sftp.c
+++ b/src/protocols/vnc/sftp.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "vnc.h"
diff --git a/src/protocols/vnc/user.c b/src/protocols/vnc/user.c
index 8605f071..0fe82822 100644
--- a/src/protocols/vnc/user.c
+++ b/src/protocols/vnc/user.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "clipboard.h"
 #include "input.h"
 #include "user.h"
diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c
index 3a1c2479..26af94c6 100644
--- a/src/protocols/vnc/vnc.c
+++ b/src/protocols/vnc/vnc.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "auth.h"
 #include "client.h"
 #include "clipboard.h"
diff --git a/src/pulse/Makefile.am b/src/pulse/Makefile.am
index 3cb2d44c..3017e4e2 100644
--- a/src/pulse/Makefile.am
+++ b/src/pulse/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 noinst_LTLIBRARIES = libguac_pulse.la
diff --git a/src/pulse/pulse.c b/src/pulse/pulse.c
index 48d79269..00f1930a 100644
--- a/src/pulse/pulse.c
+++ b/src/pulse/pulse.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "pulse/pulse.h"

 #include <guacamole/audio.h>
diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am
index 9b67d90d..bbe98099 100644
--- a/src/terminal/Makefile.am
+++ b/src/terminal/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 lib_LTLIBRARIES = libguac-terminal.la
diff --git a/src/terminal/display.c b/src/terminal/display.c
index 4daa8c57..3fd9f871 100644
--- a/src/terminal/display.c
+++ b/src/terminal/display.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common/surface.h"
 #include "terminal/common.h"
 #include "terminal/display.h"
diff --git a/src/terminal/terminal-handlers.c b/src/terminal/terminal-handlers.c
index e9de88f5..615adcc6 100644
--- a/src/terminal/terminal-handlers.c
+++ b/src/terminal/terminal-handlers.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "terminal/char-mappings.h"
 #include "terminal/palette.h"
 #include "terminal/terminal.h"
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index a8ab2306..9a41c3c3 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -17,8 +17,6 @@
  * under the License.
  */

-#include "config.h"
-
 #include "common/clipboard.h"
 #include "common/cursor.h"
 #include "common/iconv.h"
diff --git a/src/terminal/tests/Makefile.am b/src/terminal/tests/Makefile.am
index 93316594..a392984d 100644
--- a/src/terminal/tests/Makefile.am
+++ b/src/terminal/tests/Makefile.am
@@ -24,6 +24,8 @@
 #

 AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -include config.h
 ACLOCAL_AMFLAGS = -I m4

 #