diff --git a/vnc/vnc.c b/vnc/vnc.c
index 86eff852..b992075e 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -29,15 +29,15 @@
 
 #define LLOG_LEVEL 1
 #define LLOGLN(_level, _args) \
-  do \
-  { \
-    if (_level < LLOG_LEVEL) \
+    do \
     { \
-        g_write("xrdp:vnc [%10.10u]: ", g_time3()); \
-        g_writeln _args ; \
+        if (_level < LLOG_LEVEL) \
+        { \
+            g_write("xrdp:vnc [%10.10u]: ", g_time3()); \
+            g_writeln _args ; \
+        } \
     } \
-  } \
-  while (0)
+    while (0)
 
 #define AS_LOG_MESSAGE log_message
 
@@ -1026,7 +1026,7 @@ lib_mod_connect(struct vnc *v)
         default:
             v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 "
                           "bpp rdp connections", 0);
-        return 1;
+            return 1;
     }
 
     if (g_strcmp(v->ip, "") == 0)
@@ -1055,7 +1055,7 @@ lib_mod_connect(struct vnc *v)
         v->server_msg(v, text, 0);
         g_sleep(v->delay_ms);
     }
-    
+
     g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port);
     v->server_msg(v, text, 0);
 
@@ -1504,7 +1504,7 @@ lib_mod_check_wait_objs(struct vnc *v)
 /******************************************************************************/
 /* return error */
 int
-lib_mod_frame_ack(struct vnc* v, int flags, int frame_id)
+lib_mod_frame_ack(struct vnc *v, int flags, int frame_id)
 {
     return 0;
 }
@@ -1512,7 +1512,7 @@ lib_mod_frame_ack(struct vnc* v, int flags, int frame_id)
 /******************************************************************************/
 /* return error */
 int
