diff --git a/src/mod/applications/mod_fax/Makefile.am b/src/mod/applications/mod_fax/Makefile.am
index 10babdd75f..e512793b8f 100644
--- a/src/mod/applications/mod_fax/Makefile.am
+++ b/src/mod/applications/mod_fax/Makefile.am
@@ -10,8 +10,8 @@ SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
 SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 
 mod_LTLIBRARIES = mod_fax.la
-mod_fax_la_SOURCES  = mod_fax.c ../mod_t38gateway/udptl.c
-mod_fax_la_CFLAGS   = $(AM_CFLAGS) -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I../mod_t38gateway
+mod_fax_la_SOURCES  = mod_fax.c udptl.c
+mod_fax_la_CFLAGS   = $(AM_CFLAGS) -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
 mod_fax_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
 mod_fax_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -ljpeg
 
diff --git a/src/mod/applications/mod_fax/udptl.h b/src/mod/applications/mod_fax/udptl.h
index b0eb1b2e5a..39740353d1 100644
--- a/src/mod/applications/mod_fax/udptl.h
+++ b/src/mod/applications/mod_fax/udptl.h
@@ -22,8 +22,8 @@
  *
  */
 
-#if !defined(_UDPTL_H_)
-#define _UDPTL_H_
+#if !defined(FREESWITCH_UDPTL_H)
+#define FREESWITCH_UDPTL_H
 
 #define LOCAL_FAX_MAX_DATAGRAM      400
 #define LOCAL_FAX_MAX_FEC_PACKETS   5