diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index d4aa5502..40e32299 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -68,7 +68,7 @@ ALL_CPP     = $(LOCAL_CPP) $(PREREQ_CPP)
 
 ALL_CSRC    = $(LOCAL_CSRC) $(PREREQ_CSRC)
 
-TEXTCLEAN   = $(wildcard *~ .*~ .*.swp *.rep \#*\#)
+TEXTCLEAN   = $(wildcard *~ .*~ .*.swp *.rep)
 INCLUDE     = -I. -I$(TOPDIR)/include -I$(MODDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE)
 LIBDIR      = $(MODDIR)/lib
 LIB         = $(LIBDIR)/lib$(LIBNAME).a
@@ -78,9 +78,9 @@ MEMBERS     = $(LIB)($(OBJ))
 #YAMD        = yamd-
 #EFENCE      = -lefence
 #CFLAGS    = -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
-#CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
-CFLAGS    = $(INCLUDE) $(PROJECT_CFLAGS)   $(LOCAL_CFLAGS)
-CPPFLAGS  = $(INCLUDE) $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS)
+CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
+CFLAGS    = $(INCLUDE) $(PROJECT_CFLAGS)   $(CFLAGS_DEBUG) $(LOCAL_CFLAGS)
+CPPFLAGS  = $(INCLUDE) $(PROJECT_CPPFLAGS) $(CFLAGS_DEBUG) $(LOCAL_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
 LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME) -lg++ -lstdc++ $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS)