diff --git a/common/list.c b/common/list.c
index 4597b9cb..b4530e8e 100644
--- a/common/list.c
+++ b/common/list.c
@@ -26,6 +26,7 @@
 #include "os_calls.h"
 #include "string_calls.h"
 #include "list.h"
+#include "log.h"
 
 /*****************************************************************************/
 struct list *
@@ -221,11 +222,11 @@ list_dump_items(struct list *self)
 
     if (self->count == 0)
     {
-        g_writeln("List is empty");
+        LOG_DEVEL(LOG_LEVEL_TRACE, "List is empty");
     }
 
     for (index = 0; index < self->count; index++)
     {
-        g_writeln("%d: %p", index, (void *) list_get_item(self, index));
+        LOG_DEVEL(LOG_LEVEL_TRACE, "%d: %p", index, (void *) list_get_item(self, index));
     }
 }
diff --git a/common/os_calls.c b/common/os_calls.c
index cbc86162..a725247e 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -121,9 +121,9 @@ g_mk_socket_path(const char *app_name)
             /* if failed, still check if it got created by someone else */
             if (!g_directory_exist(XRDP_SOCKET_PATH))
             {
-                log_message(LOG_LEVEL_ERROR,
-                            "g_mk_socket_path: g_create_path(%s) failed",
-                            XRDP_SOCKET_PATH);
+                LOG(LOG_LEVEL_ERROR,
+                    "g_mk_socket_path: g_create_path(%s) failed",
+                    XRDP_SOCKET_PATH);
                 return 1;
             }
         }
@@ -269,7 +269,7 @@ g_write(const char *format, ...)
 }
 
 /*****************************************************************************/
-/* produce a hex dump */
+/* print a hex dump to stdout*/
 void
 g_hexdump(const char *p, int len)
 {
@@ -360,13 +360,13 @@ g_tcp_set_no_delay(int sck)
             }
             else
             {
-                g_writeln("Error setting tcp_nodelay");
+                LOG(LOG_LEVEL_ERROR, "Error setting tcp_nodelay");
             }
         }
     }
     else
     {
-        g_writeln("Error getting tcp_nodelay");
+        LOG(LOG_LEVEL_ERROR, "Error getting tcp_nodelay");
     }
 
     return ret;
@@ -399,13 +399,13 @@ g_tcp_set_keepalive(int sck)
             }
             else
             {
-                g_writeln("Error setting tcp_keepalive");
+                LOG(LOG_LEVEL_ERROR, "Error setting tcp_keepalive");
             }
         }
     }
     else
     {
-        g_writeln("Error getting tcp_keepalive");
+        LOG(LOG_LEVEL_ERROR, "Error getting tcp_keepalive");
     }
 
     return ret;
@@ -428,12 +428,12 @@ g_tcp_socket(void)
         switch (errno)
         {
             case EAFNOSUPPORT: /* if IPv6 not supported, retry IPv4 */
-                log_message(LOG_LEVEL_INFO, "IPv6 not supported, falling back to IPv4");
+                LOG(LOG_LEVEL_INFO, "IPv6 not supported, falling back to IPv4");
                 rv = (int)socket(AF_INET, SOCK_STREAM, 0);
                 break;
 
             default:
-                log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
+                LOG(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
                 return -1;
         }
     }
@@ -442,7 +442,7 @@ g_tcp_socket(void)
 #endif
     if (rv < 0)
     {
-        log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
+        LOG(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
         return -1;
     }
 #if defined(XRDP_ENABLE_IPV6)
@@ -461,7 +461,7 @@ g_tcp_socket(void)
             if (setsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&option_value,
                            option_len) < 0)
             {
-                log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
+                LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
             }
         }
     }
@@ -477,7 +477,7 @@ g_tcp_socket(void)
             if (setsockopt(rv, SOL_SOCKET, SO_REUSEADDR, (char *)&option_value,
                            option_len) < 0)
             {
-                log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
+                LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
             }
         }
     }
@@ -494,7 +494,7 @@ g_tcp_socket(void)
             if (setsockopt(rv, SOL_SOCKET, SO_SNDBUF, (char *)&option_value,
                            option_len) < 0)
             {
-                log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
+                LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
             }
         }
     }
