Clean up includes, clean up build.

.gitignore

@@ -30,6 +30,8 @@ autom4te.cache/
 m4/*
 !README
 config.guess
+config.h
+config.h.in
 config.log
 config.status
 config.sub
@@ -39,6 +41,7 @@ install-sh
 libtool
 ltmain.sh
 missing
+stamp-h1
 
 # Test binaries
 tests/test_*

configure.ac

@@ -23,10 +23,12 @@
 AC_PREREQ([2.61])
 AC_INIT([guacamole-server], [0.8.3])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_SILENT_RULES([yes])
 
 LT_PREREQ([2.2])
 LT_INIT([dlopen])
 
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Programs
@@ -55,7 +57,8 @@ AC_CHECK_LIB([cairo], [cairo_create], [CAIRO_LIBS=-lcairo],
 
 # libpthread
 AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIBS=-lpthread
-              AC_DEFINE([HAVE_LIBPTHREAD])])
+              AC_DEFINE([HAVE_LIBPTHREAD],,
+                        [Whether libpthread was found])])
 
 # cunit
 AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
@@ -73,11 +76,13 @@ AC_SUBST(CUNIT_LIBS)
 AC_CHECK_FUNCS([clock_gettime gettimeofday memmove memset select strdup nanosleep])
 
 AC_CHECK_DECL([png_get_io_ptr],
-	[AC_DEFINE([HAVE_PNG_GET_IO_PTR])],,
+	[AC_DEFINE([HAVE_PNG_GET_IO_PTR],,
+               [Whether png_get_io_ptr() is defined])],,
 	[#include <png.h>])
 
 AC_CHECK_DECL([cairo_format_stride_for_width],
-	[AC_DEFINE([HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH])],,
+	[AC_DEFINE([HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH],,
+               [Whether cairo_format_stride_for_width() is defined])],,
 	[#include <cairo/cairo.h>])
 
 # Typedefs
@@ -120,7 +125,7 @@ then
    guacd will not support SSL connections.
   --------------------------------------------])
 else
-    AC_DEFINE([ENABLE_SSL])
+    AC_DEFINE([ENABLE_SSL],, [Whether SSL-related support is enabled])
 fi
 
 AC_SUBST(SSL_LIBS)
@@ -147,7 +152,8 @@ then
    Sound will not be encoded with Ogg Vorbis.
   --------------------------------------------])
 else
-    AC_DEFINE([ENABLE_OGG])
+    AC_DEFINE([ENABLE_OGG],,
+              [Whether support for Ogg Vorbis is enabled])
 fi
 
 AC_SUBST(VORBIS_LIBS)
@@ -170,7 +176,7 @@ then
    Sound support for VNC will be disabled
   --------------------------------------------])
 else
-    AC_DEFINE([ENABLE_PULSE])
+    AC_DEFINE([ENABLE_PULSE],, [Whether PulseAudio support is enabled])
 fi
 
 AC_SUBST(PULSE_LIBS)
@@ -215,7 +221,8 @@ then
        Support for VNC repeaters will not be built.
       --------------------------------------------])
     else
-        AC_DEFINE([ENABLE_VNC_REPEATER])
+        AC_DEFINE([ENABLE_VNC_REPEATER],,
+                  [Whether support for VNC repeaters is enabled.])
     fi
 
 fi
@@ -240,7 +247,8 @@ then
        Support for listen-mode connections will not be built.
       --------------------------------------------])
     else
-        AC_DEFINE([ENABLE_VNC_LISTEN])
+        AC_DEFINE([ENABLE_VNC_LISTEN],,
+                  [Whether support for listen-mode VNC connections is enabled.])
     fi
 
 fi
@@ -342,7 +350,8 @@ AC_CHECK_HEADERS([freerdp/client/cliprdr.h],,
                   #include <winpr/collections.h>])
 
 AC_CHECK_DECL([freerdp_register_addin_provider],
-	[AC_DEFINE([HAVE_FREERDP_REGISTER_ADDIN_PROVIDER])],,
+	[AC_DEFINE([HAVE_FREERDP_REGISTER_ADDIN_PROVIDER],,
+               [Whether freerdp_register_addin_provider() is defined])],,
 	[#include <freerdp/addin.h>])
 
 #
@@ -374,7 +383,8 @@ AC_CHECK_HEADER(winpr/wtypes.h,,
 
 if test "x${have_winpr}" = "xyes"
 then
-    AC_DEFINE([ENABLE_WINPR])
+    AC_DEFINE([ENABLE_WINPR],,
+              [Whether library support for WinPR types was found])
 fi
 
 #
@@ -396,7 +406,8 @@ fi
 
 # Set defines based on interface type, warn if unknown
 if test "x${freerdp_interface}" = "xlegacy"; then
-    AC_DEFINE([LEGACY_FREERDP])
+    AC_DEFINE([LEGACY_FREERDP],,
+              [Whether the older version of the FreeRDP API was found])
 elif test "x${freerdp_interface}" = "xunknown"; then
     AC_MSG_WARN([
   --------------------------------------------
@@ -431,7 +442,8 @@ fi
 
 # Set defines based on interface type, warn if unknown
 if test "x${rdpsettings_interface}" = "xlegacy"; then
-    AC_DEFINE([LEGACY_RDPSETTINGS])
+    AC_DEFINE([LEGACY_RDPSETTINGS],,
+              [Whether the legacy version of the rdpSettings API was found])
 
     # Legacy interface may not have FastPath settings
     AC_CHECK_MEMBERS([rdpSettings.fast_path_input,
@@ -450,7 +462,8 @@ fi
 
 # Activate FastPath settings if present
 if test "x${rdpsettings_fastpath}" = "xyes"; then
-    AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH])
+    AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH],,
+              [Whether the rdpSettings structure has FastPath settings])
 fi
 
 #
@@ -472,7 +485,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <winpr/wtypes.h>
                                     rdpBitmap b = { .Decompress = __decompress };]])],
                   [AC_MSG_RESULT([yes])],
                   [AC_MSG_RESULT([no])
-                   AC_DEFINE([LEGACY_RDPBITMAP])])
+                   AC_DEFINE([LEGACY_RDPBITMAP],,
+                             [Whether the legacy rdpBitmap API was found])])
 
 #
 # FreeRDP: rdpPalette
@@ -484,7 +498,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <freerdp/update.h>
                                     PALETTE_ENTRY* foo = p.entries;]])],
                   [AC_MSG_RESULT([yes])],
                   [AC_MSG_RESULT([no])
-                   AC_DEFINE([LEGACY_RDPPALETTE])])
+                   AC_DEFINE([LEGACY_RDPPALETTE],,
+                             [Whether the legacy rdpPalette API was found])])
 
 #
 # FreeRDP: rdpPointer
@@ -515,7 +530,8 @@ fi
 
 # Set defines based on interface type, warn if unknown
 if test "x${event_interface}" = "xlegacy"; then
-    AC_DEFINE([LEGACY_EVENT])
+    AC_DEFINE([LEGACY_EVENT],,
+              [Whether the legacy RDP_EVENT API was found])
 elif test "x${event_interface}" = "xunknown"; then
     AC_MSG_WARN([
   --------------------------------------------
@@ -574,7 +590,8 @@ then
            in libssh2.
           --------------------------------------------])
         else
-            AC_DEFINE([ENABLE_SSH_AGENT])
+            AC_DEFINE([ENABLE_SSH_AGENT],,
+                      [Whether agent forwarding support for SSH is enabled])
         fi
     fi
 

src/guacd/client.c

@@ -20,20 +20,21 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <time.h>
-#include <pthread.h>
-
-#include <guacamole/socket.h>
-#include <guacamole/client.h>
-#include <guacamole/error.h>
-#include <guacamole/protocol.h>
-#include <guacamole/timestamp.h>
+#include "config.h"
 
 #include "client.h"
 #include "log.h"
 
+#include <pthread.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include <guacamole/client.h>
+#include <guacamole/error.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+#include <guacamole/timestamp.h>
+
 /**
  * Sleep for the given number of milliseconds.
  *

src/guacd/client.h

@@ -24,6 +24,10 @@
 #ifndef _GUACD_CLIENT_H
 #define _GUACD_CLIENT_H
 
+#include "config.h"
+
+#include <guacamole/client.h>
+
 /**
  * The time to allow between sync responses in milliseconds. If a sync
  * instruction is sent to the client and no response is received within this

src/guacd/daemon.c

@@ -20,29 +20,26 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "log.h"
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <ctype.h>
-
-#include <sys/socket.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
 #include <netdb.h>
 #include <netinet/in.h>
-
-#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
-#include <libgen.h>
-
-#ifdef ENABLE_SSL
-#include <openssl/ssl.h>
-#include "socket-ssl.h"
-#endif
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <guacamole/client.h>
 #include <guacamole/error.h>
@@ -50,8 +47,10 @@
 #include <guacamole/plugin.h>
 #include <guacamole/protocol.h>
 
-#include "client.h"
-#include "log.h"
+#ifdef ENABLE_SSL
+#include <openssl/ssl.h>
+#include "socket-ssl.h"
+#endif
 
 #define GUACD_DEV_NULL "/dev/null"
 #define GUACD_ROOT     "/"

src/guacd/log.c

@@ -20,11 +20,12 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include <errno.h>
-#include <syslog.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <syslog.h>
 #include <sys/types.h>
 #include <unistd.h>
 

src/guacd/log.h

@@ -24,6 +24,8 @@
 #ifndef __GUACD_LOG_H
 #define __GUACD_LOG_H
 
+#include "config.h"
+
 #include <guacamole/client.h>
 
 extern char log_prefix[64];

src/guacd/socket-ssl.c

@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "socket-ssl.h"
 
 #include <stdlib.h>
 #include <sys/select.h>
 
-#include <openssl/ssl.h>
-
-#include <guacamole/socket.h>
 #include <guacamole/error.h>
-
-#include "socket-ssl.h"
+#include <guacamole/socket.h>
+#include <openssl/ssl.h>
 
 static ssize_t __guac_socket_ssl_read_handler(guac_socket* socket,
         void* buf, size_t count) {

src/guacd/socket-ssl.h

@@ -24,8 +24,10 @@
 #ifndef __GUACD_SOCKET_SSL_H
 #define __GUACD_SOCKET_SSL_H
 
-#include <openssl/ssl.h>
+#include "config.h"
+
 #include <guacamole/socket.h>
+#include <openssl/ssl.h>
 
 /**
  * SSL socket-specific data.

src/libguac/audio.c

@@ -20,21 +20,23 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
+#include "wav_encoder.h"
+
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-#include <guacamole/protocol.h>
-#include <guacamole/client.h>
-#include <guacamole/stream.h>
+
 #include <guacamole/audio.h>
+#include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <guacamole/stream.h>
 
 #ifdef ENABLE_OGG
 #include "ogg_encoder.h"
 #endif
 
-#include "wav_encoder.h"
-
 guac_audio_stream* guac_audio_stream_alloc(guac_client* client, guac_audio_encoder* encoder) {
 
     guac_audio_stream* audio;

src/libguac/client-handlers.c

@@ -20,13 +20,14 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <stdio.h>
+#include "config.h"
 
 #include "client.h"
-#include "protocol.h"
 #include "client-handlers.h"
+#include "protocol.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 
 /* Guacamole instruction handler map */
 

