GUACAMOLE-249: Reorganize includes to match code standard.

src/protocols/rdp/bitmap.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
+#include "bitmap.h"
 #include "client.h"
 #include "common/display.h"
 #include "common/surface.h"
 #include "rdp.h"
-#include "bitmap.h"
 #include "settings.h"
 
 #include <cairo/cairo.h>

src/protocols/rdp/bitmap.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_RDP_BITMAP_H
-#define _GUAC_RDP_RDP_BITMAP_H
+#ifndef GUAC_RDP_BITMAP_H
+#define GUAC_RDP_BITMAP_H
 
 #include "config.h"
 #include "common/display.h"

src/protocols/rdp/channels/audio-input.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_AUDIO_INPUT_H
-#define GUAC_RDP_AUDIO_INPUT_H
+#ifndef GUAC_RDP_CHANNELS_AUDIO_INPUT_H
+#define GUAC_RDP_CHANNELS_AUDIO_INPUT_H
 
 #include "config.h"
 

src/protocols/rdp/channels/cliprdr.c

@@ -19,11 +19,11 @@
 
 #include "config.h"
 
-#include "plugins/channels.h"
-#include "client.h"
 #include "channels/cliprdr.h"
+#include "client.h"
 #include "common/clipboard.h"
 #include "common/iconv.h"
+#include "plugins/channels.h"
 #include "rdp.h"
 
 #include <freerdp/channels/channels.h>

src/protocols/rdp/channels/cliprdr.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_CLIPBOARD_H
-#define GUAC_RDP_CLIPBOARD_H
+#ifndef GUAC_RDP_CHANNELS_CLIPRDR_H
+#define GUAC_RDP_CHANNELS_CLIPRDR_H
 
 #include "config.h"
 #include "common/clipboard.h"

src/protocols/rdp/channels/common-svc.c

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "plugins/channels.h"
 #include "channels/common-svc.h"
+#include "plugins/channels.h"
 #include "rdp.h"
 
 #include <freerdp/svc.h>

src/protocols/rdp/channels/common-svc.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_SVC_H
-#define GUAC_RDP_SVC_H
+#ifndef GUAC_RDP_CHANNELS_COMMON_SVC_H
+#define GUAC_RDP_CHANNELS_COMMON_SVC_H
 
 #include "config.h"
 

src/protocols/rdp/channels/disp.c

@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include "plugins/channels.h"
-#include "client.h"
 #include "channels/disp.h"
+#include "client.h"
+#include "plugins/channels.h"
 #include "rdp.h"
 #include "settings.h"
 

src/protocols/rdp/channels/disp.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_DISP_H
-#define GUAC_RDP_DISP_H
+#ifndef GUAC_RDP_CHANNELS_DISP_H
+#define GUAC_RDP_CHANNELS_DISP_H
 
 #include "settings.h"
 

src/protocols/rdp/channels/pipe-svc.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
-#include "plugins/channels.h"
-#include "client.h"
-#include "common/list.h"
 #include "channels/common-svc.h"
 #include "channels/pipe-svc.h"
+#include "client.h"
+#include "common/list.h"
+#include "plugins/channels.h"
 #include "rdp.h"
 
 #include <freerdp/svc.h>

src/protocols/rdp/channels/pipe-svc.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_PIPE_SVC_H
-#define GUAC_RDP_PIPE_SVC_H
+#ifndef GUAC_RDP_CHANNELS_PIPE_SVC_H
+#define GUAC_RDP_CHANNELS_PIPE_SVC_H
 
 #include "config.h"
 #include "channels/common-svc.h"

src/protocols/rdp/channels/rail.c

@@ -18,10 +18,9 @@
  */
 
 #include "config.h"
-
-#include "plugins/channels.h"
-#include "client.h"
 #include "channels/rail.h"
+#include "client.h"
+#include "plugins/channels.h"
 #include "rdp.h"
 #include "settings.h"
 

