Index: main/Makefile
===================================================================
--- main/Makefile	(revision 125275)
+++ main/Makefile	(working copy)
@@ -121,8 +121,8 @@
 	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o
 	rm ast_expr2.o ast_expr2f.o 
 
-channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
-asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) $(DAHDI_INCLUDE)
+asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) $(DAHDI_INCLUDE)
 
 stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW)
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 125275)
+++ configure.ac	(working copy)
@@ -1361,11 +1361,13 @@
 if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
   tonezone_dir="dahdi"
    if test "x${DAHDI_DIR}" != "x"; then
+      CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}"
       tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
    fi
 else
   tonezone_dir="zaptel"
    if test "x${ZAPTEL_DIR}" != "x"; then
+      CPPFLAGS="${CPPFLAGS} ${ZAPTEL_INCLUDE}"
       tonezone_extra="${tonezone_extra} -I${ZAPTEL_DIR}/include"
    fi
 fi