src/libguac/client-handlers.h

@@ -24,9 +24,6 @@
 #ifndef _GUAC_CLIENT_HANDLERS__H
 #define _GUAC_CLIENT_HANDLERS__H
 
-#include "client.h"
-#include "instruction.h"
-
 /**
  * Provides initial handler functions and a lookup structure for automatically
  * handling client instructions. This is used only internally within libguac,
@@ -35,6 +32,11 @@
  * @file client-handlers.h
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "instruction.h"
+
 /**
  * Internal handler for Guacamole instructions.
  */

src/libguac/client.c

@@ -20,10 +20,7 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "config.h"
 
 #include "client.h"
 #include "client-handlers.h"
@@ -35,6 +32,10 @@
 #include "socket.h"
 #include "time.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 guac_layer __GUAC_DEFAULT_LAYER = {
     .index = 0
 };

src/libguac/error.c

@@ -20,17 +20,18 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "error.h"
 
-#include <stdlib.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef HAVE_LIBPTHREAD
 #include <pthread.h>
 #endif
 
-#include "error.h"
-
 /* Error strings */
 
 const char* __GUAC_STATUS_SUCCESS_STR        = "Success";

src/libguac/guacamole/audio.h

@@ -24,15 +24,15 @@
 #ifndef __GUAC_AUDIO_H
 #define __GUAC_AUDIO_H
 
-#include <guacamole/client.h>
-#include <guacamole/stream.h>
-
 /**
  * Provides functions and structures used for providing simple streaming audio.
  *
  * @file audio.h
  */
 
