diff --git a/apps/app_flash.c b/apps/app_flash.c
index 446b2a1f8d..dea8f329bd 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -37,8 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index eba6a69dc3..73a817a844 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -221,8 +221,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <sys/io.h>
 #include <math.h>
-#include <zaptel/zaptel.h>
-#include <zaptel/tonezone.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
@@ -243,6 +241,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/localtime.h"
 #include "asterisk/app.h"
 
+#include "asterisk/zapata.h"
+
 static char *app = "Rpt";
 
 static char *synopsis = "Radio Repeater/Remote Base Control System";
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index bd0637edfd..5b1f176bc5 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -44,8 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 7b85f70402..07b9188f88 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -48,7 +48,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 86442b8902..54dbdd2656 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -43,8 +43,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 43fc44c999..d6bcaaaecc 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -58,10 +58,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 #include <regex.h>
 
-#ifdef HAVE_ZAPTEL
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
-#endif
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h" 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 96e24a4a7d..e8410d95b4 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -49,9 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_ZAPTEL
-#include <zaptel/zaptel.h>
-#endif
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"