diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h
index 472e48c9102e51e927da4f05ea063f368ee0fc7d..a009097cc820ba9ceabc9b032e1afd56497febc0 100644
--- a/include/asterisk/stasis.h
+++ b/include/asterisk/stasis.h
@@ -614,9 +614,9 @@ void stasis_subscription_cb_noop(void *data, struct stasis_subscription *sub, st
  * has been subscribed. This occurs immediately before accepted message
  * types can be set and the callback must expect to receive it.
  */
-#ifdef AST_DEVMODE
 struct stasis_subscription *__stasis_subscribe(struct stasis_topic *topic,
 	stasis_subscription_cb callback, void *data, const char *file, int lineno, const char *func);
+#ifdef AST_DEVMODE
 #define stasis_subscribe(topic, callback, data) __stasis_subscribe(topic, callback, data, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 #else
 struct stasis_subscription *stasis_subscribe(struct stasis_topic *topic,
@@ -649,9 +649,9 @@ struct stasis_subscription *stasis_subscribe(struct stasis_topic *topic,
  * has been subscribed. This occurs immediately before accepted message
  * types can be set and the callback must expect to receive it.
  */
-#ifdef AST_DEVMODE
 struct stasis_subscription *__stasis_subscribe_pool(struct stasis_topic *topic,
 	stasis_subscription_cb callback, void *data, const char *file, int lineno, const char *func);
+#ifdef AST_DEVMODE
 #define stasis_subscribe_pool(topic, callback, data) __stasis_subscribe_pool(topic, callback, data, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 #else
 struct stasis_subscription *stasis_subscribe_pool(struct stasis_topic *topic,
diff --git a/include/asterisk/stasis_internal.h b/include/asterisk/stasis_internal.h
index c9df032210a22da17734095d27d516887b72f9b9..b3e56f129b8b65d9c48d75fec2a0cd375aab9cf2 100644
--- a/include/asterisk/stasis_internal.h
+++ b/include/asterisk/stasis_internal.h
@@ -60,7 +60,6 @@
  * \return \c NULL on error.
  * \since 12
  */
-#ifdef AST_DEVMODE
 struct stasis_subscription *internal_stasis_subscribe(
 	struct stasis_topic *topic,
 	stasis_subscription_cb callback,
@@ -70,13 +69,5 @@ struct stasis_subscription *internal_stasis_subscribe(
 	const char *file,
 	int lineno,
 	const char *func);
-#else
-struct stasis_subscription *internal_stasis_subscribe(
-	struct stasis_topic *topic,
-	stasis_subscription_cb callback,
-	void *data,
-	int needs_mailbox,
-	int use_thread_pool);
-#endif
 
 #endif /* STASIS_INTERNAL_H_ */
diff --git a/include/asterisk/stasis_message_router.h b/include/asterisk/stasis_message_router.h
index 93a2140cb46153f75d7835e16569cb65c0c29bdf..fefbea0a0e81c5514929307c144f7727bb7d6157 100644
--- a/include/asterisk/stasis_message_router.h
+++ b/include/asterisk/stasis_message_router.h
@@ -55,9 +55,9 @@ struct stasis_message_router;
  *
  * \since 12
  */
-#ifdef AST_DEVMODE
 struct stasis_message_router *__stasis_message_router_create(
 	struct stasis_topic *topic, const char *file, int lineno, const char *func);
+#ifdef AST_DEVMODE
 #define stasis_message_router_create(topic) __stasis_message_router_create(topic, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 #else
 struct stasis_message_router *stasis_message_router_create(
@@ -77,9 +77,9 @@ struct stasis_message_router *stasis_message_router_create(
  *
  * \since 12.8.0
  */
-#ifdef AST_DEVMODE
 struct stasis_message_router *__stasis_message_router_create_pool(
 	struct stasis_topic *topic, const char *file, int lineno, const char *func);
+#ifdef AST_DEVMODE
 #define stasis_message_router_create_pool(topic) __stasis_message_router_create_pool(topic, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 #else
 struct stasis_message_router *stasis_message_router_create_pool(
diff --git a/main/stasis.c b/main/stasis.c
index b9c03f1229fcda96281f1a78404b068ed8ac3a3b..5835a5aa0eaea9a7d02d3ee449893c7f30a22c54 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -438,10 +438,11 @@ struct stasis_topic *stasis_topic_create(const char *name)
 	res |= AST_VECTOR_INIT(&topic->upstream_topics, 0);
 #ifdef AST_DEVMODE
 	topic->statistics = stasis_topic_statistics_create(name);
-	if (!topic->name || !topic->statistics || res) {
+	if (!topic->name || !topic->statistics || res)
 #else
-	if (!topic->name || res) {
+	if (!topic->name || res)
 #endif
+	{
 		ao2_ref(topic, -1);
 		return NULL;
 	}
@@ -642,7 +643,6 @@ static struct stasis_subscription_statistics *stasis_subscription_statistics_cre
 }
 #endif
 
-#ifdef AST_DEVMODE
 struct stasis_subscription *internal_stasis_subscribe(
 	struct stasis_topic *topic,
 	stasis_subscription_cb callback,
@@ -652,14 +652,6 @@ struct stasis_subscription *internal_stasis_subscribe(
 	const char *file,
 	int lineno,
 	const char *func)
-#else
-struct stasis_subscription *internal_stasis_subscribe(
-	struct stasis_topic *topic,
-	stasis_subscription_cb callback,
-	void *data,
-	int needs_mailbox,
-	int use_thread_pool)
-#endif
 {
 	struct stasis_subscription *sub;
 
@@ -730,7 +722,6 @@ struct stasis_subscription *internal_stasis_subscribe(
 	return sub;
 }
 
-#ifdef AST_DEVMODE
 struct stasis_subscription *__stasis_subscribe(
 	struct stasis_topic *topic,
 	stasis_subscription_cb callback,
@@ -741,17 +732,7 @@ struct stasis_subscription *__stasis_subscribe(
 {
 	return internal_stasis_subscribe(topic, callback, data, 1, 0, file, lineno, func);
 }
-#else
-struct stasis_subscription *stasis_subscribe(
-	struct stasis_topic *topic,
-	stasis_subscription_cb callback,
-	void *data)
-{
-	return internal_stasis_subscribe(topic, callback, data, 1, 0);
-}
-#endif
 
-#ifdef AST_DEVMODE
 struct stasis_subscription *__stasis_subscribe_pool(
 	struct stasis_topic *topic,
 	stasis_subscription_cb callback,
@@ -762,15 +743,6 @@ struct stasis_subscription *__stasis_subscribe_pool(
 {
 	return internal_stasis_subscribe(topic, callback, data, 1, 1, file, lineno, func);
 }
-#else
-struct stasis_subscription *stasis_subscribe_pool(
-	struct stasis_topic *topic,
-	stasis_subscription_cb callback,
-	void *data)
-{
-	return internal_stasis_subscribe(topic, callback, data, 1, 1);
-}
-#endif
 
 static int sub_cleanup(void *data)
 {
@@ -2668,3 +2640,31 @@ int stasis_init(void)
 
 	return 0;
 }
+
+#ifdef AST_DEVMODE
+#undef stasis_subscribe
+struct stasis_subscription *stasis_subscribe(
+	struct stasis_topic *topic,
+	stasis_subscription_cb callback,
+	void *data);
+#undef stasis_subscribe_pool
+struct stasis_subscription *stasis_subscribe_pool(
+	struct stasis_topic *topic,
+	stasis_subscription_cb callback,
+	void *data);
+#endif
+struct stasis_subscription *stasis_subscribe(
+	struct stasis_topic *topic,
+	stasis_subscription_cb callback,
+	void *data)
+{
+	return internal_stasis_subscribe(topic, callback, data, 1, 0, __FILE__, __LINE__, __PRETTY_FUNCTION__);
+}
+
+struct stasis_subscription *stasis_subscribe_pool(
+	struct stasis_topic *topic,
+	stasis_subscription_cb callback,
+	void *data)
+{
+	return internal_stasis_subscribe(topic, callback, data, 1, 1, __FILE__, __LINE__, __PRETTY_FUNCTION__);
+}
diff --git a/main/stasis_cache.c b/main/stasis_cache.c
index de17bd747da2676bc1a05adfcd163ace68f9801f..c7041f1bd2f4bb50cbbc85442062e245de5c2423 100644
--- a/main/stasis_cache.c
+++ b/main/stasis_cache.c
@@ -986,11 +986,7 @@ struct stasis_caching_topic *stasis_caching_topic_create(struct stasis_topic *or
 	}
 	ast_free(new_name);
 
-#ifdef AST_DEVMODE
 	caching_topic->sub = internal_stasis_subscribe(original_topic, caching_topic_exec, caching_topic, 0, 0, __FILE__, __LINE__, __PRETTY_FUNCTION__);
-#else
-	caching_topic->sub = internal_stasis_subscribe(original_topic, caching_topic_exec, caching_topic, 0, 0);
-#endif
 	if (caching_topic->sub == NULL) {
 		ao2_ref(caching_topic, -1);
 
diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index 14752cfd61b92ef2c3d298d218550f1b6e2f07f9..8ada0dddf34b6addb7f8fb725aa86cf1cfd7bf21 100644
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -206,14 +206,9 @@ static void router_dispatch(void *data,
 	}
 }
 
-#ifdef AST_DEVMODE
 static struct stasis_message_router *stasis_message_router_create_internal(
 	struct stasis_topic *topic, int use_thread_pool, const char *file, int lineno,
 	const char *func)
-#else
-static struct stasis_message_router *stasis_message_router_create_internal(
-	struct stasis_topic *topic, int use_thread_pool)
-#endif
 {
 	int res;
 	struct stasis_message_router *router;
@@ -232,19 +227,11 @@ static struct stasis_message_router *stasis_message_router_create_internal(
 		return NULL;
 	}
 
-#ifdef AST_DEVMODE
 	if (use_thread_pool) {
 		router->subscription = __stasis_subscribe_pool(topic, router_dispatch, router, file, lineno, func);
 	} else {
 		router->subscription = __stasis_subscribe(topic, router_dispatch, router, file, lineno, func);
 	}
-#else
-	if (use_thread_pool) {
-		router->subscription = stasis_subscribe_pool(topic, router_dispatch, router);
-	} else {
-		router->subscription = stasis_subscribe(topic, router_dispatch, router);
-	}
-#endif
 
 	if (!router->subscription) {
 		ao2_ref(router, -1);
@@ -258,33 +245,17 @@ static struct stasis_message_router *stasis_message_router_create_internal(
 	return router;
 }
 
-#ifdef AST_DEVMODE
 struct stasis_message_router *__stasis_message_router_create(
 	struct stasis_topic *topic, const char *file, int lineno, const char *func)
 {
 	return stasis_message_router_create_internal(topic, 0, file, lineno, func);
 }
-#else
-struct stasis_message_router *stasis_message_router_create(
-	struct stasis_topic *topic)
-{
-	return stasis_message_router_create_internal(topic, 0);
-}
-#endif
 
-#ifdef AST_DEVMODE
 struct stasis_message_router *__stasis_message_router_create_pool(
 	struct stasis_topic *topic, const char *file, int lineno, const char *func)
 {
 	return stasis_message_router_create_internal(topic, 1, file, lineno, func);
 }
-#else
-struct stasis_message_router *stasis_message_router_create_pool(
-	struct stasis_topic *topic)
-{
-	return stasis_message_router_create_internal(topic, 1);
-}
-#endif
 
 void stasis_message_router_unsubscribe(struct stasis_message_router *router)
 {
@@ -442,3 +413,23 @@ void stasis_message_router_accept_formatters(struct stasis_message_router *route
 
 	return;
 }
+
+#ifdef AST_DEVMODE
+#undef stasis_message_router_create
+struct stasis_message_router *stasis_message_router_create(
+	struct stasis_topic *topic);
+#undef stasis_message_router_create_pool
+struct stasis_message_router *stasis_message_router_create_pool(
+	struct stasis_topic *topic);
+#endif
+struct stasis_message_router *stasis_message_router_create(
+	struct stasis_topic *topic)
+{
+	return stasis_message_router_create_internal(topic, 0, __FILE__, __LINE__, __PRETTY_FUNCTION__);
+}
+
+struct stasis_message_router *stasis_message_router_create_pool(
+	struct stasis_topic *topic)
+{
+	return stasis_message_router_create_internal(topic, 1, __FILE__, __LINE__, __PRETTY_FUNCTION__);
+}