+#include <guacamole/client.h>
+#include <guacamole/stream.h>
+
 typedef struct guac_audio_stream guac_audio_stream;
 
 /**

src/libguac/guacamole/client.h

@@ -24,7 +24,11 @@
 #ifndef _GUAC_CLIENT_H
 #define _GUAC_CLIENT_H
 
-#include <stdarg.h>
+/**
+ * Provides functions and structures required for defining (and handling) a proxy client.
+ *
+ * @file client.h
+ */
 
 #include "instruction.h"
 #include "layer.h"
@@ -34,11 +38,7 @@
 #include "stream.h"
 #include "timestamp.h"
 
-/**
- * Provides functions and structures required for defining (and handling) a proxy client.
- *
- * @file client.h
- */
+#include <stdarg.h>
 
 /**
  * The maximum number of inbound streams supported by any one guac_client.

src/libguac/guacamole/hash.h

@@ -24,8 +24,6 @@
 #ifndef _GUAC_HASH_H
 #define _GUAC_HASH_H
 
-#include <cairo/cairo.h>
-
 /**
  * Provides functions and structures for producing likely-to-be-unique hash
  * values for images.
@@ -33,6 +31,8 @@
  * @file hash.h
  */
 
+#include <cairo/cairo.h>
+
 /**
  * Produces a 24-bit hash value from all pixels of the given surface. The
  * surface provided must be RGB or ARGB with each pixel stored in 32 bits.

src/libguac/guacamole/instruction.h

@@ -24,8 +24,6 @@
 #ifndef _GUAC_INSTRUCTION_H
 #define _GUAC_INSTRUCTION_H
 
-#include "socket.h"
-
 /**
  * Provides functions and structures for reading, writing, and manipulating
  * Guacamole instructions.
@@ -33,6 +31,8 @@
  * @file instruction.h
  */
 
+#include "socket.h"
+
 /**
  * The maximum number of characters per instruction.
  */

src/libguac/guacamole/protocol.h

@@ -24,13 +24,6 @@
 #ifndef _GUAC_PROTOCOL_H
 #define _GUAC_PROTOCOL_H
 
-#include <cairo/cairo.h>
-
-#include "layer.h"
-#include "socket.h"
-#include "stream.h"
-#include "timestamp.h"
-
 /**
  * Provides functions and structures required for communicating using the
  * Guacamole protocol over a guac_socket connection, such as that provided by
@@ -39,6 +32,13 @@
  * @file protocol.h
  */
 
+#include "layer.h"
+#include "socket.h"
+#include "stream.h"
+#include "timestamp.h"
+
+#include <cairo/cairo.h>
+
 /**
  * Set of all possible status codes returned by protocol operations. These
  * codes relate to Guacamole server/client communication, and not to internal

src/libguac/guacamole/socket.h

@@ -24,18 +24,18 @@
 #ifndef _GUAC_SOCKET_H
 #define _GUAC_SOCKET_H
 
-#include <pthread.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#include "timestamp.h"
-
 /**
  * Defines the guac_socket object and functionss for using and manipulating it.
  *
  * @file socket.h
  */
 
+#include "timestamp.h"
+
+#include <pthread.h>
+#include <stdint.h>
+#include <unistd.h>
+
 /**
  * The number of bytes to buffer within each socket before flushing.
  */

src/libguac/guacamole/timestamp.h

@@ -24,14 +24,14 @@
 #ifndef _GUAC_TIME_H
 #define _GUAC_TIME_H
 
-#include <stdint.h>
-
 /**
  * Provides functions and structures for creating timestamps.
  *
  * @file timestamp.h
  */
 
+#include <stdint.h>
+
 /**
  * An arbitrary timestamp denoting a relative time value in milliseconds.
  */

src/libguac/guacamole/unicode.h

@@ -24,14 +24,14 @@
 #ifndef _GUAC_UNICODE_H
 #define _GUAC_UNICODE_H
 
-#include <stddef.h>
-
 /**
  * Provides functions for manipulating Unicode strings.
  *
  * @file unicode.h
  */
 
+#include <stddef.h>
+
 /**
  * Given the initial byte of a single UTF-8 character, returns the overall
  * byte size of the entire character.

src/libguac/hash.c

@@ -20,9 +20,11 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include <stdint.h>
 #include <string.h>
+
 #include <cairo/cairo.h>
 
 /*

src/libguac/instruction.c

@@ -20,10 +20,7 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include "config.h"
 
 #include "error.h"
 #include "instruction.h"
@@ -31,6 +28,10 @@
 #include "socket.h"
 #include "unicode.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 guac_instruction* guac_instruction_alloc() {
 
     /* Allocate space for instruction */

src/libguac/ogg_encoder.c

@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "ogg_encoder.h"
 
 #include <stdlib.h>
 
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
-
 #include <vorbis/vorbisenc.h>
 
