diff --git a/vstgui/lib/ctexteditor.cpp b/vstgui/lib/ctexteditor.cpp
index fcec07ea5..5b6db6b50 100644
--- a/vstgui/lib/ctexteditor.cpp
+++ b/vstgui/lib/ctexteditor.cpp
@@ -2981,3 +2981,8 @@ CView* createNewTextEditor (const CRect& r, ITextEditorController* controller)
 #undef STB_TEXTEDIT_MOVEWORDLEFT
 #undef STB_TEXTEDIT_MOVEWORDRIGHT
 #undef STB_TEXTEDIT_GETWIDTH_NEWLINE
+#undef STB_TEXTEDIT_CUSTOM_CREATEUNDO
+#undef STB_TEXTEDIT_CUSTOM_UNDO
+#undef STB_TEXTEDIT_CUSTOM_REDO
+#undef STB_TEXTEDIT_UNDOSTATECOUNT
+#undef STB_TEXTEDIT_UNDOCHARCOUNT