diff --git a/src/examples/publisher/publisher_main.cpp b/src/examples/publisher/publisher_main.cpp
index e1034fec53..c4e79aaa6b 100644
--- a/src/examples/publisher/publisher_main.cpp
+++ b/src/examples/publisher/publisher_main.cpp
@@ -49,9 +49,9 @@ bool task_should_exit = false;
 }
 using namespace px4;
 
-int publisher_task_main(int argc, char *argv[]);
+PX4_MAIN_FUNCTION(publisher);
 
-PX4_MAIN_FUNCTION(publisher)
+extern "C" __EXPORT int publisher_main(int argc, char *argv[])
 {
 	px4::init(argc, argv, "publisher");
 
@@ -99,7 +99,7 @@ PX4_MAIN_FUNCTION(publisher)
 	return 1;
 }
 
-int publisher_task_main(int argc, char *argv[])
+PX4_MAIN_FUNCTION(publisher)
 {
 	warnx("starting");
 	PublisherExample p;
diff --git a/src/examples/subscriber/subscriber_main.cpp b/src/examples/subscriber/subscriber_main.cpp
index 32de4fd6eb..0436dc9f2b 100644
--- a/src/examples/subscriber/subscriber_main.cpp
+++ b/src/examples/subscriber/subscriber_main.cpp
@@ -49,12 +49,10 @@ bool task_should_exit = false;
 }
 using namespace px4;
 
-int subscriber_task_main(int argc, char *argv[]);
+PX4_MAIN_FUNCTION(subscriber);
 
-PX4_MAIN_FUNCTION(subscriber)
+extern "C" __EXPORT int subscriber_main(int argc, char *argv[])
 {
-	px4::init(argc, argv, "subscriber");
-
 	if (argc < 1) {
 		errx(1, "usage: subscriber {start|stop|status}");
 	}
@@ -99,8 +97,10 @@ PX4_MAIN_FUNCTION(subscriber)
 	return 1;
 }
 
-int subscriber_task_main(int argc, char *argv[])
+PX4_MAIN_FUNCTION(subscriber)
 {
+	px4::init(argc, argv, "subscriber");
+
 	warnx("starting");
 	SubscriberExample s;
 	thread_running = true;
diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index 283dc5a53c..440f1b6fcd 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -100,7 +100,7 @@ static inline px4_param_t PX4_ROS_PARAM_SET(const char *name, float value)
 #include <functional>
 #endif
 /* Main entry point */
-#define PX4_MAIN_FUNCTION(_prefix) extern "C" __EXPORT int _prefix##_main(int argc, char *argv[])
+#define PX4_MAIN_FUNCTION(_prefix) int _prefix##_task_main(int argc, char *argv[])
 
 /* Print/output wrappers */
 #define PX4_WARN warnx