@@ -739,8 +739,8 @@ g_sck_close(int sck)
     }
     else
     {
-        log_message(LOG_LEVEL_WARNING, "getsockname() failed on socket %d: %s",
-                    sck, g_get_strerror());
+        LOG(LOG_LEVEL_WARNING, "getsockname() failed on socket %d: %s",
+            sck, g_get_strerror());
 
         if (errno == EBADF || errno == ENOTSOCK)
         {
@@ -752,12 +752,12 @@ g_sck_close(int sck)
 
     if (close(sck) == 0)
     {
-        log_message(LOG_LEVEL_DEBUG, "Closed socket %d (%s)", sck, sockname);
+        LOG(LOG_LEVEL_DEBUG, "Closed socket %d (%s)", sck, sockname);
     }
     else
     {
-        log_message(LOG_LEVEL_WARNING, "Cannot close socket %d (%s): %s", sck,
-                    sockname, g_get_strerror());
+        LOG(LOG_LEVEL_WARNING, "Cannot close socket %d (%s): %s", sck,
+            sockname, g_get_strerror());
     }
 
 #endif
@@ -851,8 +851,8 @@ g_tcp_connect(int sck, const char *address, const char *port)
     }
     if (res != 0)
     {
-        log_message(LOG_LEVEL_ERROR, "g_tcp_connect(%d, %s, %s): getaddrinfo() failed: %s",
-                    sck, address, port, gai_strerror(res));
+        LOG(LOG_LEVEL_ERROR, "g_tcp_connect(%d, %s, %s): getaddrinfo() failed: %s",
+            sck, address, port, gai_strerror(res));
     }
     if (res > -1)
     {
@@ -952,7 +952,7 @@ g_sck_set_non_blocking(int sck)
     i = i | O_NONBLOCK;
     if (fcntl(sck, F_SETFL, i) < 0)
     {
-        log_message(LOG_LEVEL_ERROR, "g_sck_set_non_blocking: fcntl() failed");
+        LOG(LOG_LEVEL_ERROR, "g_sck_set_non_blocking: fcntl() failed");
     }
 #endif
     return 0;
@@ -989,9 +989,9 @@ g_tcp_bind(int sck, const char *port)
         return 0;
     }
 
-    log_message(LOG_LEVEL_ERROR, "g_tcp_bind(%d, %s) failed "
-                "bind IPv6 (errno=%d) and IPv4 (errno=%d).",
-                sck, port, errno6, errno);
+    LOG(LOG_LEVEL_ERROR, "g_tcp_bind(%d, %s) failed "
+        "bind IPv6 (errno=%d) and IPv4 (errno=%d).",
+        sck, port, errno6, errno);
     return -1;
 }
 #else
@@ -1106,9 +1106,9 @@ bind_loopback(int sck, const char *port)
         return 0;
     }
 
-    log_message(LOG_LEVEL_ERROR, "bind_loopback(%d, %s) failed; "
-                "IPv6 ::1 (errno=%d), IPv4 127.0.0.1 (errno=%d) and IPv6 ::FFFF:127.0.0.1 (errno=%d).",
-                sck, port, errno6, errno4, errno);
+    LOG(LOG_LEVEL_ERROR, "bind_loopback(%d, %s) failed; "
+        "IPv6 ::1 (errno=%d), IPv4 127.0.0.1 (errno=%d) and IPv6 ::FFFF:127.0.0.1 (errno=%d).",
+        sck, port, errno6, errno4, errno);
     return -1;
 }
 
@@ -1143,7 +1143,7 @@ getaddrinfo_bind(int sck, const char *port, const char *address)
     }
     else
     {
-        log_message(LOG_LEVEL_ERROR, "getaddrinfo error: %s", gai_strerror(error));
+        LOG(LOG_LEVEL_ERROR, "getaddrinfo error: %s", gai_strerror(error));
         return -1;
     }
     return res;
@@ -1193,8 +1193,8 @@ g_tcp_bind_address(int sck, const char *port, const char *address)
             }
         }
 
-        log_message(LOG_LEVEL_ERROR, "g_tcp_bind_address(%d, %s, %s) Failed!",
-                    sck, port, address);
+        LOG(LOG_LEVEL_ERROR, "g_tcp_bind_address(%d, %s, %s) Failed!",
+            sck, port, address);
         return -1;
     }
     return 0;
@@ -1256,7 +1256,7 @@ g_tcp_accept(int sck)
                 g_snprintf(msg, sizeof(msg), "A connection received from %s port %d",
                            inet_ntoa(sock_addr_in->sin_addr),
                            ntohs(sock_addr_in->sin_port));
-                log_message(LOG_LEVEL_INFO, "%s", msg);
+                LOG(LOG_LEVEL_INFO, "%s", msg);
 
                 break;
             }
@@ -1272,7 +1272,7 @@ g_tcp_accept(int sck)
                           &sock_addr_in6->sin6_addr, addr, sizeof(addr));
                 g_snprintf(msg, sizeof(msg), "A connection received from %s port %d",
                            addr, ntohs(sock_addr_in6->sin6_port));
