diff --git a/Makefile.base.mk b/Makefile.base.mk
index 7f706fb2..5e10d7da 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -128,10 +128,6 @@ BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
 CXXFLAGS   += -fvisibility-inlines-hidden
 endif
 
-ifeq ($(DISABLE_WINDOW_LOGS),true)
-BASE_FLAGS += -DDISABLE_WINDOW_LOGS
-endif
-
 BUILD_C_FLAGS   = $(BASE_FLAGS) -std=gnu99 $(CFLAGS)
 BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++0x $(CXXFLAGS)
 LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
index c36eb9e4..0920b51e 100644
--- a/dgl/src/Window.cpp
+++ b/dgl/src/Window.cpp
@@ -61,7 +61,7 @@ extern "C" {
 #define FOR_EACH_WIDGET_INV(rit) \
   for (std::list<Widget*>::reverse_iterator rit = fWidgets.rbegin(); rit != fWidgets.rend(); ++rit)
 
-#if defined(DEBUG) && !defined(DISABLE_WINDOW_LOGS)
+#if defined(DEBUG) && defined(DGL_DEBUG_EVENTS)
 # define DBG(msg)  std::fprintf(stderr, "%s", msg);
 # define DBGp(...) std::fprintf(stderr, __VA_ARGS__);
 # define DBGF      std::fflush(stderr);