-lib_mod_suppress_output(struct vnc* v, int suppress,
+lib_mod_suppress_output(struct vnc *v, int suppress,
                         int left, int top, int right, int bottom)
 {
     int error;
diff --git a/vnc/vnc.h b/vnc/vnc.h
index 5aa83472..886f62fa 100644
--- a/vnc/vnc.h
+++ b/vnc/vnc.h
@@ -28,96 +28,96 @@
 
 struct vnc
 {
-  int size; /* size of this struct */
-  int version; /* internal version */
-  /* client functions */
-  int (*mod_start)(struct vnc* v, int w, int h, int bpp);
-  int (*mod_connect)(struct vnc* v);
-  int (*mod_event)(struct vnc* v, int msg, long param1, long param2,
-                   long param3, long param4);
-  int (*mod_signal)(struct vnc* v);
-  int (*mod_end)(struct vnc* v);
-  int (*mod_set_param)(struct vnc *v, const char *name, const char *value);
-  int (*mod_session_change)(struct vnc* v, int, int);
-  int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount,
-                           tbus* write_objs, int* wcount, int* timeout);
-  int (*mod_check_wait_objs)(struct vnc* v);
-  int (*mod_frame_ack)(struct vnc* v, int flags, int frame_id);
-  int (*mod_suppress_output)(struct vnc* v, int suppress,
-                             int left, int top, int right, int bottom);
-  tintptr mod_dumby[100 - 11]; /* align, 100 minus the number of mod
+    int size; /* size of this struct */
+    int version; /* internal version */
+    /* client functions */
+    int (*mod_start)(struct vnc *v, int w, int h, int bpp);
+    int (*mod_connect)(struct vnc *v);
+    int (*mod_event)(struct vnc *v, int msg, long param1, long param2,
+                     long param3, long param4);
+    int (*mod_signal)(struct vnc *v);
+    int (*mod_end)(struct vnc *v);
+    int (*mod_set_param)(struct vnc *v, const char *name, const char *value);
+    int (*mod_session_change)(struct vnc *v, int, int);
+    int (*mod_get_wait_objs)(struct vnc *v, tbus *read_objs, int *rcount,
+                             tbus *write_objs, int *wcount, int *timeout);
+    int (*mod_check_wait_objs)(struct vnc *v);
+    int (*mod_frame_ack)(struct vnc *v, int flags, int frame_id);
+    int (*mod_suppress_output)(struct vnc *v, int suppress,
+                               int left, int top, int right, int bottom);
+    tintptr mod_dumby[100 - 11]; /* align, 100 minus the number of mod
                                   functions above */
-  /* server functions */
-  int (*server_begin_update)(struct vnc* v);
-  int (*server_end_update)(struct vnc* v);
-  int (*server_fill_rect)(struct vnc* v, int x, int y, int cx, int cy);
-  int (*server_screen_blt)(struct vnc* v, int x, int y, int cx, int cy,
-                           int srcx, int srcy);
-  int (*server_paint_rect)(struct vnc* v, int x, int y, int cx, int cy,
-                           char* data, int width, int height, int srcx, int srcy);
-  int (*server_set_cursor)(struct vnc* v, int x, int y, char* data, char* mask);
-  int (*server_palette)(struct vnc* v, int* palette);
-  int (*server_msg)(struct vnc* v, const char *msg, int code);
-  int (*server_is_term)(struct vnc* v);
-  int (*server_set_clip)(struct vnc* v, int x, int y, int cx, int cy);
-  int (*server_reset_clip)(struct vnc* v);
-  int (*server_set_fgcolor)(struct vnc* v, int fgcolor);
-  int (*server_set_bgcolor)(struct vnc* v, int bgcolor);
-  int (*server_set_opcode)(struct vnc* v, int opcode);
-  int (*server_set_mixmode)(struct vnc* v, int mixmode);
-  int (*server_set_brush)(struct vnc* v, int x_origin, int y_origin,
-                          int style, char* pattern);
-  int (*server_set_pen)(struct vnc* v, int style,
-                        int width);
-  int (*server_draw_line)(struct vnc* v, int x1, int y1, int x2, int y2);
-  int (*server_add_char)(struct vnc* v, int font, int character,
-                         int offset, int baseline,
-                         int width, int height, char* data);
-  int (*server_draw_text)(struct vnc* v, int font,
-                          int flags, int mixmode, int clip_left, int clip_top,
-                          int clip_right, int clip_bottom,
-                          int box_left, int box_top,
-                          int box_right, int box_bottom,
-                          int x, int y, char* data, int data_len);
-  int (*server_reset)(struct vnc* v, int width, int height, int bpp);
-  int (*server_query_channel)(struct vnc* v, int index,
-                              char* channel_name,
-                              int* channel_flags);
-  int (*server_get_channel_id)(struct vnc* v, const char *name);
-  int (*server_send_to_channel)(struct vnc* v, int channel_id,
-                                char* data, int data_len,
-                                int total_data_len, int flags);
-  int (*server_bell_trigger)(struct vnc* v);
-  tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server
+    /* server functions */
+    int (*server_begin_update)(struct vnc *v);
+    int (*server_end_update)(struct vnc *v);
+    int (*server_fill_rect)(struct vnc *v, int x, int y, int cx, int cy);
+    int (*server_screen_blt)(struct vnc *v, int x, int y, int cx, int cy,
+                             int srcx, int srcy);
+    int (*server_paint_rect)(struct vnc *v, int x, int y, int cx, int cy,
+                             char *data, int width, int height, int srcx, int srcy);
+    int (*server_set_cursor)(struct vnc *v, int x, int y, char *data, char *mask);
+    int (*server_palette)(struct vnc *v, int *palette);
+    int (*server_msg)(struct vnc *v, const char *msg, int code);
+    int (*server_is_term)(struct vnc *v);
+    int (*server_set_clip)(struct vnc *v, int x, int y, int cx, int cy);
+    int (*server_reset_clip)(struct vnc *v);
+    int (*server_set_fgcolor)(struct vnc *v, int fgcolor);
+    int (*server_set_bgcolor)(struct vnc *v, int bgcolor);
+    int (*server_set_opcode)(struct vnc *v, int opcode);
+    int (*server_set_mixmode)(struct vnc *v, int mixmode);
+    int (*server_set_brush)(struct vnc *v, int x_origin, int y_origin,
+                            int style, char *pattern);
+    int (*server_set_pen)(struct vnc *v, int style,
+                          int width);
+    int (*server_draw_line)(struct vnc *v, int x1, int y1, int x2, int y2);
+    int (*server_add_char)(struct vnc *v, int font, int character,
+                           int offset, int baseline,
+                           int width, int height, char *data);
+    int (*server_draw_text)(struct vnc *v, int font,
+                            int flags, int mixmode, int clip_left, int clip_top,
+                            int clip_right, int clip_bottom,
+                            int box_left, int box_top,
+                            int box_right, int box_bottom,
+                            int x, int y, char *data, int data_len);
+    int (*server_reset)(struct vnc *v, int width, int height, int bpp);
+    int (*server_query_channel)(struct vnc *v, int index,
+                                char *channel_name,
+                                int *channel_flags);
+    int (*server_get_channel_id)(struct vnc *v, const char *name);
+    int (*server_send_to_channel)(struct vnc *v, int channel_id,
+                                  char *data, int data_len,
+                                  int total_data_len, int flags);
+    int (*server_bell_trigger)(struct vnc *v);
+    tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server
                                      functions above */
-  /* common */
-  tintptr handle; /* pointer to self as long */
-  tintptr wm;
-  tintptr painter;
-  tintptr si;
-  /* mod data */
-  int server_width;
-  int server_height;
-  int server_bpp;
-  int mod_width;
-  int mod_height;
-  int mod_bpp;
-  char mod_name[256];
-  int mod_mouse_state;
-  int palette[256];
-  int vnc_desktop;
-  char username[256];
-  char password[256];
-  char ip[256];
-  char port[256];
-  int sck_closed;
-  int shift_state; /* 0 up, 1 down */
-  int keylayout;
-  int clip_chanid;
-  struct stream *clip_data_s;
-  int delay_ms;
-  struct trans *trans;
-  int got_guid;
-  tui8 guid[16];
-  int suppress_output;
+    /* common */
+    tintptr handle; /* pointer to self as long */
+    tintptr wm;
+    tintptr painter;
+    tintptr si;
+    /* mod data */
+    int server_width;
+    int server_height;
+    int server_bpp;
+    int mod_width;
+    int mod_height;
+    int mod_bpp;
+    char mod_name[256];
+    int mod_mouse_state;
+    int palette[256];
+    int vnc_desktop;
+    char username[256];
+    char password[256];
+    char ip[256];
+    char port[256];
+    int sck_closed;
+    int shift_state; /* 0 up, 1 down */
+    int keylayout;
+    int clip_chanid;
+    struct stream *clip_data_s;
+    int delay_ms;
+    struct trans *trans;
+    int got_guid;
+    tui8 guid[16];
+    int suppress_output;
 };