diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
index c69771890..d7c4f5d07 100644
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -52,7 +52,7 @@
 extern "C" {
 #endif
 
-FREERDP_API FRDP_BOOL
+FREERDP_API boolean
 freerdp_global_init(void);
 FREERDP_API void
 freerdp_global_finish(void);
@@ -73,7 +73,7 @@ struct rdp_inst
 	int (* rdp_get_fds)(rdpInst * inst, void ** read_fds, int * read_count,
 		void ** write_fds, int * write_count);
 	int (* rdp_check_fds)(rdpInst * inst);
-	int (* rdp_send_input_scancode)(rdpInst * inst, FRDP_BOOL up, FRDP_BOOL extended, uint8 keyCode);
+	int (* rdp_send_input_scancode)(rdpInst * inst, boolean up, boolean extended, uint8 keyCode);
 	int (* rdp_send_input_unicode)(rdpInst * inst, uint16 character);
 	int (* rdp_send_input_mouse)(rdpInst * inst, uint16 pointerFlags, uint16 xPos, uint16 yPos);
 	int (* rdp_sync_input)(rdpInst * inst, int toggle_flags);
@@ -139,10 +139,10 @@ struct rdp_inst
 	void (* ui_destroy_surface)(rdpInst * inst, FRDP_HBITMAP surface);
 	void (* ui_channel_data)(rdpInst * inst, int chan_id, char * data, int data_size,
 		int flags, int total_size);
-	FRDP_BOOL (* ui_authenticate)(rdpInst * inst);
+	boolean (* ui_authenticate)(rdpInst * inst);
 	int (* ui_decode)(rdpInst * inst, uint8 * data, int data_size);
-	FRDP_BOOL (* ui_check_certificate)(rdpInst * inst, const char * fingerprint,
-		const char * subject, const char * issuer, FRDP_BOOL verified);
+	boolean (* ui_check_certificate)(rdpInst * inst, const char * fingerprint,
+		const char * subject, const char * issuer, boolean verified);
 };
 
 FREERDP_API rdpInst *
diff --git a/include/freerdp/kbd.h b/include/freerdp/kbd.h
index 3b505afb5..c7c341b6c 100644
--- a/include/freerdp/kbd.h
+++ b/include/freerdp/kbd.h
@@ -37,8 +37,8 @@ freerdp_kbd_get_layouts(int types);
 unsigned int
 freerdp_kbd_init(void *dpy, unsigned int keyboaFRDP_layout_id);
 uint8
-freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended);
+freerdp_kbd_get_scancode_by_keycode(uint8 keycode, boolean * extended);
 uint8
-freerdp_kbd_get_scancode_by_virtualkey(int vkcode, FRDP_BOOL * extended);
+freerdp_kbd_get_scancode_by_virtualkey(int vkcode, boolean * extended);
 
 #endif /* __FREERDP_KBD_H */
diff --git a/include/freerdp/types/base.h b/include/freerdp/types/base.h
index 471708be8..a8dd99548 100644
--- a/include/freerdp/types/base.h
+++ b/include/freerdp/types/base.h
@@ -42,6 +42,6 @@ typedef signed long long sint64;
 #define False (0)
 #endif
 
-typedef int FRDP_BOOL;
+typedef int boolean;
 
 #endif
diff --git a/libfreerdp-core/tcp.c b/libfreerdp-core/tcp.c
index 183464a30..f21d5482c 100644
--- a/libfreerdp-core/tcp.c
+++ b/libfreerdp-core/tcp.c
@@ -32,7 +32,7 @@
 
 #include "tcp.h"
 
-FRDP_BOOL
+boolean
 tcp_connect(rdpTcp * tcp, const char * hostname, int port)
 {
 	int status;
@@ -81,7 +81,7 @@ tcp_connect(rdpTcp * tcp, const char * hostname, int port)
 	return True;
 }
 
