diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 41e5a6b8f2..d828b52708 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -67,7 +67,7 @@
 #include <string.h>
 #endif
 
-#ifdef HAVE_SYS_POLL_H
+#ifndef AST_POLL_COMPAT
 #include <sys/poll.h>
 #else
 #include "asterisk/poll-compat.h"
diff --git a/main/timing.c b/main/timing.c
index fbc2f21d8b..c24db2e29f 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/time.h"
 #include "asterisk/heap.h"
 #include "asterisk/module.h"
+#include "asterisk/poll-compat.h"
 
 struct timing_holder {
 	/*! Do _not_ move this from the beginning of the struct. */
@@ -290,7 +291,7 @@ static char *timing_test(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 			.events = POLLIN | POLLPRI,
 		};
 
-		res = poll(&pfd, 1, 100);
+		res = ast_poll(&pfd, 1, 100);
 
 		if (res == 1) {
 			count++;
diff --git a/utils/Makefile b/utils/Makefile
index 32c1cd5794..f123242c08 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -143,6 +143,10 @@ aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused
 aelparse: LIBS+=-lm
 aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
 
+poll.c: $(ASTTOPDIR)/main/poll.c
+	@cp "$<" "$@"
+poll.o: ASTCFLAGS+=-DSTANDALONE
+
 astobj2.c: $(ASTTOPDIR)/main/astobj2.c
 	@cp "$<" "$@"
 astobj2.o: ASTCFLAGS+=-DSTANDALONE
@@ -160,12 +164,12 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
 threadstorage.o: ASTCFLAGS+=-DSTANDALONE
 
 hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE
-hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
+hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 
-hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
+hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE
 
-refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
+refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE
 
 extconf.o: extconf.c