Commit 309971b2 for guacamole.apache.org

commit 309971b2113b0e7692eeb25e3f0cd6c233d25670
Author: Virtually Nick <vnick@apache.org>
Date:   Thu Dec 11 06:28:27 2025 -0500

    GUACAMOLE-2182: Remove config.h includes from header files.

diff --git a/src/common-ssh/common-ssh/buffer.h b/src/common-ssh/common-ssh/buffer.h
index 7627f066..b007c03e 100644
--- a/src/common-ssh/common-ssh/buffer.h
+++ b/src/common-ssh/common-ssh/buffer.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_COMMON_SSH_BUFFER_H
 #define GUAC_COMMON_SSH_BUFFER_H

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

diff --git a/src/common-ssh/common-ssh/key.h b/src/common-ssh/common-ssh/key.h
index 4ed9bacd..ce8fec94 100644
--- a/src/common-ssh/common-ssh/key.h
+++ b/src/common-ssh/common-ssh/key.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_COMMON_SSH_KEY_H
 #define GUAC_COMMON_SSH_KEY_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <libssh2.h>

diff --git a/src/common/common/blank_cursor.h b/src/common/common/blank_cursor.h
index 86a4a9ff..cda89874 100644
--- a/src/common/common/blank_cursor.h
+++ b/src/common/common/blank_cursor.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_COMMON_BLANK_CURSOR_H
 #define GUAC_COMMON_BLANK_CURSOR_H

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

diff --git a/src/common/common/clipboard.h b/src/common/common/clipboard.h
index 308c6674..ba5486f4 100644
--- a/src/common/common/clipboard.h
+++ b/src/common/common/clipboard.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_CLIPBOARD_H
 #define __GUAC_CLIPBOARD_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <pthread.h>

diff --git a/src/common/common/dot_cursor.h b/src/common/common/dot_cursor.h
index c5b73880..4c2306e1 100644
--- a/src/common/common/dot_cursor.h
+++ b/src/common/common/dot_cursor.h
@@ -20,8 +20,6 @@
 #ifndef _GUAC_COMMON_DOT_CURSOR_H
 #define _GUAC_COMMON_DOT_CURSOR_H

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

diff --git a/src/common/common/ibar_cursor.h b/src/common/common/ibar_cursor.h
index ae11fff7..9f2834ac 100644
--- a/src/common/common/ibar_cursor.h
+++ b/src/common/common/ibar_cursor.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_COMMON_IBAR_CURSOR_H
 #define GUAC_COMMON_IBAR_CURSOR_H

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

diff --git a/src/common/common/iconv.h b/src/common/common/iconv.h
index 16a2a634..43335eab 100644
--- a/src/common/common/iconv.h
+++ b/src/common/common/iconv.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_COMMON_ICONV_H
 #define __GUAC_COMMON_ICONV_H

-#include "config.h"
-
 /**
  * Function which reads a character from the given string data, returning
  * the Unicode codepoint read, updating the string pointer to point to the
diff --git a/src/common/common/io.h b/src/common/common/io.h
index 832fc2b1..148610dd 100644
--- a/src/common/common/io.h
+++ b/src/common/common/io.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_COMMON_IO_H
 #define __GUAC_COMMON_IO_H

-#include "config.h"
-
 /**
  * Writes absolutely all bytes from within the given buffer, returning an error
  * only if the required writes fail.
diff --git a/src/common/common/json.h b/src/common/common/json.h
index edb233c4..5df9752d 100644
--- a/src/common/common/json.h
+++ b/src/common/common/json.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_COMMON_JSON_H
 #define GUAC_COMMON_JSON_H

-#include "config.h"
-
 #include <guacamole/stream.h>
 #include <guacamole/user.h>

diff --git a/src/common/common/list.h b/src/common/common/list.h
index f1a16a1b..6c8e0a42 100644
--- a/src/common/common/list.h
+++ b/src/common/common/list.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_LIST_H
 #define __GUAC_LIST_H

-#include "config.h"
-
 #include <pthread.h>

 /**
diff --git a/src/common/common/pointer_cursor.h b/src/common/common/pointer_cursor.h
index 74559ba3..b8bb06df 100644
--- a/src/common/common/pointer_cursor.h
+++ b/src/common/common/pointer_cursor.h
@@ -20,8 +20,6 @@
 #ifndef _GUAC_COMMON_POINTER_CURSOR_H
 #define _GUAC_COMMON_POINTER_CURSOR_H

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

diff --git a/src/common/common/rect.h b/src/common/common/rect.h
index 6b310486..22b6d21f 100644
--- a/src/common/common/rect.h
+++ b/src/common/common/rect.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_COMMON_RECT_H
 #define __GUAC_COMMON_RECT_H

-#include "config.h"
-
 /**
  * Simple representation of a rectangle, having a defined corner and dimensions.
  */
