diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 5b31745428..bbfb3e4218 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -221,8 +221,6 @@ SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs;
 #define SWITCH_RECOMMENDED_BUFFER_SIZE 3968
 #define SWITCH_MAX_CODECS 30
 #define SWITCH_MAX_STATE_HANDLERS 30
-#define SWITCH_TRUE 1
-#define SWITCH_FALSE 0
 #define SWITCH_CORE_QUEUE_LEN 100000
 #define SWITCH_MAX_MANAGEMENT_BUFFER_LEN 1024 * 8
 
diff --git a/src/mod/event_handlers/mod_cdr/Makefile.am b/src/mod/event_handlers/mod_cdr/Makefile.am
index 007db69f33..d2277e2e67 100644
--- a/src/mod/event_handlers/mod_cdr/Makefile.am
+++ b/src/mod/event_handlers/mod_cdr/Makefile.am
@@ -1,3 +1,6 @@
+AM_CFLAGS   = $(SWITCH_AM_CFLAGS)
+AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
+AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)
 #we should set all these vars from configure, no reason to have these in each Makefile.am
 LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \
 then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool;  fi`