diff --git a/include/cxx/cctype b/include/cxx/cctype
index 5d3b6dc701..d3304247aa 100644
--- a/include/cxx/cctype
+++ b/include/cxx/cctype
@@ -42,6 +42,21 @@
 
 #include <ctype.h>
 
+// Remove macros in favor of real functions
+#undef isalnum
+#undef isalpha
+#undef iscntrl
+#undef isdigit
+#undef isgraph
+#undef islower
+#undef isprint
+#undef ispunct
+#undef isspace
+#undef isupper
+#undef isxdigit
+#undef tolower
+#undef toupper
+
 //***************************************************************************
 // Namespace
 //***************************************************************************