diff --git a/src/common/common/string.h b/src/common/common/string.h
index 8498cddc..43d3bf7e 100644
--- a/src/common/common/string.h
+++ b/src/common/common/string.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_COMMON_STRING_H
 #define __GUAC_COMMON_STRING_H

-#include "config.h"
-
 #include <stddef.h>

 /**
diff --git a/src/common/common/surface.h b/src/common/common/surface.h
index 21859a3e..30d814c3 100644
--- a/src/common/common/surface.h
+++ b/src/common/common/surface.h
@@ -20,7 +20,6 @@
 #ifndef __GUAC_COMMON_SURFACE_H
 #define __GUAC_COMMON_SURFACE_H

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

 #include <cairo/cairo.h>
diff --git a/src/guacd/conf-args.h b/src/guacd/conf-args.h
index 2fb86b4c..09e896cc 100644
--- a/src/guacd/conf-args.h
+++ b/src/guacd/conf-args.h
@@ -20,8 +20,6 @@
 #ifndef _GUACD_CONF_ARGS_H
 #define _GUACD_CONF_ARGS_H

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

 /**
diff --git a/src/guacd/conf-file.h b/src/guacd/conf-file.h
index c38d859d..3548698a 100644
--- a/src/guacd/conf-file.h
+++ b/src/guacd/conf-file.h
@@ -20,8 +20,6 @@
 #ifndef _GUACD_CONF_FILE_H
 #define _GUACD_CONF_FILE_H

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

 /**
diff --git a/src/guacd/conf.h b/src/guacd/conf.h
index dd571736..e65f1c9f 100644
--- a/src/guacd/conf.h
+++ b/src/guacd/conf.h
@@ -20,8 +20,6 @@
 #ifndef GUACD_CONF_H
 #define GUACD_CONF_H

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

 /**
diff --git a/src/guacd/connection.h b/src/guacd/connection.h
index 08a75266..53e9b4ab 100644
--- a/src/guacd/connection.h
+++ b/src/guacd/connection.h
@@ -20,8 +20,6 @@
 #ifndef GUACD_CONNECTION_H
 #define GUACD_CONNECTION_H

-#include "config.h"
-
 #include "proc-map.h"

 #ifdef ENABLE_SSL
diff --git a/src/guacd/log.h b/src/guacd/log.h
index c00fa823..209822af 100644
--- a/src/guacd/log.h
+++ b/src/guacd/log.h
@@ -20,8 +20,6 @@
 #ifndef __GUACD_LOG_H
 #define __GUACD_LOG_H

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

 /**
diff --git a/src/guacd/move-fd.h b/src/guacd/move-fd.h
index 4bbf1f3c..6b3ffb36 100644
--- a/src/guacd/move-fd.h
+++ b/src/guacd/move-fd.h
@@ -20,8 +20,6 @@
 #ifndef GUACD_MOVE_FD_H
 #define GUACD_MOVE_FD_H

-#include "config.h"
-
 /**
  * Sends the given file descriptor along the given socket, allowing the
  * receiving process to use that file descriptor normally. Returns non-zero on
diff --git a/src/guacd/proc-map.h b/src/guacd/proc-map.h
index adce8cf6..518b9ef3 100644
--- a/src/guacd/proc-map.h
+++ b/src/guacd/proc-map.h
@@ -20,7 +20,6 @@
 #ifndef _GUACD_PROC_MAP_H
 #define _GUACD_PROC_MAP_H

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

diff --git a/src/guacd/proc.h b/src/guacd/proc.h
index f6def1ed..4ee749f0 100644
--- a/src/guacd/proc.h
+++ b/src/guacd/proc.h
@@ -20,8 +20,6 @@
 #ifndef GUACD_PROC_H
 #define GUACD_PROC_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <guacamole/parser.h>

diff --git a/src/guacenc/buffer.h b/src/guacenc/buffer.h
index 9ce339c7..ad063f22 100644
--- a/src/guacenc/buffer.h
+++ b/src/guacenc/buffer.h
@@ -20,8 +20,6 @@
 #ifndef GUACENC_BUFFER_H
 #define GUACENC_BUFFER_H

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

 #include <stdbool.h>
diff --git a/src/guacenc/cursor.h b/src/guacenc/cursor.h
index 80f4729a..dbea3b90 100644
--- a/src/guacenc/cursor.h
+++ b/src/guacenc/cursor.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_CURSOR_H
 #define GUACENC_CURSOR_H

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

 #include <guacamole/protocol.h>
diff --git a/src/guacenc/display.h b/src/guacenc/display.h
index 2616bdc3..a2f5e19d 100644
--- a/src/guacenc/display.h
+++ b/src/guacenc/display.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_DISPLAY_H
 #define GUACENC_DISPLAY_H

-#include "config.h"
 #include "buffer.h"
 #include "cursor.h"
 #include "image-stream.h"
diff --git a/src/guacenc/encode.h b/src/guacenc/encode.h
index 87bc2e6b..7db04b0d 100644
--- a/src/guacenc/encode.h
+++ b/src/guacenc/encode.h
@@ -20,8 +20,6 @@
 #ifndef GUACENC_ENCODE_H
 #define GUACENC_ENCODE_H

-#include "config.h"
-
 #include <stdbool.h>

 /**
diff --git a/src/guacenc/ffmpeg-compat.h b/src/guacenc/ffmpeg-compat.h
index 12cc828f..36ea6a63 100644
--- a/src/guacenc/ffmpeg-compat.h
+++ b/src/guacenc/ffmpeg-compat.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_FFMPEG_COMPAT_H
 #define GUACENC_FFMPEG_COMPAT_H

-#include "config.h"
 #include "video.h"

 #include <libavcodec/avcodec.h>
diff --git a/src/guacenc/guacenc.h b/src/guacenc/guacenc.h
index 360de9d6..ec6d4958 100644
--- a/src/guacenc/guacenc.h
+++ b/src/guacenc/guacenc.h
@@ -20,8 +20,6 @@
 #ifndef GUACENC_H
 #define GUACENC_H

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

 /**
diff --git a/src/guacenc/image-stream.h b/src/guacenc/image-stream.h
index 3547fc31..cf42b2a3 100644
--- a/src/guacenc/image-stream.h
+++ b/src/guacenc/image-stream.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_IMAGE_STREAM_H
 #define GUACENC_IMAGE_STREAM_H

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

 #include <cairo/cairo.h>
diff --git a/src/guacenc/instructions.h b/src/guacenc/instructions.h
index b8dbdd41..c4852b7f 100644
--- a/src/guacenc/instructions.h
+++ b/src/guacenc/instructions.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_INSTRUCTIONS_H
 #define GUACENC_INSTRUCTIONS_H

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

 /**
diff --git a/src/guacenc/jpeg.h b/src/guacenc/jpeg.h
index e69ad845..e93872b3 100644
--- a/src/guacenc/jpeg.h
+++ b/src/guacenc/jpeg.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_JPEG_H
 #define GUACENC_JPEG_H

-#include "config.h"
 #include "image-stream.h"

 /**
diff --git a/src/guacenc/layer.h b/src/guacenc/layer.h
index af247c8c..1424774f 100644
--- a/src/guacenc/layer.h
+++ b/src/guacenc/layer.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_LAYER_H
 #define GUACENC_LAYER_H

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

 /**
diff --git a/src/guacenc/log.h b/src/guacenc/log.h
index ad40c171..ee93670d 100644
--- a/src/guacenc/log.h
+++ b/src/guacenc/log.h
@@ -20,8 +20,6 @@
 #ifndef GUACENC_LOG_H
 #define GUACENC_LOG_H

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

 #include <stdarg.h>
diff --git a/src/guacenc/parse.h b/src/guacenc/parse.h
index b56ee59a..c1230d7f 100644
--- a/src/guacenc/parse.h
+++ b/src/guacenc/parse.h
@@ -20,8 +20,6 @@
 #ifndef GUACENC_PARSE_H
 #define GUACENC_PARSE_H

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

 /**
diff --git a/src/guacenc/png.h b/src/guacenc/png.h
index 82330776..904486a6 100644
--- a/src/guacenc/png.h
+++ b/src/guacenc/png.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_PNG_H
 #define GUACENC_PNG_H

-#include "config.h"
 #include "image-stream.h"

 /**
diff --git a/src/guacenc/video.h b/src/guacenc/video.h
index ea0c1615..596366a2 100644
--- a/src/guacenc/video.h
+++ b/src/guacenc/video.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_VIDEO_H
 #define GUACENC_VIDEO_H

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

 #include <guacamole/timestamp.h>
diff --git a/src/guacenc/webp.h b/src/guacenc/webp.h
index bc5df056..0f028c29 100644
--- a/src/guacenc/webp.h
+++ b/src/guacenc/webp.h
@@ -20,7 +20,6 @@
 #ifndef GUACENC_WEBP_H
 #define GUACENC_WEBP_H

-#include "config.h"
 #include "image-stream.h"

 /**
diff --git a/src/guaclog/guaclog.h b/src/guaclog/guaclog.h
index 7390314e..bb197c13 100644
--- a/src/guaclog/guaclog.h
+++ b/src/guaclog/guaclog.h
@@ -20,8 +20,6 @@
 #ifndef GUACLOG_H
 #define GUACLOG_H

-#include "config.h"
-
 /**
  * The default log level below which no messages should be logged.
  */