-#include "ogg_encoder.h"
-
 void ogg_encoder_begin_handler(guac_audio_stream* audio) {
 
     /* Allocate stream state */

src/libguac/ogg_encoder.h

@@ -24,8 +24,9 @@
 #ifndef __GUAC_OGG_ENCODER_H
 #define __GUAC_OGG_ENCODER_H
 
-#include <guacamole/audio.h>
+#include "config.h"
 
+#include <guacamole/audio.h>
 #include <vorbis/vorbisenc.h>
 
 typedef struct ogg_encoder_state {

src/libguac/palette.c

@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include <cairo/cairo.h>
-
-#include <sys/types.h>
+#include "config.h"
 
 #include "palette.h"
 
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cairo/cairo.h>
+#include <sys/types.h>
+
 guac_palette* guac_palette_alloc(cairo_surface_t* surface) {
 
     int x, y;

src/libguac/palette.h

@@ -24,8 +24,8 @@
 #ifndef __GUAC_PALETTE_H
 #define __GUAC_PALETTE_H
 
-#include <png.h>
 #include <cairo/cairo.h>
+#include <png.h>
 
 typedef struct guac_palette_entry {
 

src/libguac/plugin.c

@@ -20,11 +20,7 @@
  * THE SOFTWARE.
  */
 
-
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "config.h"
 
 #include "client.h"
 #include "client-handlers.h"
@@ -34,6 +30,11 @@
 #include "socket.h"
 #include "time.h"
 
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 guac_client_plugin* guac_client_plugin_open(const char* protocol) {
 
     guac_client_plugin* plugin;

src/libguac/pool.c

@@ -20,12 +20,13 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "pool.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "pool.h"
-
 guac_pool* guac_pool_alloc(int size) {
 
     guac_pool* pool = malloc(sizeof(guac_pool));

src/libguac/protocol.c

@@ -20,23 +20,7 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef HAVE_PNGSTRUCT_H
-#include <pngstruct.h>
-#endif
-
-#include <png.h>
-
-#include <cairo/cairo.h>
-
-#include <sys/types.h>
+#include "config.h"
 
 #include "error.h"
 #include "layer.h"
@@ -45,6 +29,21 @@
 #include "socket.h"
 #include "unicode.h"
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <png.h>
+#include <cairo/cairo.h>
+
+#ifdef HAVE_PNGSTRUCT_H
+#include <pngstruct.h>
+#endif
+
 /* Output formatting functions */
 
 ssize_t __guac_socket_write_length_string(guac_socket* socket, const char* str) {

src/libguac/socket-fd.c

@@ -20,14 +20,20 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
+#include "error.h"
+#include "socket.h"
+
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
 
 #ifdef __MINGW32__
 #include <winsock2.h>
@@ -35,12 +41,6 @@
 #include <sys/select.h>
 #endif
 
-#include <time.h>
-#include <sys/time.h>
-
-#include "socket.h"
-#include "error.h"
-
 typedef struct __guac_socket_fd_data {
 
     int fd;

src/libguac/socket-nest.c

@@ -20,14 +20,22 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
+#include "error.h"
+#include "protocol.h"
+#include "socket.h"
+#include "unicode.h"
+
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
 
 #ifdef __MINGW32__
 #include <winsock2.h>
@@ -35,14 +43,6 @@
 #include <sys/select.h>
 #endif
 
-#include <time.h>
-#include <sys/time.h>
-
-#include "socket.h"
-#include "protocol.h"
-#include "error.h"
-#include "unicode.h"
-
 #define GUAC_SOCKET_NEST_BUFFER_SIZE 8192
 
 typedef struct __guac_socket_nest_data {

src/libguac/socket.c

@@ -20,6 +20,12 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "error.h"
+#include "protocol.h"
+#include "socket.h"
+#include "timestamp.h"
 
 #include <fcntl.h>
 #include <inttypes.h>
@@ -28,6 +34,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
 
 #ifdef __MINGW32__
@@ -36,14 +44,6 @@
 #include <sys/select.h>
 #endif
 
-#include <time.h>
-#include <sys/time.h>
-
-#include "socket.h"
-#include "protocol.h"
-#include "timestamp.h"
-#include "error.h"
-
 char __guac_socket_BASE64_CHARACTERS[64] = {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
     'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',

src/libguac/timestamp.c

@@ -20,16 +20,17 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
-#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
-#include <time.h>
-#endif
+#include "timestamp.h"
 
 #ifndef HAVE_CLOCK_GETTIME
 #include <sys/time.h>
 #endif
 
-#include "timestamp.h"
+#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
+#include <time.h>
+#endif
 
 guac_timestamp guac_timestamp_current() {
 

src/libguac/unicode.c

@@ -20,11 +20,12 @@
  * THE SOFTWARE.
  */
 
-
-#include <stddef.h>
+#include "config.h"
 
 #include "unicode.h"
 
+#include <stddef.h>
+
 size_t guac_utf8_charsize(unsigned char c) {
 
     /* Determine size in bytes of character */

src/libguac/wav_encoder.c

@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
-#define WAV_BUFFER_SIZE 0x4000
+#include "wav_encoder.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -30,7 +31,7 @@
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 
-#include "wav_encoder.h"
+#define WAV_BUFFER_SIZE 0x4000
 
 void wav_encoder_begin_handler(guac_audio_stream* audio) {
 

src/libguac/wav_encoder.h

@@ -24,6 +24,8 @@
 #ifndef __GUAC_WAV_ENCODER_H
 #define __GUAC_WAV_ENCODER_H
 
+#include "config.h"
+
 #include <guacamole/audio.h>
 
 typedef struct wav_encoder_riff_header {

src/protocols/rdp/Makefile.am

@@ -75,7 +75,6 @@ noinst_HEADERS =                             \
 	guac_rdpsnd/rdpsnd_messages.h            \
 	guac_rdpsnd/rdpsnd_service.h             \
 	client.h                                 \
-	config.h                                 \
 	debug.h                                  \
 	default_pointer.h                        \
 	guac_handlers.h                          \

src/protocols/rdp/client.c

@@ -20,34 +20,40 @@
  * THE SOFTWARE.
  */
 
-
 #define _XOPEN_SOURCE 500
 
+#include "config.h"
+
+#include "client.h"
+#include "default_pointer.h"
+#include "guac_handlers.h"
+#include "rdp_bitmap.h"
+#include "rdp_gdi.h"
+#include "rdp_glyph.h"
+#include "rdp_keymap.h"
+#include "rdp_pointer.h"
+
+#include <errno.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-
 #include <sys/select.h>
-#include <errno.h>
 
-#include <freerdp/freerdp.h>
 #include <freerdp/cache/bitmap.h>
 #include <freerdp/cache/brush.h>
 #include <freerdp/cache/glyph.h>
+#include <freerdp/cache/offscreen.h>
 #include <freerdp/cache/palette.h>
 #include <freerdp/cache/pointer.h>
-#include <freerdp/cache/offscreen.h>
 #include <freerdp/channels/channels.h>
-#include <freerdp/input.h>
 #include <freerdp/constants.h>
-
-#ifdef HAVE_FREERDP_CLIENT_CHANNELS_H
-#include <freerdp/client/channels.h>
-#endif
-
-#ifdef HAVE_FREERDP_ADDIN_H
-#include <freerdp/addin.h>
-#endif
+#include <freerdp/freerdp.h>
+#include <freerdp/input.h>
+#include <guacamole/audio.h>
+#include <guacamole/client.h>
+#include <guacamole/error.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -55,20 +61,13 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
-#include <guacamole/client.h>
-#include <guacamole/audio.h>
-#include <guacamole/error.h>
+#ifdef HAVE_FREERDP_ADDIN_H
+#include <freerdp/addin.h>
+#endif
 
-#include "client.h"
-#include "guac_handlers.h"
-#include "rdp_keymap.h"
-#include "rdp_bitmap.h"
-#include "rdp_glyph.h"
-#include "rdp_pointer.h"
-#include "rdp_gdi.h"
-#include "default_pointer.h"
+#ifdef HAVE_FREERDP_CLIENT_CHANNELS_H
+#include <freerdp/client/channels.h>
+#endif
 
 /* Client plugin arguments */
 const char* GUAC_CLIENT_ARGS[] = {

src/protocols/rdp/client.h

@@ -24,20 +24,20 @@
 #ifndef _GUAC_RDP_CLIENT_H
 #define _GUAC_RDP_CLIENT_H
 
-#include <pthread.h>
-
-#include <cairo/cairo.h>
-
-#include <freerdp/freerdp.h>
-#include <freerdp/codec/color.h>
-
-#include <guacamole/client.h>
-#include <guacamole/audio.h>
+#include "config.h"
 
 #include "rdp_fs.h"
 #include "rdp_keymap.h"
 #include "rdp_settings.h"
 
+#include <pthread.h>
+
+#include <cairo/cairo.h>
+#include <freerdp/freerdp.h>
+#include <freerdp/codec/color.h>
+#include <guacamole/audio.h>
+#include <guacamole/client.h>
+
 /**
  * The maximum duration of a frame in milliseconds.
  */

src/protocols/rdp/compat/client-cliprdr.h

@@ -24,6 +24,8 @@
 #ifndef __GUAC_CLIENT_CLIPRDR_COMPAT_H
 #define __GUAC_CLIENT_CLIPRDR_COMPAT_H
 
+#include "config.h"
+
 #include <freerdp/plugins/cliprdr.h>
 
 #define CliprdrChannel_Class        RDP_EVENT_CLASS_CLIPRDR

src/protocols/rdp/compat/winpr-stream.c

@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include "winpr-stream.h"
 

src/protocols/rdp/compat/winpr-stream.h

@@ -24,9 +24,12 @@
 #ifndef __GUAC_WINPR_STREAM_COMPAT_H
 #define __GUAC_WINPR_STREAM_COMPAT_H
 
-#include <freerdp/utils/stream.h>
+#include "config.h"
+
 #include "winpr-wtypes.h"
 
+#include <freerdp/utils/stream.h>
+
 /* FreeRDP 1.0 streams */
 
 #define Stream_Write                   stream_write

src/protocols/rdp/compat/winpr-wtypes.h

@@ -24,6 +24,8 @@
 #ifndef __GUAC_WINPR_WTYPES_COMPAT_H
 #define __GUAC_WINPR_WTYPES_COMPAT_H
 
+#include "config.h"
+
 #include <freerdp/types.h>
 
 typedef uint8   BYTE;

src/protocols/rdp/config.h

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2013 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-

src/protocols/rdp/debug.h

@@ -24,6 +24,8 @@
 #ifndef __GUAC_RDP_DEBUG_H
 #define __GUAC_RDP_DEBUG_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 /* Ensure GUAC_RDP_DEBUG_LEVEL is defined to a constant */

src/protocols/rdp/default_pointer.c

@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/protocols/rdp/default_pointer.h

@@ -24,6 +24,8 @@
 #ifndef _GUAC_RDP_DEFAULT_POINTER_H
 #define _GUAC_RDP_DEFAULT_POINTER_H
 
+#include "config.h"
+
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 

src/protocols/rdp/guac_handlers.c

@@ -20,26 +20,29 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
+#include "client.h"
+#include "guac_handlers.h"
+#include "rdp_cliprdr.h"
+#include "rdp_keymap.h"
+
+#include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <sys/select.h>
-#include <errno.h>
 
-#include <freerdp/freerdp.h>
-#include <freerdp/channels/channels.h>
-#include <freerdp/input.h>
-#include <freerdp/codec/color.h>
 #include <freerdp/cache/cache.h>
+#include <freerdp/channels/channels.h>
+#include <freerdp/codec/color.h>
+#include <freerdp/freerdp.h>
+#include <freerdp/input.h>
 #include <freerdp/utils/event.h>
-
-#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
-#include <freerdp/client/cliprdr.h>
-#else
-#include "compat/client-cliprdr.h"
-#endif
+#include <guacamole/client.h>
+#include <guacamole/error.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -47,15 +50,11 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
-#include <guacamole/client.h>
-#include <guacamole/error.h>
-
-#include "client.h"
-#include "rdp_keymap.h"
-#include "rdp_cliprdr.h"
-#include "guac_handlers.h"
+#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
+#include <freerdp/client/cliprdr.h>
+#else
+#include "compat/client-cliprdr.h"
+#endif
 
 void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to);
 int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);

src/protocols/rdp/guac_handlers.h

@@ -24,6 +24,8 @@
 #ifndef _GUAC_RDP_GUAC_HANDLERS_H
 #define _GUAC_RDP_GUAC_HANDLERS_H
 
+#include "config.h"
+
 #include <guacamole/client.h>
 #include <guacamole/stream.h>
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c

@@ -20,6 +20,25 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "debug.h"
+#include "rdpdr_fs_messages_dir_info.h"
+#include "rdpdr_fs_messages_file_info.h"
+#include "rdpdr_fs_messages.h"
+#include "rdpdr_fs_messages_vol_info.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_service.h"
+#include "rdp_fs.h"
+#include "rdp_status.h"
+#include "unicode.h"
+
+#include <inttypes.h>
+#include <errno.h>
+
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/pool.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -27,24 +46,6 @@
 #include "compat/winpr-stream.h"
 #endif
 
-#include <inttypes.h>
-#include <guacamole/pool.h>
-#include <errno.h>
-
-#include "rdp_fs.h"
-#include "rdp_status.h"
-#include "rdpdr_fs_messages.h"
-#include "rdpdr_fs_messages_vol_info.h"
-#include "rdpdr_fs_messages_file_info.h"
-#include "rdpdr_fs_messages_dir_info.h"
-#include "rdpdr_messages.h"
-#include "rdpdr_service.h"
-#include "client.h"
-#include "debug.h"
-#include "unicode.h"
-
-#include <freerdp/utils/svc_plugin.h>
-
 void guac_rdpdr_fs_process_create(guac_rdpdr_device* device,
         wStream* input_stream, int completion_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h

@@ -32,16 +32,18 @@
  * @file rdpdr_fs_messages.h
  */
 
+#include "config.h"
+
+#include "rdpdr_service.h"
+
+#include <guacamole/pool.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <guacamole/pool.h>
-
-#include "rdpdr_service.h"
-
 /**
  * Handles a Server Create Drive Request. Despite its name, this request opens
  * a file.

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c

@@ -20,6 +20,16 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "debug.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_service.h"
+#include "rdp_fs.h"
+#include "rdp_status.h"
+#include "unicode.h"
+
+#include <guacamole/unicode.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -27,15 +37,6 @@
 #include "compat/winpr-stream.h"
 #endif
 
-#include <guacamole/unicode.h>
-
-#include "rdpdr_service.h"
-#include "rdpdr_messages.h"
-#include "rdp_fs.h"
-#include "rdp_status.h"
-#include "debug.h"
-#include "unicode.h"
-
 void guac_rdpdr_fs_process_query_directory_info(guac_rdpdr_device* device,
         const char* entry_name, int file_id, int completion_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.h

@@ -32,14 +32,16 @@
  * @file rdpdr_fs_messages_dir_info.h
  */
 
+#include "config.h"
+
+#include "rdpdr_service.h"
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include "rdpdr_service.h"
-
 /**
  * Processes a query request for FileDirectoryInformation. From the
  * documentation this is "defined as the file's name, time stamp, and size, or its

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c

@@ -20,6 +20,20 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "debug.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_service.h"
+#include "rdp_fs.h"
+#include "rdp_status.h"
+#include "unicode.h"
+
+#include <inttypes.h>
+
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/pool.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -27,19 +41,6 @@
 #include "compat/winpr-stream.h"
 #endif
 
-#include <inttypes.h>
-#include <guacamole/pool.h>
-
-#include "rdpdr_messages.h"
-#include "rdp_fs.h"
-#include "rdp_status.h"
-#include "rdpdr_service.h"
-#include "client.h"
-#include "debug.h"
-#include "unicode.h"
-
-#include <freerdp/utils/svc_plugin.h>
-
 void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream,
         int file_id, int completion_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h

@@ -31,14 +31,16 @@
  * @file rdpdr_fs_messages_file_info.h
  */
 
+#include "config.h"
+
+#include "rdpdr_service.h"
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include "rdpdr_service.h"
-
 /**
  * Processes a query for FileBasicInformation. From the documentation, this is
  * "used to query a file for the times of creation, last access, last write,

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c

@@ -20,6 +20,18 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "debug.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_service.h"
+#include "rdp_fs.h"
+#include "rdp_status.h"
+#include "unicode.h"
+
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/pool.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -27,18 +39,6 @@
 #include "compat/winpr-stream.h"
 #endif
 
-#include <guacamole/pool.h>
-
-#include "rdpdr_messages.h"
-#include "rdp_fs.h"
-#include "rdp_status.h"
-#include "rdpdr_service.h"
-#include "client.h"
-#include "debug.h"
-#include "unicode.h"
-
-#include <freerdp/utils/svc_plugin.h>
-
 void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device,
         wStream* input_stream, int file_id, int completion_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h

@@ -32,14 +32,16 @@
  * @file rdpdr_fs_messages_vol_info.h
  */
 
+#include "config.h"
+
+#include "rdpdr_service.h"
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include "rdpdr_service.h"
-
 /**
  * Processes a query request for FileFsVolumeInformation. According to the
  * documentation, this is "used to query information for a volume on which a

src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c

@@ -21,23 +21,24 @@
  */
 
 
+#include "config.h"
+
+#include "client.h"
+#include "rdpdr_fs_messages.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_service.h"
+#include "rdp_fs.h"
+#include "unicode.h"
+
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/pool.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <guacamole/pool.h>
-
-#include "rdp_fs.h"
-#include "rdpdr_fs_messages.h"
-#include "rdpdr_messages.h"
-#include "rdpdr_service.h"
-#include "client.h"
-#include "unicode.h"
-
-#include <freerdp/utils/svc_plugin.h>
-
 static void guac_rdpdr_device_fs_announce_handler(guac_rdpdr_device* device,
         wStream* output_stream, int device_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.h

@@ -35,10 +35,12 @@
  * @file rdpdr_fs.h 
  */
 
-#include <guacamole/pool.h>
+#include "config.h"
 
 #include "rdpdr_service.h"
 
+#include <guacamole/pool.h>
+
 /**
  * Registers a new filesystem device within the RDPDR plugin. This must be done
  * before RDPDR connection finishes.

src/protocols/rdp/guac_rdpdr/rdpdr_messages.c

@@ -20,12 +20,20 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_printer.h"
+#include "rdpdr_service.h"
 
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -35,13 +43,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-
-#include "rdpdr_service.h"
-#include "rdpdr_messages.h"
-#include "rdpdr_printer.h"
-#include "client.h"
-
 static void guac_rdpdr_send_client_announce_reply(guac_rdpdrPlugin* rdpdr,
         unsigned int major, unsigned int minor, unsigned int client_id) {
 

src/protocols/rdp/guac_rdpdr/rdpdr_messages.h

@@ -24,14 +24,16 @@
 #ifndef __GUAC_RDPDR_MESSAGES_H
 #define __GUAC_RDPDR_MESSAGES_H
 
+#include "config.h"
+
+#include "rdpdr_service.h"
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include "rdpdr_service.h"
-
 /**
  * Identifies the "core" component of RDPDR as the destination of the received
  * packet.

src/protocols/rdp/guac_rdpdr/rdpdr_printer.c

@@ -20,24 +20,25 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_printer.h"
+#include "rdpdr_service.h"
+#include "rdp_status.h"
+
 #include <errno.h>
 
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/protocol.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <freerdp/utils/svc_plugin.h>
-
-#include <guacamole/protocol.h>
-
-#include "rdp_status.h"
-#include "rdpdr_messages.h"
-#include "rdpdr_printer.h"
-#include "rdpdr_service.h"
-#include "client.h"
-
 /* Command to run GhostScript safely as a filter writing PDF */
 char* const guac_rdpdr_pdf_filter_command[] = {
     "gs",

src/protocols/rdp/guac_rdpdr/rdpdr_printer.h

@@ -24,14 +24,16 @@
 #ifndef __GUAC_RDPDR_PRINTER_H
 #define __GUAC_RDPDR_PRINTER_H
 
+#include "config.h"
+
+#include <freerdp/utils/svc_plugin.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <freerdp/utils/svc_plugin.h>
-
 /**
  * Data specific to an instance of the printer device.
  */

src/protocols/rdp/guac_rdpdr/rdpdr_service.c

@@ -20,12 +20,21 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "debug.h"
+#include "rdpdr_fs_service.h"
+#include "rdpdr_messages.h"
+#include "rdpdr_printer.h"
+#include "rdpdr_service.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -35,16 +44,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-
-#include "rdpdr_service.h"
-#include "rdpdr_messages.h"
-#include "rdpdr_printer.h"
-#include "rdpdr_fs_service.h"
-
-#include "client.h"
-#include "debug.h"
-
 /**
  * Entry point for RDPDR virtual channel.
  */

src/protocols/rdp/guac_rdpdr/rdpdr_service.h

@@ -24,17 +24,19 @@
 #ifndef __GUAC_RDPDR_SERVICE_H
 #define __GUAC_RDPDR_SERVICE_H
 
+#include "config.h"
+
 #include <pthread.h>
 
+#include <freerdp/utils/svc_plugin.h>
+#include <guacamole/client.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <guacamole/client.h>
-#include <freerdp/utils/svc_plugin.h>
-
 /**
  * The maximum number of bytes to allow for a device read.
  */

src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c

@@ -20,12 +20,20 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdpsnd_messages.h"
+#include "rdpsnd_service.h"
 
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
+#include <guacamole/audio.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -35,13 +43,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/audio.h>
-#include <guacamole/client.h>
-
-#include "rdpsnd_service.h"
-#include "rdpsnd_messages.h"
-#include "client.h"
-
 /* MESSAGE HANDLERS */
 
 void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd,

src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h

@@ -24,6 +24,10 @@
 #ifndef __GUAC_RDPSND_MESSAGES_H
 #define __GUAC_RDPSND_MESSAGES_H
 
+#include "config.h"
+
+#include "rdpsnd_service.h"
+
 #include <guacamole/audio.h>
 
 /*

src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c

@@ -20,6 +20,10 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "rdpsnd_service.h"
+#include "rdpsnd_messages.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -27,6 +31,8 @@
 #include <freerdp/constants.h>
 #include <freerdp/types.h>
 #include <freerdp/utils/svc_plugin.h>
+#include <guacamole/audio.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -36,12 +42,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-#include <guacamole/audio.h>
-
-#include "rdpsnd_service.h"
-#include "rdpsnd_messages.h"
-
 /**
  * Entry point for RDPSND virtual channel.
  */

src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h

@@ -24,8 +24,17 @@
 #ifndef __GUAC_RDPSND_SERVICE_H
 #define __GUAC_RDPSND_SERVICE_H
 
+#include "config.h"
+
+#include <freerdp/utils/svc_plugin.h>
 #include <guacamole/audio.h>
 
+#ifdef ENABLE_WINPR
+#include <winpr/stream.h>
+#else
+#include "compat/winpr-stream.h"
+#endif
+
 /**
  * The maximum number of PCM formats to accept during the initial RDPSND
  * handshake with the RDP server.

src/protocols/rdp/rdp_bitmap.c

@@ -20,20 +20,22 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
+#include "client.h"
+#include "rdp_bitmap.h"
+
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 #include <cairo/cairo.h>
-
-#include <guacamole/socket.h>
+#include <freerdp/codec/bitmap.h>
+#include <freerdp/codec/color.h>
+#include <freerdp/freerdp.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
-
-#include <freerdp/freerdp.h>
-#include <freerdp/codec/color.h>
-#include <freerdp/codec/bitmap.h>
+#include <guacamole/socket.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -41,9 +43,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include "client.h"
-#include "rdp_bitmap.h"
-
 void guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;

src/protocols/rdp/rdp_bitmap.h

@@ -24,7 +24,10 @@
 #ifndef _GUAC_RDP_RDP_BITMAP_H
 #define _GUAC_RDP_RDP_BITMAP_H
 
+#include "config.h"
+
 #include <freerdp/freerdp.h>
+#include <guacamole/protocol.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -32,8 +35,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/protocol.h>
-
 typedef struct guac_rdp_bitmap {
 
     /**

src/protocols/rdp/rdp_cliprdr.c

@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdp_cliprdr.h"
 
-#include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/utils/event.h>
-
-#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
-#include <freerdp/client/cliprdr.h>
-#else
-#include "compat/client-cliprdr.h"
-#endif
+#include <guacamole/client.h>
+#include <guacamole/protocol.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -37,11 +37,11 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-#include <guacamole/protocol.h>
-
-#include "client.h"
-#include "rdp_cliprdr.h"
+#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
+#include <freerdp/client/cliprdr.h>
+#else
+#include "compat/client-cliprdr.h"
+#endif
 
 void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) {
 

src/protocols/rdp/rdp_cliprdr.h

@@ -24,13 +24,21 @@
 #ifndef __GUAC_RDP_RDP_CLIPRDR_H
 #define __GUAC_RDP_RDP_CLIPRDR_H
 
+#include "config.h"
+
+#include <freerdp/freerdp.h>
+
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
 #include "compat/winpr-stream.h"
 #endif
 
-#include <freerdp/freerdp.h>
+#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
+#include <freerdp/client/cliprdr.h>
+#else
+#include "compat/client-cliprdr.h"
+#endif
 
 void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event);
 void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event);

src/protocols/rdp/rdp_fs.c

@@ -20,25 +20,26 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <fnmatch.h>
-#include <errno.h>
-
-#include <guacamole/pool.h>
-
+#include "debug.h"
 #include "rdp_fs.h"
 #include "rdp_status.h"
-#include "debug.h"
 #include "unicode.h"
 
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <guacamole/pool.h>
+
 guac_rdp_fs* guac_rdp_fs_alloc(const char* drive_path) {
 
     guac_rdp_fs* fs = malloc(sizeof(guac_rdp_fs));

src/protocols/rdp/rdp_fs.h

@@ -35,9 +35,11 @@
  * @file rdp_fs.h 
  */
 
-#include <sys/types.h>
-#include <stdint.h>
+#include "config.h"
+
 #include <dirent.h>
+#include <stdint.h>
+#include <sys/types.h>
 
 #include <guacamole/pool.h>
 

src/protocols/rdp/rdp_gdi.c

@@ -20,9 +20,14 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdp_bitmap.h"
 
 #include <pthread.h>
 #include <freerdp/freerdp.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -30,11 +35,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-
-#include "client.h"
-#include "rdp_bitmap.h"
-
 guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client,
         int rop3) {
 

src/protocols/rdp/rdp_gdi.h

@@ -24,8 +24,10 @@
 #ifndef _GUAC_RDP_RDP_GDI_H
 #define _GUAC_RDP_RDP_GDI_H
 
-#include <guacamole/protocol.h>
+#include "config.h"
+
 #include <freerdp/freerdp.h>
+#include <guacamole/protocol.h>
 
 guac_composite_mode guac_rdp_rop3_transfer_function(guac_client* client,
         int rop3);

src/protocols/rdp/rdp_glyph.c

@@ -20,9 +20,16 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "client.h"
+#include "rdp_glyph.h"
 
 #include <pthread.h>
+
 #include <freerdp/freerdp.h>
+#include <guacamole/client.h>
+#include <guacamole/error.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -30,12 +37,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/client.h>
-#include <guacamole/error.h>
-
-#include "client.h"
-#include "rdp_glyph.h"
-
 /* Define cairo_format_stride_for_width() if missing */
 #ifndef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
 #define cairo_format_stride_for_width(format, width) (width*4)

src/protocols/rdp/rdp_glyph.h

@@ -24,6 +24,8 @@
 #ifndef _GUAC_RDP_RDP_GLYPH_H
 #define _GUAC_RDP_RDP_GLYPH_H
 
+#include "config.h"
+
 #include <freerdp/freerdp.h>
 
 #ifdef ENABLE_WINPR

src/protocols/rdp/rdp_keymap.c

@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include "rdp_keymap.h"
 

src/protocols/rdp/rdp_keymap.h

@@ -24,11 +24,7 @@
 #ifndef _GUAC_RDP_RDP_KEYMAP_H
 #define _GUAC_RDP_RDP_KEYMAP_H
 
-#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
-#include <freerdp/locale/keyboard.h>
-#else
-#include <freerdp/kbd/layouts.h>
-#endif
+#include "config.h"
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -36,6 +32,12 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
+#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
+#include <freerdp/locale/keyboard.h>
+#else
+#include <freerdp/kbd/layouts.h>
+#endif
+
 /**
  * Represents a keysym-to-scancode mapping for RDP, with extra information
  * about the state of prerequisite keysyms.

src/protocols/rdp/rdp_keymap_base.c

@@ -20,11 +20,12 @@
  * THE SOFTWARE.
  */
 
-
-#include <freerdp/input.h>
+#include "config.h"
 
 #include "rdp_keymap.h"
 
+#include <freerdp/input.h>
+
 static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
 
     /* BackSpace */

src/protocols/rdp/rdp_keymap_de_de.c

@@ -21,6 +21,10 @@
  */
 
 
+#include "config.h"
+
+#include "rdp_keymap.h"
+
 #include <freerdp/input.h>
 
 #ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
@@ -29,8 +33,6 @@
 #include <freerdp/kbd/layouts.h>
 #endif
 
-#include "rdp_keymap.h"
-
 static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
 
     /* space */

src/protocols/rdp/rdp_keymap_en_us.c

@@ -20,6 +20,9 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "rdp_keymap.h"
 
 #include <freerdp/input.h>
 
@@ -29,8 +32,6 @@
 #include <freerdp/kbd/layouts.h>
 #endif
 
-#include "rdp_keymap.h"
-
 static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
 
     /* space */

src/protocols/rdp/rdp_keymap_failsafe.c

@@ -20,6 +20,9 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "rdp_keymap.h"
 
 #include <freerdp/input.h>
 
@@ -29,8 +32,6 @@
 #include <freerdp/kbd/layouts.h>
 #endif
 
-#include "rdp_keymap.h"
-
 static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
 
     {0}

src/protocols/rdp/rdp_keymap_fr_fr.c

@@ -36,6 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "config.h"
+
+#include "rdp_keymap.h"
+
 #include <freerdp/input.h>
 
 #ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
@@ -44,9 +48,6 @@
 #include <freerdp/kbd/layouts.h>
 #endif
 
-#include "rdp_keymap.h"
-
-
 static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
 
     /* space */

src/protocols/rdp/rdp_pointer.c

@@ -20,15 +20,16 @@
  * THE SOFTWARE.
  */
 
-
-#include <pthread.h>
-#include <freerdp/freerdp.h>
-
-#include <guacamole/client.h>
+#include "config.h"
 
 #include "client.h"
-#include "rdp_pointer.h"
 #include "default_pointer.h"
+#include "rdp_pointer.h"
+
+#include <pthread.h>
+
+#include <freerdp/freerdp.h>
+#include <guacamole/client.h>
 
 void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer) {
 

src/protocols/rdp/rdp_pointer.h

@@ -24,6 +24,8 @@
 #ifndef _GUAC_RDP_RDP_POINTER_H
 #define _GUAC_RDP_RDP_POINTER_H
 
+#include "config.h"
+
 #include <freerdp/freerdp.h>
 
 #include <guacamole/protocol.h>

src/protocols/rdp/rdp_settings.c

@@ -20,9 +20,11 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "rdp_settings.h"
 
 #include <freerdp/constants.h>
-#include "rdp_settings.h"
 
 void guac_rdp_pull_settings(freerdp* rdp, guac_rdp_settings* guac_settings) {
 

src/protocols/rdp/rdp_settings.h

@@ -24,11 +24,13 @@
 #ifndef __GUAC_RDP_SETTINGS_H
 #define __GUAC_RDP_SETTINGS_H
 
-#include <freerdp/freerdp.h>
-#include <guacamole/client.h>
+#include "config.h"
 
 #include "rdp_keymap.h"
 
+#include <freerdp/freerdp.h>
+#include <guacamole/client.h>
+
 /**
  * The default RDP port.
  */

src/protocols/rdp/rdp_status.h

@@ -30,6 +30,8 @@
  * @file rdp_status.h 
  */
 
+#include "config.h"
+
 #define STATUS_SUCCESS                  0x00000000
 #define STATUS_NO_MORE_FILES            0x80000006
 #define STATUS_DEVICE_OFF_LINE          0x80000010

src/protocols/rdp/unicode.c

@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include <stdint.h>
 

src/protocols/rdp/unicode.h

@@ -21,6 +21,8 @@
  */
 
 
+#include "config.h"
+
 /**
  * Convert the given number of UTF-16 characters to UTF-8 characters.
  */

src/protocols/ssh/blank.c

@@ -20,14 +20,15 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
+#include "cursor.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
-#include "cursor.h"
-
 guac_ssh_cursor* guac_ssh_create_blank(guac_client* client) {
 
     guac_socket* socket = client->socket;

src/protocols/ssh/blank.h

@@ -24,6 +24,10 @@
 #ifndef _GUAC_SSH_BLANK_H
 #define _GUAC_SSH_BLANK_H
 
+#include "config.h"
+
+#include "cursor.h"
+
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
 

src/protocols/ssh/buffer.c

@@ -20,13 +20,14 @@
  * THE SOFTWARE.
  */
 
-
-#include <stdlib.h>
-#include <string.h>
+#include "config.h"
 
 #include "buffer.h"
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 guac_terminal_buffer* guac_terminal_buffer_alloc(int rows, guac_terminal_char* default_character) {
 
     /* Allocate scrollback */

src/protocols/ssh/buffer.h

@@ -24,6 +24,8 @@
 #ifndef _SSH_GUAC_BUFFER_H
 #define _SSH_GUAC_BUFFER_H
 
+#include "config.h"
+
 #include "types.h"
 
 /**

src/protocols/ssh/char_mappings.c

@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
 
 const int vt100_map[] = {
     ' ',    '!',    '"',    '#',    '$',    '%',    '&',    '\'',   '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',