diff --git a/apps/app_flash.c b/apps/app_flash.c
index 446b2a1f8d6b2b393ad067c957e9fb094cc3224b..dea8f329bdf0cb1d47923d4723a6056f105f435f 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 eba6a69dc3715b5f61a7a61ca1e032bc8a0b7049..73a817a84498411b0093eb3948a4bf3a7fb356b2 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 bd0637edfd98ee2cb7ed7916d6fbb2969afc9558..5b1f176bc51ef77c55423b9ae32c2c8624d6979c 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 7b85f70402ed4eecfedf25c7d583358dd2406458..07b9188f88e21421b27f134a5ea2209c41c36392 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 86442b89022373aabe691d875974d79ddca1eb19..54dbdd26560300a9da43c953c95b12196bab3c01 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 43fc44c9996e5b78dcc80a704df3117399d4f62e..d6bcaaaecc08b7ffcd9f0c3a715b9e324c4ebd8d 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 96e24a4a7d551f43be8702c8c4fca273507b272e..e8410d95b4b8238c361efa6a218ce8fc05d199cd 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"