diff --git a/src/guaclog/instructions.h b/src/guaclog/instructions.h
index 0c901f53..16351bad 100644
--- a/src/guaclog/instructions.h
+++ b/src/guaclog/instructions.h
@@ -20,7 +20,6 @@
 #ifndef GUACLOG_INSTRUCTIONS_H
 #define GUACLOG_INSTRUCTIONS_H

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

 /**
diff --git a/src/guaclog/interpret.h b/src/guaclog/interpret.h
index c65764e3..974ec314 100644
--- a/src/guaclog/interpret.h
+++ b/src/guaclog/interpret.h
@@ -20,8 +20,6 @@
 #ifndef GUACLOG_INTERPRET_H
 #define GUACLOG_INTERPRET_H

-#include "config.h"
-
 #include <stdbool.h>

 /**
diff --git a/src/guaclog/keydef.h b/src/guaclog/keydef.h
index 147fe20a..d0c72409 100644
--- a/src/guaclog/keydef.h
+++ b/src/guaclog/keydef.h
@@ -20,8 +20,6 @@
 #ifndef GUACLOG_KEYDEF_H
 #define GUACLOG_KEYDEF_H

-#include "config.h"
-
 #include <stdbool.h>

 /**
diff --git a/src/guaclog/log.h b/src/guaclog/log.h
index bcf90a1c..5dff6871 100644
--- a/src/guaclog/log.h
+++ b/src/guaclog/log.h
@@ -20,8 +20,6 @@
 #ifndef GUACLOG_LOG_H
 #define GUACLOG_LOG_H

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

 #include <stdarg.h>
diff --git a/src/guaclog/state.h b/src/guaclog/state.h
index b476ddeb..c2c18d26 100644
--- a/src/guaclog/state.h
+++ b/src/guaclog/state.h
@@ -20,7 +20,6 @@
 #ifndef GUACLOG_STATE_H
 #define GUACLOG_STATE_H

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

 #include <stdbool.h>
diff --git a/src/libguac/encode-jpeg.h b/src/libguac/encode-jpeg.h
index 05cf2cad..e089aee9 100644
--- a/src/libguac/encode-jpeg.h
+++ b/src/libguac/encode-jpeg.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_ENCODE_JPEG_H
 #define GUAC_ENCODE_JPEG_H

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

diff --git a/src/libguac/encode-png.h b/src/libguac/encode-png.h
index 222c50ef..dd836bf1 100644
--- a/src/libguac/encode-png.h
+++ b/src/libguac/encode-png.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_ENCODE_PNG_H
 #define GUAC_ENCODE_PNG_H

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

diff --git a/src/libguac/encode-webp.h b/src/libguac/encode-webp.h
index 5347f6d9..65ba14b6 100644
--- a/src/libguac/encode-webp.h
+++ b/src/libguac/encode-webp.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_ENCODE_WEBP_H
 #define GUAC_ENCODE_WEBP_H

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

diff --git a/src/libguac/guacamole/tcp.h b/src/libguac/guacamole/tcp.h
index d24e4597..55a6d758 100644
--- a/src/libguac/guacamole/tcp.h
+++ b/src/libguac/guacamole/tcp.h
@@ -26,8 +26,6 @@
  * @file tcp.h
  */

