diff --git a/include/reactos/debug.h b/include/reactos/debug.h
index 3cead4a47bb..11626d296f4 100644
--- a/include/reactos/debug.h
+++ b/include/reactos/debug.h
@@ -107,6 +107,11 @@ RtlAssert(
     #define WARN_(ch, fmt, ...)   DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
     #define TRACE_(ch, fmt, ...)  DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
     #define INFO_(ch, fmt, ...)   DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+    
+    #define ERR__(ch, fmt, ...)    DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+    #define WARN__(ch, fmt, ...)   DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+    #define TRACE__(ch, fmt, ...)  DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+    #define INFO__(ch, fmt, ...)   DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 #else /* not DBG */
 
     /* On non-debug builds, we never show these */
@@ -119,6 +124,11 @@ RtlAssert(
     #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
     #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
     #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+    
+    #define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+    #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+    #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+    #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
 #endif /* not DBG */
 
 #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x))
diff --git a/lib/3rdparty/icu4ros/CMakeLists.txt b/lib/3rdparty/icu4ros/CMakeLists.txt
index ddd03d62842..303dd1f6b6a 100644
--- a/lib/3rdparty/icu4ros/CMakeLists.txt
+++ b/lib/3rdparty/icu4ros/CMakeLists.txt
@@ -7,8 +7,6 @@ add_definitions(-DU_HAVE_INTTYPES_H)
 add_definitions(-DUCONFIG_NO_FILE_IO=1)
 add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
-
 set(SOURCE 
   "stubs.cpp"
   "icu/source/common/bmpset.cpp"
diff --git a/lib/nls/idna/CMakeLists.txt b/lib/nls/idna/CMakeLists.txt
index a7435a7595f..7b6d8e21ced 100644
--- a/lib/nls/idna/CMakeLists.txt
+++ b/lib/nls/idna/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-# Special C++ flags
-add_definitions(-fno-exceptions -fno-rtti)
-
 # Re-definition of WINVER
 remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
 add_definitions(-DWINVER=0x600) # And now we add our own
diff --git a/lib/nls/normalize/CMakeLists.txt b/lib/nls/normalize/CMakeLists.txt
index 31197368da5..3630a82ccbc 100644
--- a/lib/nls/normalize/CMakeLists.txt
+++ b/lib/nls/normalize/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-# Special C++ flags
-add_definitions(-fno-exceptions -fno-rtti)
-
 # Re-definition of WINVER
 remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
 add_definitions(-DWINVER=0x600) # And now we add our own
diff --git a/lib/nls/scripts/CMakeLists.txt b/lib/nls/scripts/CMakeLists.txt
index b79be4c1468..cfdcf45bad3 100644
--- a/lib/nls/scripts/CMakeLists.txt
+++ b/lib/nls/scripts/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-# Special C++ flags
-add_definitions(-fno-exceptions -fno-rtti)
-
 # Re-definition of WINVER
 remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
 add_definitions(-DWINVER=0x600) # And now we add our own