src/protocols/rdp/channels/rail.h

@@ -17,11 +17,13 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_RAIL_H
-#define GUAC_RDP_RAIL_H
+#ifndef GUAC_RDP_CHANNELS_RAIL_H
+#define GUAC_RDP_CHANNELS_RAIL_H
 
 #include "config.h"
 
+#include <freerdp/freerdp.h>
+
 /**
  * Initializes RemoteApp support for RDP and handling of the RAIL channel. If
  * failures occur, messages noting the specifics of those failures will be

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H
-#define GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_DIR_INFO_H
+#define RDP_CHANNELS_GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H
 
 /**
  * Handlers for directory queries received over the RDPDR channel via the

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_FS_MESSAGES_FILE_INFO_H
-#define GUAC_RDPDR_FS_MESSAGES_FILE_INFO_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_FILE_INFO_H
+#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_FILE_INFO_H
 
 /**
  * Handlers for file queries received over the RDPDR channel via the

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-messages.h"
+#include "channels/rdpdr/rdpdr.h"
 #include "fs.h"
 #include "status.h"
 

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_FS_MESSAGES_VOL_INFO_H
-#define GUAC_RDPDR_FS_MESSAGES_VOL_INFO_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_VOL_INFO_H
+#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_VOL_INFO_H
 
 /**
  * Handlers for directory queries received over the RDPDR channel via the

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c

@@ -18,12 +18,12 @@
  */
 
 #include "config.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-fs-messages-dir-info.h"
 #include "channels/rdpdr/rdpdr-fs-messages-file-info.h"
-#include "channels/rdpdr/rdpdr-fs-messages.h"
 #include "channels/rdpdr/rdpdr-fs-messages-vol-info.h"
+#include "channels/rdpdr/rdpdr-fs-messages.h"
 #include "channels/rdpdr/rdpdr-messages.h"
+#include "channels/rdpdr/rdpdr.h"
 #include "fs.h"
 #include "status.h"
 #include "unicode.h"

src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_FS_MESSAGES_H
-#define GUAC_RDPDR_FS_MESSAGES_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_H
+#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_H
 
 /**
  * Handlers for core drive I/O requests. Requests handled here may be simple

src/protocols/rdp/channels/rdpdr/rdpdr-fs.c

@@ -17,12 +17,11 @@
  * under the License.
  */
 
-
 #include "config.h"
-#include "rdp.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-fs-messages.h"
 #include "channels/rdpdr/rdpdr-messages.h"
+#include "channels/rdpdr/rdpdr.h"
+#include "rdp.h"
 
 #include <freerdp/channels/rdpdr.h>
 #include <guacamole/client.h>

src/protocols/rdp/channels/rdpdr/rdpdr-fs.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_FS_H
-#define GUAC_RDPDR_FS_H
+#ifndef GUAC_RDP_RDPDR_FS_H
+#define GUAC_RDP_RDPDR_FS_H
 
 /**
  * Functions and macros specific to filesystem handling and initialization

src/protocols/rdp/channels/rdpdr/rdpdr-messages.c

@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include "rdp.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-messages.h"
+#include "channels/rdpdr/rdpdr.h"
+#include "rdp.h"
 #include "unicode.h"
 
 #include <freerdp/channels/rdpdr.h>

src/protocols/rdp/channels/rdpdr/rdpdr-messages.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_MESSAGES_H
-#define GUAC_RDPDR_MESSAGES_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_MESSAGES_H
+#define GUAC_RDP_CHANNELS_RDPDR_MESSAGES_H
 
 #include "config.h"
 #include "channels/rdpdr/rdpdr.h"

src/protocols/rdp/channels/rdpdr/rdpdr-printer.c

@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-messages.h"
 #include "channels/rdpdr/rdpdr-printer.h"
-#include "rdp.h"
+#include "channels/rdpdr/rdpdr.h"
 #include "print-job.h"
+#include "rdp.h"
 #include "status.h"
 #include "unicode.h"
 

src/protocols/rdp/channels/rdpdr/rdpdr-printer.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPDR_PRINTER_H
-#define GUAC_RDPDR_PRINTER_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_PRINTER_H
+#define GUAC_RDP_CHANNELS_RDPDR_PRINTER_H
 
 #include "config.h"
 #include "channels/rdpdr/rdpdr.h"

src/protocols/rdp/channels/rdpdr/rdpdr.c

@@ -18,15 +18,15 @@
  */
 
 #include "config.h"