-#include "config.h"
-
 #include <stddef.h>

 /**
diff --git a/src/libguac/raw_encoder.h b/src/libguac/raw_encoder.h
index f67ef565..c3584202 100644
--- a/src/libguac/raw_encoder.h
+++ b/src/libguac/raw_encoder.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_RAW_ENCODER_H
 #define GUAC_RAW_ENCODER_H

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

 /**
diff --git a/src/libguac/user-handlers.h b/src/libguac/user-handlers.h
index 2f3ecbe9..85b8dee8 100644
--- a/src/libguac/user-handlers.h
+++ b/src/libguac/user-handlers.h
@@ -28,8 +28,6 @@
  * @file user-handlers.h
  */

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

diff --git a/src/protocols/kubernetes/argv.h b/src/protocols/kubernetes/argv.h
index e7b862cb..0c464940 100644
--- a/src/protocols/kubernetes/argv.h
+++ b/src/protocols/kubernetes/argv.h
@@ -20,7 +20,6 @@
 #ifndef GUAC_KUBERNETES_ARGV_H
 #define GUAC_KUBERNETES_ARGV_H

-#include "config.h"
 #include "kubernetes.h"

 #include <guacamole/argv.h>
diff --git a/src/protocols/rdp/argv.h b/src/protocols/rdp/argv.h
index 07745228..c321dc6e 100644
--- a/src/protocols/rdp/argv.h
+++ b/src/protocols/rdp/argv.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_RDP_ARGV_H
 #define GUAC_RDP_ARGV_H

