diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 6d2f6b23..6f9ba13c 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -24,10 +24,6 @@
 
 #endif	// VPN_SPEED
 
-#define	bool	UINT
-#define	BOOL	UINT
-
-
 // Version number
 #ifndef	CEDAR_VERSION_MAJOR
 #define	CEDAR_VERSION_MAJOR		0
diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c
index c11455cc..99b83dce 100644
--- a/src/Cedar/Command.c
+++ b/src/Cedar/Command.c
@@ -23025,7 +23025,7 @@ void CtEscapeCsv(wchar_t *dst, UINT size, wchar_t *src){
 	UINT i;
 	UINT len = UniStrLen(src);
 	UINT idx;
-	BOOL need_to_escape = false;
+	bool need_to_escape = false;
 	wchar_t tmp[2]=L"*";
 
 	// Check the input value
diff --git a/src/Cedar/Connection.h b/src/Cedar/Connection.h
index c846ddeb..04223f94 100644
--- a/src/Cedar/Connection.h
+++ b/src/Cedar/Connection.h
@@ -149,7 +149,7 @@ struct UDP
 // Data block
 struct BLOCK
 {
-	BOOL Compressed;				// Compression flag
+	bool Compressed;				// Compression flag
 	UINT Size;						// Block size
 	UINT SizeofData;				// Data size
 	UCHAR *Buf;						// Buffer
diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h
index 15800b41..ba3db161 100644
--- a/src/Cedar/EtherLog.h
+++ b/src/Cedar/EtherLog.h
@@ -51,7 +51,7 @@ struct RPC_ENUM_DEVICE
 // License status of the service
 struct RPC_EL_LICENSE_STATUS
 {
-	BOOL Valid;								// Enable flag
+	bool Valid;								// Enable flag
 	UINT64 SystemId;						// System ID
 	UINT64 SystemExpires;					// System expiration date
 };
@@ -74,7 +74,7 @@ struct EL_DEVICE
 // License status
 struct EL_LICENSE_STATUS
 {
-	BOOL Valid;				// Enable flag
+	bool Valid;				// Enable flag
 	UINT64 SystemId;		// System ID
 	UINT64 Expires;			// Expiration date
 };
diff --git a/src/Cedar/Radius.c b/src/Cedar/Radius.c
index 58c4edbf..e5f143b8 100644
--- a/src/Cedar/Radius.c
+++ b/src/Cedar/Radius.c
@@ -1785,7 +1785,7 @@ bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT sec
 			SOCK *sock;
 			USHORT sz = 0;
 			UINT pos = 0;
-			BOOL *finish = ZeroMallocEx(sizeof(BOOL) * LIST_NUM(ip_list), true);
+			bool *finish = ZeroMallocEx(sizeof(bool) * LIST_NUM(ip_list), true);
 
 			Zero(tmp, sizeof(tmp));
 
diff --git a/src/Cedar/Win32Com.cpp b/src/Cedar/Win32Com.cpp
index 1ad44759..bf445314 100644
--- a/src/Cedar/Win32Com.cpp
+++ b/src/Cedar/Win32Com.cpp
@@ -9,8 +9,6 @@
 
 #ifdef	WIN32
 
-#define	WIN32COM_CPP
-
 #define _WIN32_DCOM
 
 //#define	_WIN32_WINNT		0x0502
diff --git a/src/Cedar/Win32Com.h b/src/Cedar/Win32Com.h
index 9baa3a27..271d35e1 100644
--- a/src/Cedar/Win32Com.h
+++ b/src/Cedar/Win32Com.h
@@ -8,12 +8,6 @@
 #ifndef	WIN32COM_H
 #define	WIN32COM_H
 
-#ifdef	WIN32COM_CPP
-
-// Internal function
-
-#endif	// WIN32COM_CPP
-
 #if	defined(__cplusplus)
 extern "C"
 {
diff --git a/src/Cedar/WinJumpList.cpp b/src/Cedar/WinJumpList.cpp
index 2964aaf2..d3feedbc 100644
--- a/src/Cedar/WinJumpList.cpp
+++ b/src/Cedar/WinJumpList.cpp
@@ -35,9 +35,6 @@
 #undef StrCmp
 #endif
 
-
-#define	WIN32COM_CPP
-
 //#define	_WIN32_WINNT		0x0502
 //#define	WINVER				0x0502
 #include <winsock2.h>
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index d5334c3a..433b7483 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -8,6 +8,7 @@
 #ifndef	MAYATYPE_H
 #define	MAYATYPE_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 // Check whether the windows.h header is included
@@ -172,13 +173,6 @@ typedef int PID;
 typedef unsigned long PID;
 #endif // WINDOWS_H
 
-// TODO: include <stdbool.h> instead of manually defining type
-#ifndef	WIN32COM_CPP
-typedef	unsigned int		bool;
-#define	true				1
-#define	false				0
-#endif	// WIN32COM_CPP
-
 typedef int64_t  time_64t;
 
 #ifndef _BASETSD_H_