-#include "plugins/channels.h"
-#include "rdp.h"
-#include "fs.h"
-#include "settings.h"
-#include "stream.h"
-#include "channels/rdpdr/rdpdr.h"
 #include "channels/rdpdr/rdpdr-fs.h"
 #include "channels/rdpdr/rdpdr-messages.h"
 #include "channels/rdpdr/rdpdr-printer.h"
+#include "channels/rdpdr/rdpdr.h"
+#include "fs.h"
+#include "plugins/channels.h"
+#include "rdp.h"
+#include "settings.h"
+#include "stream.h"
 
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/freerdp.h>

src/protocols/rdp/channels/rdpdr/rdpdr.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_RDPDR_H
-#define GUAC_RDP_RDPDR_H
+#ifndef GUAC_RDP_CHANNELS_RDPDR_H
+#define GUAC_RDP_CHANNELS_RDPDR_H
 
 #include "config.h"
 #include "channels/common-svc.h"

src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c

@@ -19,12 +19,9 @@
 
 #include "config.h"
 
-#include "rdp.h"
-#include "channels/rdpsnd/rdpsnd.h"
 #include "channels/rdpsnd/rdpsnd-messages.h"
-
-#include <pthread.h>
-#include <stdlib.h>
+#include "channels/rdpsnd/rdpsnd.h"
+#include "rdp.h"
 
 #include <freerdp/codec/audio.h>
 #include <guacamole/audio.h>
@@ -32,6 +29,9 @@
 #include <winpr/stream.h>
 #include <winpr/wtypes.h>
 