-                log_message(LOG_LEVEL_INFO, "%s", msg);
+                LOG(LOG_LEVEL_INFO, "%s", msg);
 
                 break;
 
@@ -1381,7 +1381,7 @@ g_sck_accept(int sck, char *addr, int addr_bytes, char *port, int port_bytes)
         }
 
 
-        log_message(LOG_LEVEL_INFO, "Socket %d: %s", ret, msg);
+        LOG(LOG_LEVEL_INFO, "Socket %d: %s", ret, msg);
 
     }
 
@@ -2009,7 +2009,7 @@ g_obj_wait(tintptr *read_objs, int rcount, tintptr *write_objs, int wcount,
     }
     else if (rcount > 0)
     {
-        g_writeln("Programming error read_objs is null");
+        LOG(LOG_LEVEL_ERROR, "Programming error read_objs is null");
         return 1; /* error */
     }
 
@@ -2032,7 +2032,7 @@ g_obj_wait(tintptr *read_objs, int rcount, tintptr *write_objs, int wcount,
     }
     else if (wcount > 0)
     {
-        g_writeln("Programming error write_objs is null");
+        LOG(LOG_LEVEL_ERROR, "Programming error write_objs is null");
         return 1; /* error */
     }
 
@@ -3164,7 +3164,9 @@ g_save_to_bmp(const char *filename, char *data, int stride_bytes,
     }
     else
     {
-        g_writeln("g_save_to_bpp: unimp");
+        LOG(LOG_LEVEL_ERROR,
+            "g_save_to_bpp: unimplemented for: depth %d, bits_per_pixel %d",
+            depth, bits_per_pixel);
         return 1;
     }
     bm.magic[0] = 'B';
@@ -3197,23 +3199,23 @@ g_save_to_bmp(const char *filename, char *data, int stride_bytes,
     fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
     if (fd == -1)
     {
-        g_writeln("g_save_to_bpp: open error");
+        LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: open error");
         return 1;
     }
     bytes = write(fd, &bm, sizeof(bm));
     if (bytes != sizeof(bm))
     {
-        g_writeln("g_save_to_bpp: write error");
+        LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
     }
     bytes = write(fd, &bh, sizeof(bh));
     if (bytes != sizeof(bh))
     {
-        g_writeln("g_save_to_bpp: write error");
+        LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
     }
     bytes = write(fd, &dh, sizeof(dh));
     if (bytes != sizeof(dh))
     {
-        g_writeln("g_save_to_bpp: write error");
+        LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
     }
     data += stride_bytes * height;
     data -= stride_bytes;
@@ -3234,7 +3236,7 @@ g_save_to_bmp(const char *filename, char *data, int stride_bytes,
             bytes = write(fd, line, file_stride_bytes);
             if (bytes != file_stride_bytes)
             {
-                g_writeln("g_save_to_bpp: write error");
+                LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
             }
             data -= stride_bytes;
         }
@@ -3247,14 +3249,16 @@ g_save_to_bmp(const char *filename, char *data, int stride_bytes,
             bytes = write(fd, data, width * (bits_per_pixel / 8));
             if (bytes != width * (bits_per_pixel / 8))
             {
-                g_writeln("g_save_to_bpp: write error");
+                LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
             }
             data -= stride_bytes;
         }
     }
     else
     {
-        g_writeln("g_save_to_bpp: unimp");
+        LOG(LOG_LEVEL_ERROR,
+            "g_save_to_bpp: unimplemented for: depth %d, bits_per_pixel %d",
+            depth, bits_per_pixel);
     }
     close(fd);
     return 0;
diff --git a/common/trans.c b/common/trans.c
index 16fa6f33..31ceef29 100644
--- a/common/trans.c
+++ b/common/trans.c
@@ -28,6 +28,7 @@
 #include "arch.h"
 #include "parse.h"
 #include "ssl_calls.h"
+#include "log.h"
 
 #define MAX_SBYTES 0
 
@@ -979,13 +980,13 @@ trans_set_tls_mode(struct trans *self, const char *key, const char *cert,
     self->tls = ssl_tls_create(self, key, cert);
     if (self->tls == NULL)
     {
-        g_writeln("trans_set_tls_mode: ssl_tls_create malloc error");
+        LOG(LOG_LEVEL_ERROR, "trans_set_tls_mode: ssl_tls_create malloc error");
         return 1;
     }
 
     if (ssl_tls_accept(self->tls, ssl_protocols, tls_ciphers) != 0)
     {
-        g_writeln("trans_set_tls_mode: ssl_tls_accept failed");
+        LOG(LOG_LEVEL_ERROR, "trans_set_tls_mode: ssl_tls_accept failed");
         return 1;
     }