diff --git a/bin/guacctl b/bin/guacctl
index c99060a3..26659a6f 100755
--- a/bin/guacctl
+++ b/bin/guacctl
@@ -289,7 +289,6 @@ resize_scrollback() {
 
 }
 
-
 #
 # Get script name
 #
diff --git a/configure.ac b/configure.ac
index 93e08c2a..02948435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -643,7 +643,6 @@ then
 
 fi
 
-
 #
 # FreeRDP 2 (libfreerdp2, libfreerdp-client2, and libwinpr2)
 #
@@ -778,7 +777,6 @@ then
 
 fi
 
-
 # Glyph callback variants
 if test "x${have_freerdp2}" = "xyes"
 then
diff --git a/src/common-ssh/key.c b/src/common-ssh/key.c
index ddc84179..4a88aead 100644
--- a/src/common-ssh/key.c
+++ b/src/common-ssh/key.c
@@ -212,7 +212,6 @@ int guac_common_ssh_verify_host_key(LIBSSH2_SESSION* session, guac_client* clien
         return known_hosts;
     }
 
-
     /* Check remote host key against known hosts */
     int kh_check = libssh2_knownhost_checkp(ssh_known_hosts, hostname, port,
                                             remote_hostkey, remote_hostkey_len,
diff --git a/src/common/common/cursor.h b/src/common/common/cursor.h
index 404fe562..96c1c6f2 100644
--- a/src/common/common/cursor.h
+++ b/src/common/common/cursor.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_COMMON_CURSOR_H
 #define GUAC_COMMON_CURSOR_H
 
diff --git a/src/common/common/defaults.h b/src/common/common/defaults.h
index a061be66..72c1e51e 100644
--- a/src/common/common/defaults.h
+++ b/src/common/common/defaults.h
@@ -26,6 +26,5 @@
  */
 #define GUAC_WOL_DEFAULT_BOOT_WAIT_TIME 0
 
-
 #endif /* GUAC_COMMON_DEFAULTS_H */
 
diff --git a/src/common/common/dot_cursor.h b/src/common/common/dot_cursor.h
index 9d12ecc9..c5b73880 100644
--- a/src/common/common/dot_cursor.h
+++ b/src/common/common/dot_cursor.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_COMMON_DOT_CURSOR_H
 #define _GUAC_COMMON_DOT_CURSOR_H
 
diff --git a/src/common/common/pointer_cursor.h b/src/common/common/pointer_cursor.h
index 3289576b..74559ba3 100644
--- a/src/common/common/pointer_cursor.h
+++ b/src/common/common/pointer_cursor.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_COMMON_POINTER_CURSOR_H
 #define _GUAC_COMMON_POINTER_CURSOR_H
 
diff --git a/src/common/cursor.c b/src/common/cursor.c
index 2a1650fd..9bb51aed 100644
--- a/src/common/cursor.c
+++ b/src/common/cursor.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 /**
  * Allocates a cursor as well as an image buffer where the cursor is rendered.
  *
diff --git a/src/common/surface.c b/src/common/surface.c
index 1d3caf68..3ec5517e 100644
--- a/src/common/surface.c
+++ b/src/common/surface.c
@@ -280,7 +280,6 @@ static int __guac_common_surface_is_opaque(guac_common_surface* surface,
 
 }
 
-
 /**
  * Returns whether the given rectangle should be combined into the existing
  * dirty rectangle, to be eventually flushed as image data, or would be best
diff --git a/src/guacd/log.h b/src/guacd/log.h
index 58a87522..c00fa823 100644
--- a/src/guacd/log.h
+++ b/src/guacd/log.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUACD_LOG_H
 #define __GUACD_LOG_H
 
diff --git a/src/guacd/move-fd.c b/src/guacd/move-fd.c
index 8ee62232..74c98e5f 100644
--- a/src/guacd/move-fd.c
+++ b/src/guacd/move-fd.c
@@ -76,7 +76,6 @@ int guacd_recv_fd(int sock) {
     message.msg_iov    = io_vector;
     message.msg_iovlen = 1;
 
-
     /* Assign ancillary data buffer */
     char buffer[CMSG_SPACE(sizeof(fd))];
     message.msg_control = buffer;
diff --git a/src/guacd/proc-map.h b/src/guacd/proc-map.h
index 07ebbb97..adce8cf6 100644
--- a/src/guacd/proc-map.h
+++ b/src/guacd/proc-map.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUACD_PROC_MAP_H
 #define _GUACD_PROC_MAP_H
 
diff --git a/src/guacenc/ffmpeg-compat.c b/src/guacenc/ffmpeg-compat.c
index 9f12b5ca..8bdb6e92 100644
--- a/src/guacenc/ffmpeg-compat.c
+++ b/src/guacenc/ffmpeg-compat.c
@@ -85,7 +85,6 @@ static int guacenc_write_packet(guacenc_video* video, void* data, int size) {
 
 #endif
 
-
     if (ret != 0) {
         guacenc_log(GUAC_LOG_ERROR, "Unable to write frame "
                 "#%" PRId64 ": %s", video->next_pts, strerror(errno));
diff --git a/src/guacenc/parse.h b/src/guacenc/parse.h
index b6e5cd5a..b56ee59a 100644
--- a/src/guacenc/parse.h
+++ b/src/guacenc/parse.h
@@ -82,4 +82,3 @@ guac_timestamp guacenc_parse_timestamp(const char* str);
 
 #endif
 
-
diff --git a/src/libguac/guacamole/audio.h b/src/libguac/guacamole/audio.h
index 2f030ec4..2c2ffbe7 100644
--- a/src/libguac/guacamole/audio.h
+++ b/src/libguac/guacamole/audio.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUAC_AUDIO_H
 #define __GUAC_AUDIO_H
 
diff --git a/src/libguac/guacamole/error.h b/src/libguac/guacamole/error.h
index a511d315..5fdf558a 100644
--- a/src/libguac/guacamole/error.h
+++ b/src/libguac/guacamole/error.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_ERROR_H
 #define _GUAC_ERROR_H
 
diff --git a/src/libguac/guacamole/hash.h b/src/libguac/guacamole/hash.h
index beb0e6e9..c9cf6ea2 100644
--- a/src/libguac/guacamole/hash.h
+++ b/src/libguac/guacamole/hash.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_HASH_H
 #define _GUAC_HASH_H
 
diff --git a/src/libguac/guacamole/parser-types.h b/src/libguac/guacamole/parser-types.h
index da95adea..d2a0f925 100644
--- a/src/libguac/guacamole/parser-types.h
+++ b/src/libguac/guacamole/parser-types.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_PARSER_TYPES_H
 #define _GUAC_PARSER_TYPES_H
 
diff --git a/src/libguac/guacamole/parser.h b/src/libguac/guacamole/parser.h
index 5324eb49..a5a1a080 100644
--- a/src/libguac/guacamole/parser.h
+++ b/src/libguac/guacamole/parser.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_PARSER_H
 #define _GUAC_PARSER_H
 
diff --git a/src/libguac/guacamole/socket-ssl.h b/src/libguac/guacamole/socket-ssl.h
index e0f96f6b..b639e0e1 100644
--- a/src/libguac/guacamole/socket-ssl.h
+++ b/src/libguac/guacamole/socket-ssl.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUACD_SOCKET_SSL_H
 #define __GUACD_SOCKET_SSL_H
 
diff --git a/src/libguac/guacamole/unicode.h b/src/libguac/guacamole/unicode.h
index 7aa8f80e..66daf582 100644
--- a/src/libguac/guacamole/unicode.h
+++ b/src/libguac/guacamole/unicode.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_UNICODE_H
 #define _GUAC_UNICODE_H
 
diff --git a/src/libguac/id.c b/src/libguac/id.c
index 75cde962..699a9b0e 100644
--- a/src/libguac/id.c
+++ b/src/libguac/id.c
@@ -104,4 +104,3 @@ char* guac_generate_id(char prefix) {
 
 }
 
-
diff --git a/src/libguac/palette.h b/src/libguac/palette.h
index ac40e71a..ae10983b 100644
--- a/src/libguac/palette.h
+++ b/src/libguac/palette.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUAC_PALETTE_H
 #define __GUAC_PALETTE_H
 
diff --git a/src/libguac/raw_encoder.h b/src/libguac/raw_encoder.h
index e60d12b4..f67ef565 100644
--- a/src/libguac/raw_encoder.h
+++ b/src/libguac/raw_encoder.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_RAW_ENCODER_H
 #define GUAC_RAW_ENCODER_H
 
diff --git a/src/libguac/tests/Makefile.am b/src/libguac/tests/Makefile.am
index 3596156c..dba84241 100644
--- a/src/libguac/tests/Makefile.am
+++ b/src/libguac/tests/Makefile.am
@@ -68,7 +68,6 @@ test_libguac_SOURCES =               \
     unicode/strlen.c                 \
     unicode/write.c
 
-
 test_libguac_CFLAGS =       \
     -Werror -Wall -pedantic \
     @LIBGUAC_INCLUDE@
diff --git a/src/libguac/user-handlers.h b/src/libguac/user-handlers.h
index 7f82302b..2f3ecbe9 100644
--- a/src/libguac/user-handlers.h
+++ b/src/libguac/user-handlers.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_USER_HANDLERS__H
 #define _GUAC_USER_HANDLERS__H
 
diff --git a/src/protocols/kubernetes/argv.h b/src/protocols/kubernetes/argv.h
index dd73d423..e7b862cb 100644
--- a/src/protocols/kubernetes/argv.h
+++ b/src/protocols/kubernetes/argv.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_KUBERNETES_ARGV_H
 #define GUAC_KUBERNETES_ARGV_H
 
diff --git a/src/protocols/kubernetes/io.c b/src/protocols/kubernetes/io.c
index bfa37b1d..d00e24aa 100644
--- a/src/protocols/kubernetes/io.c
+++ b/src/protocols/kubernetes/io.c
@@ -140,4 +140,3 @@ bool guac_kubernetes_write_pending_message(guac_client* client) {
 
 }
 
-
diff --git a/src/protocols/kubernetes/io.h b/src/protocols/kubernetes/io.h
index 40f2c69a..cbdda652 100644
--- a/src/protocols/kubernetes/io.h
+++ b/src/protocols/kubernetes/io.h
@@ -83,7 +83,6 @@ typedef struct guac_kubernetes_message {
 
 } guac_kubernetes_message;
 
-
 /**
  * Handles data received from Kubernetes over WebSocket, decoding the channel
  * index of the received data and forwarding that data accordingly.
diff --git a/src/protocols/kubernetes/pipe.h b/src/protocols/kubernetes/pipe.h
index 8f60ee1b..5661b74b 100644
--- a/src/protocols/kubernetes/pipe.h
+++ b/src/protocols/kubernetes/pipe.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_KUBERNETES_PIPE_H
 #define GUAC_KUBERNETES_PIPE_H
 
diff --git a/src/protocols/rdp/argv.h b/src/protocols/rdp/argv.h
index c15aba92..07745228 100644
--- a/src/protocols/rdp/argv.h
+++ b/src/protocols/rdp/argv.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_RDP_ARGV_H
 #define GUAC_RDP_ARGV_H
 
diff --git a/src/protocols/rdp/channels/cliprdr.c b/src/protocols/rdp/channels/cliprdr.c
index 3f39470e..014dd57c 100644
--- a/src/protocols/rdp/channels/cliprdr.c
+++ b/src/protocols/rdp/channels/cliprdr.c
@@ -684,7 +684,6 @@ int guac_rdp_clipboard_blob_handler(guac_user* user, guac_stream* stream,
 
 }
 
-
 int guac_rdp_clipboard_end_handler(guac_user* user, guac_stream* stream) {
 
     guac_client* client = user->client;
diff --git a/src/protocols/rdp/channels/pipe-svc.c b/src/protocols/rdp/channels/pipe-svc.c
index a8bcfd64..68d43488 100644
--- a/src/protocols/rdp/channels/pipe-svc.c
+++ b/src/protocols/rdp/channels/pipe-svc.c
@@ -42,7 +42,6 @@ void guac_rdp_pipe_svc_send_pipe(guac_socket* socket, guac_rdp_pipe_svc* pipe_sv
 
 }
 
-
 void guac_rdp_pipe_svc_send_pipes(
         guac_client* client, guac_socket* socket) {
 
diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr.c b/src/protocols/rdp/channels/rdpdr/rdpdr.c
index a64a9084..b854bdf5 100644
--- a/src/protocols/rdp/channels/rdpdr/rdpdr.c
+++ b/src/protocols/rdp/channels/rdpdr/rdpdr.c
@@ -178,7 +178,6 @@ void guac_rdpdr_process_terminate(guac_rdp_common_svc* svc) {
 
 }
 
-
 void guac_rdpdr_load_plugin(rdpContext* context) {
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;
diff --git a/src/protocols/rdp/gdi.c b/src/protocols/rdp/gdi.c
index 8ddc5672..9c61772b 100644
--- a/src/protocols/rdp/gdi.c
+++ b/src/protocols/rdp/gdi.c
@@ -395,4 +395,3 @@ BOOL guac_rdp_gdi_desktop_resize(rdpContext* context) {
 
 }
 
-
diff --git a/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap b/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap
index 211d92c2..bf9d8e6d 100644
--- a/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap
+++ b/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap
@@ -84,12 +84,10 @@ map +altgr -shift 0x33 ~ ";"
 map +altgr -shift 0x34 ~ ">"
 map +altgr -shift 0x35 ~ "*"
 
-
 #
 # Keys requiring AltGr & Shift
 #
 
-
 #
 # Dead keys
 #
@@ -105,5 +103,4 @@ map +altgr -shift 0x0B ~ 0xFE59 # Dead doubleacute
 map +altgr -shift 0x0C ~ 0xFE57 # Dead diaeresis
 map +altgr -shift 0x0D ~ 0xFE5B # Dead cedilla
 
-
 # END
diff --git a/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap b/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap
index d46a0fda..ff48349a 100644
--- a/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap
+++ b/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap
@@ -61,7 +61,6 @@ map +altgr -shift 0x1F ~ "ß"
 
 map +altgr -shift 0x56 ~ "|"
 
-
 #
 # Keys requiring AltGr and vary by Shift and Caps Lock
 #
diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c
index ee659a83..fb2fa0f4 100644
--- a/src/protocols/rdp/settings.c
+++ b/src/protocols/rdp/settings.c
@@ -1234,7 +1234,6 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
         settings->clipboard_crlf = 0;
     }
 
-
     /* Parse Wake-on-LAN (WoL) settings */
     settings->wol_send_packet =
         guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
diff --git a/src/protocols/ssh/argv.h b/src/protocols/ssh/argv.h
index 0b32d090..267d49d6 100644
--- a/src/protocols/ssh/argv.h
+++ b/src/protocols/ssh/argv.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_SSH_ARGV_H
 #define GUAC_SSH_ARGV_H
 
diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c
index b116e6d1..991d8746 100644
--- a/src/protocols/ssh/client.c
+++ b/src/protocols/ssh/client.c
@@ -37,7 +37,6 @@
 #include <guacamole/recording.h>
 #include <guacamole/socket.h>
 
-
 /**
  * A pending join handler implementation that will synchronize the connection
  * state for all pending users prior to them being promoted to full user.
diff --git a/src/protocols/ssh/pipe.h b/src/protocols/ssh/pipe.h
index 044aa3b0..1ec9430c 100644
--- a/src/protocols/ssh/pipe.h
+++ b/src/protocols/ssh/pipe.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_SSH_PIPE_H
 #define GUAC_SSH_PIPE_H
 
diff --git a/src/protocols/ssh/sftp.h b/src/protocols/ssh/sftp.h
index 59ea5ba3..36c3d1b5 100644
--- a/src/protocols/ssh/sftp.h
+++ b/src/protocols/ssh/sftp.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _SSH_GUAC_SFTP_H
 #define _SSH_GUAC_SFTP_H
 
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 05255761..7c3ac05c 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -317,7 +317,6 @@ void* ssh_client_thread(void* data) {
         }
     }
 
-
 #ifdef ENABLE_SSH_AGENT
     /* Start SSH agent forwarding, if enabled */
     if (ssh_client->enable_agent) {
diff --git a/src/protocols/ssh/ssh_agent.h b/src/protocols/ssh/ssh_agent.h
index 7ad3b1a2..231711df 100644
--- a/src/protocols/ssh/ssh_agent.h
+++ b/src/protocols/ssh/ssh_agent.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_SSH_AGENT_H
 #define _GUAC_SSH_AGENT_H
 
diff --git a/src/protocols/telnet/argv.h b/src/protocols/telnet/argv.h
index 2c48c141..3153dddd 100644
--- a/src/protocols/telnet/argv.h
+++ b/src/protocols/telnet/argv.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_TELNET_ARGV_H
 #define GUAC_TELNET_ARGV_H
 
diff --git a/src/protocols/telnet/pipe.h b/src/protocols/telnet/pipe.h
index 9cb25239..1dc52ae5 100644
--- a/src/protocols/telnet/pipe.h
+++ b/src/protocols/telnet/pipe.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_TELNET_PIPE_H
 #define GUAC_TELNET_PIPE_H
 
diff --git a/src/protocols/vnc/client.h b/src/protocols/vnc/client.h
index abaf7ba8..eec4bfce 100644
--- a/src/protocols/vnc/client.h
+++ b/src/protocols/vnc/client.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUAC_VNC_CLIENT_H
 #define __GUAC_VNC_CLIENT_H
 
diff --git a/src/protocols/vnc/input.h b/src/protocols/vnc/input.h
index 76da8a4c..ced9f307 100644
--- a/src/protocols/vnc/input.h
+++ b/src/protocols/vnc/input.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_VNC_INPUT_H
 #define GUAC_VNC_INPUT_H
 
diff --git a/src/protocols/vnc/settings.h b/src/protocols/vnc/settings.h
index 76139bd4..d1d07263 100644
--- a/src/protocols/vnc/settings.h
+++ b/src/protocols/vnc/settings.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef __GUAC_VNC_SETTINGS_H
 #define __GUAC_VNC_SETTINGS_H
 
diff --git a/src/pulse/pulse/pulse.h b/src/pulse/pulse/pulse.h
index 386d8cd9..952fd80d 100644
--- a/src/pulse/pulse/pulse.h
+++ b/src/pulse/pulse/pulse.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_PULSE_H
 #define GUAC_PULSE_H
 
diff --git a/src/terminal/buffer.c b/src/terminal/buffer.c
index a8cc87ce..59c10209 100644
--- a/src/terminal/buffer.c
+++ b/src/terminal/buffer.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "terminal/buffer.h"
 #include "terminal/common.h"
 
diff --git a/src/terminal/char-mappings.c b/src/terminal/char-mappings.c
index 421bc388..dc47c093 100644
--- a/src/terminal/char-mappings.c
+++ b/src/terminal/char-mappings.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 const int vt100_map[] = {
     ' ',    '!',    '"',    '#',    '$',    '%',    '&',    '\'',   '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',
     '0',    '1',    '2',    '3',    '4',    '5',    '6',    '7',    '8',    '9',    ':',    ';',    '<',    '=',    '>',    '?',
diff --git a/src/terminal/color-scheme.c b/src/terminal/color-scheme.c
index c1a9e3ff..1070ada6 100644
--- a/src/terminal/color-scheme.c
+++ b/src/terminal/color-scheme.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "terminal/color-scheme.h"
 #include "terminal/palette.h"
 #include "terminal/xparsecolor.h"
diff --git a/src/terminal/display.c b/src/terminal/display.c
index a89b2693..ad0ec48e 100644
--- a/src/terminal/display.c
+++ b/src/terminal/display.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "common/surface.h"
 #include "terminal/common.h"
 #include "terminal/display.h"
@@ -768,7 +767,6 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display) {
 
 }
 
-
 void __guac_terminal_display_flush_set(guac_terminal_display* display) {
 
     guac_terminal_operation* current = display->operations;
diff --git a/src/terminal/select.c b/src/terminal/select.c
index c70b1959..fdb5a7cf 100644
--- a/src/terminal/select.c
+++ b/src/terminal/select.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "common/clipboard.h"
 #include "terminal/buffer.h"
 #include "terminal/display.h"
diff --git a/src/terminal/terminal-handlers.c b/src/terminal/terminal-handlers.c
index bba2c38c..1cff2d8d 100644
--- a/src/terminal/terminal-handlers.c
+++ b/src/terminal/terminal-handlers.c
@@ -1242,7 +1242,6 @@ int guac_terminal_set_scrollback(guac_terminal* term, unsigned char c) {
 
 }
 
-
 int guac_terminal_window_title(guac_terminal* term, unsigned char c) {
 
     static int position = 0;
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index 9369db1f..60dff20f 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "common/clipboard.h"
 #include "common/cursor.h"
 #include "terminal/buffer.h"
@@ -1439,7 +1438,6 @@ int guac_terminal_resize(guac_terminal* terminal, int width, int height) {
     guac_terminal_scrollbar_set_bounds(terminal->scrollbar,
             -guac_terminal_get_available_scroll(terminal), 0);
 
-
     /* Release terminal */
     guac_terminal_unlock(terminal);
 
diff --git a/src/terminal/terminal/buffer.h b/src/terminal/terminal/buffer.h
index 00277cb9..7c7f29c5 100644
--- a/src/terminal/terminal/buffer.h
+++ b/src/terminal/terminal/buffer.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_BUFFER_H
 #define _GUAC_TERMINAL_BUFFER_H
 
@@ -27,8 +26,6 @@
  * @file buffer.h
  */
 
-
-
 #include "types.h"
 
 /**
diff --git a/src/terminal/terminal/char-mappings.h b/src/terminal/terminal/char-mappings.h
index 6d1dab0b..2e889712 100644
--- a/src/terminal/terminal/char-mappings.h
+++ b/src/terminal/terminal/char-mappings.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_CHAR_MAPPINGS_H
 #define _GUAC_TERMINAL_CHAR_MAPPINGS_H
 
@@ -27,7 +26,6 @@
  * @file char-mappings.h
  */
 
-
 /**
  * VT100 graphics mapping. Each entry is the corresponding Unicode codepoint
  * for the character N+32, where N is the index of the element in the array.
diff --git a/src/terminal/terminal/color-scheme.h b/src/terminal/terminal/color-scheme.h
index 02e24046..55665d48 100644
--- a/src/terminal/terminal/color-scheme.h
+++ b/src/terminal/terminal/color-scheme.h
@@ -26,7 +26,6 @@
  * @file color-scheme.h
  */
 
-
 #include "palette.h"
 
 #include <guacamole/client.h>
diff --git a/src/terminal/terminal/common.h b/src/terminal/terminal/common.h
index e50b702e..d5b358c5 100644
--- a/src/terminal/terminal/common.h
+++ b/src/terminal/terminal/common.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_COMMON_H
 #define _GUAC_TERMINAL_COMMON_H
 
diff --git a/src/terminal/terminal/display.h b/src/terminal/terminal/display.h
index 4c84dc56..9fe489f6 100644
--- a/src/terminal/terminal/display.h
+++ b/src/terminal/terminal/display.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_DISPLAY_H
 #define _GUAC_TERMINAL_DISPLAY_H
 
@@ -27,7 +26,6 @@
  * @file display.h
  */
 
-
 #include "common/surface.h"
 #include "palette.h"
 #include "types.h"
diff --git a/src/terminal/terminal/palette.h b/src/terminal/terminal/palette.h
index a032692e..2cc4b085 100644
--- a/src/terminal/terminal/palette.h
+++ b/src/terminal/terminal/palette.h
@@ -26,7 +26,6 @@
  * @file palette.h
  */
 
-
 #include <stdint.h>
 
 /**
diff --git a/src/terminal/terminal/scrollbar.h b/src/terminal/terminal/scrollbar.h
index 5ffdf9f9..d29e459c 100644
--- a/src/terminal/terminal/scrollbar.h
+++ b/src/terminal/terminal/scrollbar.h
@@ -26,7 +26,6 @@
  * @file scrollbar.h
  */
 
-
 #include <guacamole/client.h>
 #include <guacamole/layer.h>
 
diff --git a/src/terminal/terminal/select.h b/src/terminal/terminal/select.h
index f85eef3a..8a2d9650 100644
--- a/src/terminal/terminal/select.h
+++ b/src/terminal/terminal/select.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_TERMINAL_SELECT_H
 #define GUAC_TERMINAL_SELECT_H
 
diff --git a/src/terminal/terminal/terminal-handlers.h b/src/terminal/terminal/terminal-handlers.h
index d983ae3e..b67ffcbd 100644
--- a/src/terminal/terminal/terminal-handlers.h
+++ b/src/terminal/terminal/terminal-handlers.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_HANDLERS
 #define _GUAC_TERMINAL_HANDLERS
 
diff --git a/src/terminal/terminal/terminal-priv.h b/src/terminal/terminal/terminal-priv.h
index c937c1a7..08e2baea 100644
--- a/src/terminal/terminal/terminal-priv.h
+++ b/src/terminal/terminal/terminal-priv.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_TERMINAL_PRIV_H
 #define GUAC_TERMINAL_PRIV_H
 
diff --git a/src/terminal/terminal/terminal.h b/src/terminal/terminal/terminal.h
index cb3ed248..e71b8c56 100644
--- a/src/terminal/terminal/terminal.h
+++ b/src/terminal/terminal/terminal.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_H
 #define _GUAC_TERMINAL_H
 
diff --git a/src/terminal/terminal/types.h b/src/terminal/terminal/types.h
index 24cf7723..15333ea0 100644
--- a/src/terminal/terminal/types.h
+++ b/src/terminal/terminal/types.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef _GUAC_TERMINAL_TYPES_H
 #define _GUAC_TERMINAL_TYPES_H
 
diff --git a/src/terminal/terminal/typescript.h b/src/terminal/terminal/typescript.h
index 941dd99f..bbd8fe12 100644
--- a/src/terminal/terminal/typescript.h
+++ b/src/terminal/terminal/typescript.h
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #ifndef GUAC_TERMINAL_TYPESCRIPT_H
 #define GUAC_TERMINAL_TYPESCRIPT_H
 
@@ -28,7 +27,6 @@
  * @file typescript.h
  */
 
-
 #include <guacamole/timestamp.h>
 
 /**
diff --git a/src/terminal/terminal/xparsecolor.h b/src/terminal/terminal/xparsecolor.h
index 4550ac3c..40178710 100644
--- a/src/terminal/terminal/xparsecolor.h
+++ b/src/terminal/terminal/xparsecolor.h
@@ -26,7 +26,6 @@
  * @file xparsecolor.h
  */
 
-
 #include "palette.h"
 
 /**
diff --git a/src/terminal/xparsecolor.c b/src/terminal/xparsecolor.c
index cb589f23..ada7c086 100644
--- a/src/terminal/xparsecolor.c
+++ b/src/terminal/xparsecolor.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 #include "terminal/named-colors.h"
 #include "terminal/palette.h"