+#include <pthread.h>
+#include <stdlib.h>
+
 void guac_rdpsnd_formats_handler(guac_rdp_common_svc* svc,
         wStream* input_stream, guac_rdpsnd_pdu_header* header) {
 

src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef GUAC_RDPSND_MESSAGES_H
-#define GUAC_RDPSND_MESSAGES_H
+#ifndef GUAC_RDP_CHANNELS_RDPSND_MESSAGES_H
+#define GUAC_RDP_CHANNELS_RDPSND_MESSAGES_H
 
 #include "config.h"
 #include "channels/common-svc.h"

src/protocols/rdp/channels/rdpsnd/rdpsnd.c

@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "channels/common-svc.h"
-#include "rdp.h"
-#include "channels/rdpsnd/rdpsnd.h"
 #include "channels/rdpsnd/rdpsnd-messages.h"
+#include "channels/rdpsnd/rdpsnd.h"
+#include "rdp.h"
 
 #include <freerdp/codec/audio.h>
 #include <freerdp/freerdp.h>

src/protocols/rdp/channels/rdpsnd/rdpsnd.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_RDPSND_H
-#define GUAC_RDP_RDPSND_H
+#ifndef GUAC_RDP_CHANNELS_RDPSND_H
+#define GUAC_RDP_CHANNELS_RDPSND_H
 
 #include "config.h"
 #include "channels/common-svc.h"

src/protocols/rdp/client.c

@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
-
 #include "channels/audio-input.h"
-#include "common/recording.h"
-#include "client.h"
 #include "channels/disp.h"
-#include "rdp.h"
+#include "client.h"
+#include "common/recording.h"
 #include "fs.h"
+#include "rdp.h"
 #include "user.h"
 
 #ifdef ENABLE_COMMON_SSH

src/protocols/rdp/error.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-
 #include "error.h"
 #include "rdp.h"
 

src/protocols/rdp/fs.c

@@ -23,6 +23,13 @@
 #include "status.h"
 #include "stream.h"
 
+#include <guacamole/client.h>
+#include <guacamole/object.h>
+#include <guacamole/pool.h>
+#include <guacamole/socket.h>
+#include <guacamole/string.h>
+#include <guacamole/user.h>
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -35,13 +42,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <guacamole/client.h>
-#include <guacamole/object.h>
-#include <guacamole/pool.h>
-#include <guacamole/socket.h>
-#include <guacamole/string.h>
-#include <guacamole/user.h>
-
 guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path,
         int create_drive_path) {
 

src/protocols/rdp/fs.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef __GUAC_RDP_FS_H
-#define __GUAC_RDP_FS_H
+#ifndef GUAC_RDP_FS_H
+#define GUAC_RDP_FS_H
 
 /**
  * Functions and macros specific to filesystem handling and initialization

src/protocols/rdp/gdi.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
+#include "bitmap.h"
 #include "client.h"
+#include "color.h"
 #include "common/surface.h"
 #include "rdp.h"
-#include "bitmap.h"
-#include "color.h"
 #include "settings.h"
 
 #include <cairo/cairo.h>

src/protocols/rdp/gdi.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_RDP_GDI_H
-#define _GUAC_RDP_RDP_GDI_H
+#ifndef GUAC_RDP_GDI_H
+#define GUAC_RDP_GDI_H
 
 #include "config.h"
 

src/protocols/rdp/glyph.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
 #include "client.h"
-#include "common/surface.h"
-#include "rdp.h"
 #include "color.h"
+#include "common/surface.h"
 #include "glyph.h"
+#include "rdp.h"
 #include "settings.h"
 
 #include <freerdp/freerdp.h>

src/protocols/rdp/glyph.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_RDP_GLYPH_H
-#define _GUAC_RDP_RDP_GLYPH_H
+#ifndef GUAC_RDP_GLYPH_H
+#define GUAC_RDP_GLYPH_H
 
 #include "config.h"
 

src/protocols/rdp/input.c

@@ -18,10 +18,9 @@
  */
 
 #include "config.h"
-
+#include "channels/disp.h"
 #include "client.h"
 #include "common/recording.h"
-#include "channels/disp.h"
 #include "input.h"
 #include "keyboard/keyboard.h"
 #include "rdp.h"

src/protocols/rdp/keyboard/decompose.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_DECOMPOSE_H
-#define GUAC_RDP_DECOMPOSE_H
+#ifndef GUAC_RDP_KEYBOARD_DECOMPOSE_H
+#define GUAC_RDP_KEYBOARD_DECOMPOSE_H
 
 #include "config.h"
 #include "keyboard/keyboard.h"

src/protocols/rdp/keyboard/keyboard.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
 #include "client.h"
 #include "keyboard/decompose.h"
 #include "keyboard/keyboard.h"
-#include "rdp.h"
 #include "keyboard/keymap.h"
+#include "rdp.h"
 
 #include <freerdp/freerdp.h>
 #include <freerdp/input.h>

src/protocols/rdp/keyboard/keymap.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_RDP_KEYMAP_H
-#define _GUAC_RDP_RDP_KEYMAP_H
+#ifndef GUAC_RDP_KEYBOARD_KEYMAP_H
+#define GUAC_RDP_KEYBOARD_KEYMAP_H
 
 #include "config.h"
 

src/protocols/rdp/plugins/channels.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_CHANNELS_H
-#define GUAC_RDP_CHANNELS_H
+#ifndef GUAC_RDP_PLUGINS_CHANNELS_H
+#define GUAC_RDP_PLUGINS_CHANNELS_H
 
 #include "config.h"
 

src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c

@@ -20,9 +20,6 @@
 #include "config.h"
 #include "channels/common-svc.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <freerdp/constants.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
@@ -31,6 +28,9 @@
 #include <winpr/stream.h>
 #include <winpr/wtypes.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 /**
  * Event handler for events which deal with data transmitted over an open SVC.
  * This specific implementation of the event handler currently handles only the

src/protocols/rdp/plugins/guacai/guacai-messages.c

@@ -18,19 +18,18 @@
  */
 
 #include "config.h"
-
-#include "plugins/guacai/guacai-messages.h"
 #include "channels/audio-input.h"
+#include "plugins/guacai/guacai-messages.h"
 #include "rdp.h"
 
-#include <stdlib.h>
-
-#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/dvc.h>
+#include <freerdp/freerdp.h>
 #include <guacamole/client.h>
 #include <winpr/stream.h>
 
+#include <stdlib.h>
+
 /**
  * Reads AUDIO_FORMAT data from the given stream into the given struct.
  *

src/protocols/rdp/plugins/guacai/guacai-messages.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_AI_MESSAGES_H
-#define GUAC_RDP_AI_MESSAGES_H
+#ifndef GUAC_RDP_PLUGINS_GUACAI_MESSAGES_H
+#define GUAC_RDP_PLUGINS_GUACAI_MESSAGES_H
 
 #include "config.h"
 

src/protocols/rdp/plugins/guacai/guacai.c

@@ -18,22 +18,21 @@
  */
 
 #include "config.h"
-
+#include "channels/audio-input.h"
 #include "plugins/guacai/guacai-messages.h"
 #include "plugins/guacai/guacai.h"
-#include "channels/audio-input.h"
 #include "plugins/ptr-string.h"
 #include "rdp.h"
 
-#include <stdlib.h>
-#include <string.h>
-
-#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/dvc.h>
+#include <freerdp/freerdp.h>
 #include <guacamole/client.h>
 #include <winpr/stream.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 /**
  * Handles the given data received along the AUDIO_INPUT channel of the RDP
  * connection associated with the given guac_client. This handler is

src/protocols/rdp/plugins/guacai/guacai.h

@@ -17,14 +17,14 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_AI_SERVICE_H
-#define GUAC_RDP_AI_SERVICE_H
+#ifndef GUAC_RDP_PLUGINS_GUACAI_H
+#define GUAC_RDP_PLUGINS_GUACAI_H
 
 #include "config.h"
 
-#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/dvc.h>
+#include <freerdp/freerdp.h>
 #include <guacamole/client.h>
 
 /**

src/protocols/rdp/plugins/ptr-string.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_PTR_STRING_H
-#define GUAC_RDP_PTR_STRING_H
+#ifndef GUAC_RDP_PLUGINS_PTR_STRING_H
+#define GUAC_RDP_PLUGINS_PTR_STRING_H
 
 #include "config.h"
 

src/protocols/rdp/pointer.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
 #include "client.h"
 #include "common/cursor.h"
 #include "common/display.h"
-#include "rdp.h"
 #include "pointer.h"
+#include "rdp.h"
 
 #include <cairo/cairo.h>
 #include <freerdp/freerdp.h>

src/protocols/rdp/pointer.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_RDP_POINTER_H
-#define _GUAC_RDP_RDP_POINTER_H
+#ifndef GUAC_RDP_POINTER_H
+#define GUAC_RDP_POINTER_H
 
 #include "config.h"
 #include "common/display.h"

src/protocols/rdp/print-job.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "config.h"
 #include "print-job.h"
 

src/protocols/rdp/rdp.c

@@ -18,29 +18,28 @@
  */
 
 #include "config.h"
-
+#include "bitmap.h"
 #include "channels/audio-input.h"
-#include "plugins/channels.h"
-#include "client.h"
 #include "channels/cliprdr.h"
+#include "channels/disp.h"
+#include "channels/pipe-svc.h"
+#include "channels/rail.h"
+#include "channels/rdpdr/rdpdr.h"
+#include "channels/rdpsnd/rdpsnd.h"
+#include "client.h"
 #include "common/cursor.h"
 #include "common/display.h"
 #include "common/recording.h"
-#include "channels/disp.h"
 #include "error.h"
-#include "keyboard/keyboard.h"
-#include "channels/pipe-svc.h"
-#include "channels/rail.h"
-#include "rdp.h"
-#include "bitmap.h"
 #include "fs.h"
-#include "print-job.h"
 #include "gdi.h"
 #include "glyph.h"
+#include "keyboard/keyboard.h"
+#include "plugins/channels.h"
 #include "pointer.h"
+#include "print-job.h"
+#include "rdp.h"
 #include "stream.h"
-#include "channels/rdpdr/rdpdr.h"
-#include "channels/rdpsnd/rdpsnd.h"
 
 #ifdef ENABLE_COMMON_SSH
 #include "common-ssh/sftp.h"

src/protocols/rdp/rdp.h

@@ -21,17 +21,16 @@
 #define GUAC_RDP_H
 
 #include "config.h"
-
 #include "channels/audio-input.h"
 #include "channels/cliprdr.h"
+#include "channels/disp.h"
 #include "common/clipboard.h"
 #include "common/display.h"
 #include "common/list.h"
 #include "common/recording.h"
 #include "common/surface.h"
-#include "channels/disp.h"
-#include "keyboard/keyboard.h"
 #include "fs.h"
+#include "keyboard/keyboard.h"
 #include "print-job.h"
 #include "settings.h"
 

src/protocols/rdp/settings.c

@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
-
 #include "client.h"
 #include "common/string.h"
 #include "rdp.h"
-#include "settings.h"
 #include "resolution.h"
+#include "settings.h"
 
 #include <freerdp/constants.h>
 #include <freerdp/settings.h>

src/protocols/rdp/settings.h

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-
-#ifndef __GUAC_RDP_SETTINGS_H
-#define __GUAC_RDP_SETTINGS_H
+#ifndef GUAC_RDP_SETTINGS_H
+#define GUAC_RDP_SETTINGS_H
 
 #include "config.h"
 
 #include "keyboard/keymap.h"
 
 #include <freerdp/freerdp.h>
+#include <guacamole/user.h>
 
 /**
  * The maximum number of bytes in the client hostname claimed during

src/protocols/rdp/status.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef __GUAC_RDP_STATUS_H
-#define __GUAC_RDP_STATUS_H
+#ifndef GUAC_RDP_STATUS_H
+#define GUAC_RDP_STATUS_H
 
 /**
  * RDP-specific status constants.

src/protocols/rdp/stream.c

@@ -17,16 +17,15 @@
  * under the License.
  */
 
-
 #include "config.h"
 #include "client.h"
-#include "rdp.h"
 #include "fs.h"
+#include "rdp.h"
 #include "stream.h"
 
-#include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/client/cliprdr.h>
+#include <freerdp/freerdp.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>

src/protocols/rdp/stream.h

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-
-#ifndef _GUAC_RDP_STREAM_H
-#define _GUAC_RDP_STREAM_H
+#ifndef GUAC_RDP_STREAM_H
+#define GUAC_RDP_STREAM_H
 
 #include "config.h"
 #include "common/json.h"

src/protocols/rdp/unicode.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include <stdint.h>
-
 #include <guacamole/unicode.h>
 
+#include <stdint.h>
+
 void guac_rdp_utf16_to_utf8(const unsigned char* utf16, int length,
         char* utf8, int size) {
 

src/protocols/rdp/user.c

@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
-
 #include "channels/audio-input.h"
+#include "channels/pipe-svc.h"
 #include "common/display.h"
 #include "input.h"
-#include "user.h"
-#include "channels/pipe-svc.h"
 #include "rdp.h"
 #include "settings.h"
 #include "stream.h"
+#include "user.h"
 
 #ifdef ENABLE_COMMON_SSH
 #include "sftp.h"