-#include "config.h"
-
 #include <guacamole/argv.h>
 #include <guacamole/user.h>

diff --git a/src/protocols/rdp/channels/rail.h b/src/protocols/rdp/channels/rail.h
index 08428713..4f5bcee2 100644
--- a/src/protocols/rdp/channels/rail.h
+++ b/src/protocols/rdp/channels/rail.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_RDP_CHANNELS_RAIL_H
 #define GUAC_RDP_CHANNELS_RAIL_H

-#include "config.h"
-
 #include <freerdp/freerdp.h>
 #include <freerdp/window.h>

diff --git a/src/protocols/rdp/decompose.h b/src/protocols/rdp/decompose.h
index a7ab1465..4fc5f821 100644
--- a/src/protocols/rdp/decompose.h
+++ b/src/protocols/rdp/decompose.h
@@ -20,7 +20,6 @@
 #ifndef GUAC_RDP_DECOMPOSE_H
 #define GUAC_RDP_DECOMPOSE_H

-#include "config.h"
 #include "keyboard.h"

 /**
diff --git a/src/protocols/rdp/gdi.h b/src/protocols/rdp/gdi.h
index c6cfeb62..41dea706 100644
--- a/src/protocols/rdp/gdi.h
+++ b/src/protocols/rdp/gdi.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_RDP_GDI_H
 #define GUAC_RDP_GDI_H

-#include "config.h"
-
 #include <freerdp/freerdp.h>
 #include <guacamole/protocol.h>

diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h
index dc7c264d..065080a3 100644
--- a/src/protocols/rdp/rdp.h
+++ b/src/protocols/rdp/rdp.h
@@ -26,7 +26,6 @@
 #include "channels/rdpei.h"
 #include "common/clipboard.h"
 #include "common/list.h"
-#include "config.h"
 #include "fs.h"
 #include "input.h"
 #include "keyboard.h"
diff --git a/src/protocols/rdp/settings.h b/src/protocols/rdp/settings.h
index 253b7628..f17ec1fb 100644
--- a/src/protocols/rdp/settings.h
+++ b/src/protocols/rdp/settings.h
@@ -20,7 +20,6 @@
 #ifndef GUAC_RDP_SETTINGS_H
 #define GUAC_RDP_SETTINGS_H

-#include "config.h"
 #include "keymap.h"

 #include <freerdp/freerdp.h>
diff --git a/src/protocols/ssh/argv.h b/src/protocols/ssh/argv.h
index 267d49d6..172d6e60 100644
--- a/src/protocols/ssh/argv.h
+++ b/src/protocols/ssh/argv.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_ARGV_H
 #define GUAC_SSH_ARGV_H

-#include "config.h"
-
 #include <guacamole/argv.h>
 #include <guacamole/user.h>

diff --git a/src/protocols/ssh/clipboard.h b/src/protocols/ssh/clipboard.h
index 5c10dcfb..ba055f87 100644
--- a/src/protocols/ssh/clipboard.h
+++ b/src/protocols/ssh/clipboard.h
@@ -20,8 +20,6 @@
 #ifndef _GUAC_SSH_CLIPBOARD_H
 #define _GUAC_SSH_CLIPBOARD_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

diff --git a/src/protocols/ssh/input.h b/src/protocols/ssh/input.h
index f69a768c..d60f38a3 100644
--- a/src/protocols/ssh/input.h
+++ b/src/protocols/ssh/input.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_INPUT_H
 #define GUAC_SSH_INPUT_H

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

 /**
diff --git a/src/protocols/ssh/pipe.h b/src/protocols/ssh/pipe.h
index 1ec9430c..626bae56 100644
--- a/src/protocols/ssh/pipe.h
+++ b/src/protocols/ssh/pipe.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_PIPE_H
 #define GUAC_SSH_PIPE_H

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

 /**
diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h
index 65404618..606177c5 100644
--- a/src/protocols/ssh/settings.h
+++ b/src/protocols/ssh/settings.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_SETTINGS_H
 #define GUAC_SSH_SETTINGS_H

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

 #include <stdbool.h>
diff --git a/src/protocols/ssh/sftp.h b/src/protocols/ssh/sftp.h
index 36c3d1b5..48238881 100644
--- a/src/protocols/ssh/sftp.h
+++ b/src/protocols/ssh/sftp.h
@@ -20,8 +20,6 @@
 #ifndef _SSH_GUAC_SFTP_H
 #define _SSH_GUAC_SFTP_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <guacamole/stream.h>
 #include <guacamole/user.h>
diff --git a/src/protocols/ssh/ssh.h b/src/protocols/ssh/ssh.h
index 1d1aae73..457fc74b 100644
--- a/src/protocols/ssh/ssh.h
+++ b/src/protocols/ssh/ssh.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_H
 #define GUAC_SSH_H

-#include "config.h"
-
 #include "common/clipboard.h"
 #include "common-ssh/sftp.h"
 #include "common-ssh/ssh.h"
diff --git a/src/protocols/ssh/ssh_agent.h b/src/protocols/ssh/ssh_agent.h
index 231711df..c93d80d3 100644
--- a/src/protocols/ssh/ssh_agent.h
+++ b/src/protocols/ssh/ssh_agent.h
@@ -20,8 +20,6 @@
 #ifndef _GUAC_SSH_AGENT_H
 #define _GUAC_SSH_AGENT_H

-#include "config.h"
-
 #include "ssh_key.h"

 /**
diff --git a/src/protocols/ssh/ttymode.h b/src/protocols/ssh/ttymode.h
index 92e081b3..e07e46f1 100644
--- a/src/protocols/ssh/ttymode.h
+++ b/src/protocols/ssh/ttymode.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_TTYMODE_H
 #define GUAC_SSH_TTYMODE_H

-#include "config.h"
-
 #include <stdint.h>

 /**
diff --git a/src/protocols/ssh/user.h b/src/protocols/ssh/user.h
index 8287fed4..47e04e50 100644
--- a/src/protocols/ssh/user.h
+++ b/src/protocols/ssh/user.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_SSH_USER_H
 #define GUAC_SSH_USER_H

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

 /**
diff --git a/src/protocols/telnet/argv.h b/src/protocols/telnet/argv.h
index 3153dddd..04d9b8b0 100644
--- a/src/protocols/telnet/argv.h
+++ b/src/protocols/telnet/argv.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_ARGV_H
 #define GUAC_TELNET_ARGV_H

-#include "config.h"
-
 #include <guacamole/argv.h>
 #include <guacamole/user.h>

diff --git a/src/protocols/telnet/client.h b/src/protocols/telnet/client.h
index 8921a9f4..7ed8e4d0 100644
--- a/src/protocols/telnet/client.h
+++ b/src/protocols/telnet/client.h
@@ -20,7 +20,6 @@
 #ifndef GUAC_TELNET__CLIENT_H
 #define GUAC_TELNET__CLIENT_H

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

 #include <pthread.h>
diff --git a/src/protocols/telnet/clipboard.h b/src/protocols/telnet/clipboard.h
index 9428beda..5516465e 100644
--- a/src/protocols/telnet/clipboard.h
+++ b/src/protocols/telnet/clipboard.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_CLIPBOARD_H
 #define GUAC_TELNET_CLIPBOARD_H

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

 /**
diff --git a/src/protocols/telnet/input.h b/src/protocols/telnet/input.h
index 082f9a17..e155a3ba 100644
--- a/src/protocols/telnet/input.h
+++ b/src/protocols/telnet/input.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_INPUT_H
 #define GUAC_TELNET_INPUT_H

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

 /**
diff --git a/src/protocols/telnet/pipe.h b/src/protocols/telnet/pipe.h
index 1dc52ae5..a27ce3a0 100644
--- a/src/protocols/telnet/pipe.h
+++ b/src/protocols/telnet/pipe.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_PIPE_H
 #define GUAC_TELNET_PIPE_H

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

 /**
diff --git a/src/protocols/telnet/settings.h b/src/protocols/telnet/settings.h
index a28e440f..43432619 100644
--- a/src/protocols/telnet/settings.h
+++ b/src/protocols/telnet/settings.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_SETTINGS_H
 #define GUAC_TELNET_SETTINGS_H

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

 #include <sys/types.h>
diff --git a/src/protocols/telnet/telnet.h b/src/protocols/telnet/telnet.h
index 338f94c8..4ca3778f 100644
--- a/src/protocols/telnet/telnet.h
+++ b/src/protocols/telnet/telnet.h
@@ -20,7 +20,6 @@
 #ifndef GUAC_TELNET_H
 #define GUAC_TELNET_H

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

diff --git a/src/protocols/telnet/user.h b/src/protocols/telnet/user.h
index 910f0cb5..79c4d10b 100644
--- a/src/protocols/telnet/user.h
+++ b/src/protocols/telnet/user.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_TELNET_USER_H
 #define GUAC_TELNET_USER_H

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

 /**
diff --git a/src/protocols/vnc/argv.h b/src/protocols/vnc/argv.h
index 894b58d4..6057013f 100644
--- a/src/protocols/vnc/argv.h
+++ b/src/protocols/vnc/argv.h
@@ -20,8 +20,6 @@
 #ifndef ARGV_H
 #define ARGV_H

-#include "config.h"
-
 #include <guacamole/argv.h>
 #include <guacamole/user.h>

diff --git a/src/protocols/vnc/auth.h b/src/protocols/vnc/auth.h
index 46793b46..977a5b93 100644
--- a/src/protocols/vnc/auth.h
+++ b/src/protocols/vnc/auth.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_AUTH_H
 #define GUAC_VNC_AUTH_H

-#include "config.h"
-
 #include <rfb/rfbclient.h>
 #include <rfb/rfbproto.h>

diff --git a/src/protocols/vnc/clipboard.h b/src/protocols/vnc/clipboard.h
index b7bf493b..fbdd5888 100644
--- a/src/protocols/vnc/clipboard.h
+++ b/src/protocols/vnc/clipboard.h
@@ -20,8 +20,6 @@
 #ifndef _GUAC_VNC_CLIPBOARD_H
 #define _GUAC_VNC_CLIPBOARD_H

-#include "config.h"
-
 #include <guacamole/client.h>
 #include <guacamole/user.h>
 #include <rfb/rfbclient.h>
diff --git a/src/protocols/vnc/cursor.h b/src/protocols/vnc/cursor.h
index 18fe7e3c..5b305cd5 100644
--- a/src/protocols/vnc/cursor.h
+++ b/src/protocols/vnc/cursor.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_CURSOR_H
 #define GUAC_VNC_CURSOR_H

-#include "config.h"
-
 #include <rfb/rfbclient.h>
 #include <rfb/rfbproto.h>

diff --git a/src/protocols/vnc/display.h b/src/protocols/vnc/display.h
index cd7d27b2..4074f3ee 100644
--- a/src/protocols/vnc/display.h
+++ b/src/protocols/vnc/display.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_DISPLAY_H
 #define GUAC_VNC_DISPLAY_H

-#include "config.h"
-
 #include <guacamole/user.h>
 #include <rfb/rfbclient.h>
 #include <rfb/rfbproto.h>
diff --git a/src/protocols/vnc/input.h b/src/protocols/vnc/input.h
index 4bfb9e2d..cce07168 100644
--- a/src/protocols/vnc/input.h
+++ b/src/protocols/vnc/input.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_INPUT_H
 #define GUAC_VNC_INPUT_H

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

 /**
diff --git a/src/protocols/vnc/log.h b/src/protocols/vnc/log.h
index 3f348605..810997b4 100644
--- a/src/protocols/vnc/log.h
+++ b/src/protocols/vnc/log.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_LOG_H
 #define GUAC_VNC_LOG_H

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

diff --git a/src/protocols/vnc/settings.h b/src/protocols/vnc/settings.h
index f433df9b..07c17e8a 100644
--- a/src/protocols/vnc/settings.h
+++ b/src/protocols/vnc/settings.h
@@ -20,8 +20,6 @@
 #ifndef __GUAC_VNC_SETTINGS_H
 #define __GUAC_VNC_SETTINGS_H

-#include "config.h"
-
 #include <stdbool.h>

 /**
diff --git a/src/protocols/vnc/sftp.h b/src/protocols/vnc/sftp.h
index 4ae0b262..420fb0c8 100644
--- a/src/protocols/vnc/sftp.h
+++ b/src/protocols/vnc/sftp.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_SFTP_H
 #define GUAC_VNC_SFTP_H

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

 /**
diff --git a/src/protocols/vnc/user.h b/src/protocols/vnc/user.h
index e74b2a05..b58451ad 100644
--- a/src/protocols/vnc/user.h
+++ b/src/protocols/vnc/user.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_USER_H
 #define GUAC_VNC_USER_H

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

 /**
diff --git a/src/protocols/vnc/vnc.h b/src/protocols/vnc/vnc.h
index dbe857c4..a51b7b50 100644
--- a/src/protocols/vnc/vnc.h
+++ b/src/protocols/vnc/vnc.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_VNC_VNC_H
 #define GUAC_VNC_VNC_H

-#include "config.h"
-
 #include "common/clipboard.h"
 #include "common/iconv.h"
 #include "display.h"
diff --git a/src/pulse/pulse/pulse.h b/src/pulse/pulse/pulse.h
index 952fd80d..90027bf0 100644
--- a/src/pulse/pulse/pulse.h
+++ b/src/pulse/pulse/pulse.h
@@ -20,8 +20,6 @@
 #ifndef GUAC_PULSE_H
 #define GUAC_PULSE_H

-#include "config.h"
-
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
 #include <guacamole/user.h>
diff --git a/src/terminal/terminal/terminal-handlers.h b/src/terminal/terminal/terminal-handlers.h
index b67ffcbd..2f9b547c 100644
--- a/src/terminal/terminal/terminal-handlers.h
+++ b/src/terminal/terminal/terminal-handlers.h
@@ -26,8 +26,6 @@
  * @file terminal-handlers.h
  */

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