-FRDP_BOOL
+boolean
 tcp_disconnect(rdpTcp * tcp)
 {
 	if (tcp->sockfd != -1)
@@ -93,8 +93,8 @@ tcp_disconnect(rdpTcp * tcp)
 	return True;
 }
 
-FRDP_BOOL
-tcp_set_blocking_mode(rdpTcp * tcp, FRDP_BOOL blocking)
+boolean
+tcp_set_blocking_mode(rdpTcp * tcp, boolean blocking)
 {
 	int flags;
 	flags = fcntl(tcp->sockfd, F_GETFL);
diff --git a/libfreerdp-core/tcp.h b/libfreerdp-core/tcp.h
index 9033b8b76..927ad1641 100644
--- a/libfreerdp-core/tcp.h
+++ b/libfreerdp-core/tcp.h
@@ -25,9 +25,9 @@
 #include <freerdp/utils/stream.h>
 
 typedef struct rdp_tcp rdpTcp;
-typedef FRDP_BOOL (*TcpConnect) (rdpTcp * tcp, const char * hostname, int port);
-typedef FRDP_BOOL (*TcpDisconnect) (rdpTcp * tcp);
-typedef FRDP_BOOL (*TcpSetBlockingMode) (rdpTcp * tcp, FRDP_BOOL blocking);
+typedef boolean (*TcpConnect) (rdpTcp * tcp, const char * hostname, int port);
+typedef boolean (*TcpDisconnect) (rdpTcp * tcp);
+typedef boolean (*TcpSetBlockingMode) (rdpTcp * tcp, boolean blocking);
 
 struct rdp_tcp
 {
@@ -37,12 +37,12 @@ struct rdp_tcp
 	TcpSetBlockingMode set_blocking_mode;
 };
 
-FRDP_BOOL
+boolean
 tcp_connect(rdpTcp * tcp, const char * hostname, int port);
-FRDP_BOOL
+boolean
 tcp_disconnect(rdpTcp * tcp);
-FRDP_BOOL
-tcp_set_blocking_mode(rdpTcp * tcp, FRDP_BOOL blocking);
+boolean
+tcp_set_blocking_mode(rdpTcp * tcp, boolean blocking);
 
 rdpTcp*
 tcp_new();
diff --git a/libfreerdp-core/tls.c b/libfreerdp-core/tls.c
index 9e92c7961..cf02fff3f 100644
--- a/libfreerdp-core/tls.c
+++ b/libfreerdp-core/tls.c
@@ -22,7 +22,7 @@
 
 #include "tls.h"
 
-FRDP_BOOL
+boolean
 tls_connect(rdpTls * tls)
 {
 	int connection_status;
@@ -59,7 +59,7 @@ tls_connect(rdpTls * tls)
 	return True;
 }
 
-FRDP_BOOL
+boolean
 tls_disconnect(rdpTls * tls)
 {
 	return True;
@@ -123,7 +123,7 @@ tls_write(rdpTls * tls, char* data, int length)
 	return bytes;
 }
 
-FRDP_BOOL
+boolean
 tls_print_error(char *func, SSL *connection, int value)
 {
 	switch (SSL_get_error(connection, value))
diff --git a/libfreerdp-core/tls.h b/libfreerdp-core/tls.h
index 525262725..6ab76384b 100644
--- a/libfreerdp-core/tls.h
+++ b/libfreerdp-core/tls.h
@@ -28,8 +28,8 @@
 #include <freerdp/utils/stream.h>
 
 typedef struct rdp_tls rdpTls;
-typedef FRDP_BOOL (*TlsConnect) (rdpTls * tls);
-typedef FRDP_BOOL (*TlsDisconnect) (rdpTls * tls);
+typedef boolean (*TlsConnect) (rdpTls * tls);
+typedef boolean (*TlsDisconnect) (rdpTls * tls);
 
 struct rdp_tls
 {
@@ -41,15 +41,15 @@ struct rdp_tls
 	TlsDisconnect disconnect;
 };
 
-FRDP_BOOL
+boolean
 tls_connect(rdpTls * tls);
-FRDP_BOOL
+boolean
 tls_disconnect(rdpTls * tls);
 int
 tls_read(rdpTls * tls, char* data, int length);
 int
 tls_write(rdpTls * tls, char* data, int length);
-FRDP_BOOL
+boolean
 tls_print_error(char *func, SSL *connection, int value);
 
 rdpTls*
diff --git a/libfreerdp-core/transport.c b/libfreerdp-core/transport.c
index 5593cc653..c10393def 100644
--- a/libfreerdp-core/transport.c
+++ b/libfreerdp-core/transport.c
@@ -34,19 +34,19 @@
 
 #define BUFFER_SIZE 16384
 
-FRDP_BOOL
+boolean
 transport_connect(rdpTransport * transport, const char * server, int port)
 {
 	return transport->tcp->connect(transport->tcp, server, port);
 }
 
-FRDP_BOOL
+boolean
 transport_disconnect(rdpTransport * transport)
 {
 	return transport->tcp->disconnect(transport->tcp);
 }
 
-FRDP_BOOL
+boolean
 transport_connect_rdp(rdpTransport * transport)
 {
 	transport->state = TRANSPORT_STATE_RDP;
@@ -56,7 +56,7 @@ transport_connect_rdp(rdpTransport * transport)
 	return True;
 }
 
-FRDP_BOOL
+boolean
 transport_connect_tls(rdpTransport * transport)
 {
 	if (transport->tls == NULL)
@@ -72,7 +72,7 @@ transport_connect_tls(rdpTransport * transport)
 	return True;
 }
 
-FRDP_BOOL
+boolean
 transport_connect_nla(rdpTransport * transport)
 {
 	if (transport->tls == NULL)
diff --git a/libfreerdp-core/transport.h b/libfreerdp-core/transport.h
index 82b53fee0..8e6d68a36 100644
--- a/libfreerdp-core/transport.h
+++ b/libfreerdp-core/transport.h
@@ -56,15 +56,15 @@ rdpTransport *
 transport_new(void);
 void
 transport_free(rdpTransport * transport);
-FRDP_BOOL
+boolean
 transport_connect(rdpTransport * transport, const char * server, int port);
-FRDP_BOOL
+boolean
 transport_disconnect(rdpTransport * transport);
-FRDP_BOOL
+boolean
 transport_connect_rdp(rdpTransport * transport);
-FRDP_BOOL
+boolean
 transport_connect_tls(rdpTransport * transport);
-FRDP_BOOL
+boolean
 transport_connect_nla(rdpTransport * transport);
 int
 transport_send(rdpTransport * transport, STREAM * stream);
diff --git a/libfreerdp-kbd/libkbd.c b/libfreerdp-kbd/libkbd.c
index f208d5086..9d7225d7e 100644
--- a/libfreerdp-kbd/libkbd.c
+++ b/libfreerdp-kbd/libkbd.c
@@ -136,7 +136,7 @@ freerdp_kbd_get_layouts(int types)
 }
 
 uint8
-freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended)
+freerdp_kbd_get_scancode_by_keycode(uint8 keycode, boolean * extended)
 {
 	DEBUG_KBD("%2x %4s -> %d/%d", keycode, x_keycode_to_rdp_keycode[keycode].keyname,
 			x_keycode_to_rdp_keycode[keycode].extended, x_keycode_to_rdp_keycode[keycode].keycode);
@@ -145,7 +145,7 @@ freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended)
 }
 
 uint8
-freerdp_kbd_get_scancode_by_virtualkey(int vkcode, FRDP_BOOL * extended)
+freerdp_kbd_get_scancode_by_virtualkey(int vkcode, boolean * extended)
 {
 	*extended = virtualKeyboard[vkcode].extended;
 	return virtualKeyboard[vkcode].scancode;