diff --git a/src/client/requestbroker/RequestBroker.h b/src/client/requestbroker/RequestBroker.h
index 58084f0ad..560a33f2b 100644
--- a/src/client/requestbroker/RequestBroker.h
+++ b/src/client/requestbroker/RequestBroker.h
@@ -7,6 +7,7 @@
 #include <pthread.h>
 #undef GetUserName //God dammit microsoft!
 
+#include "Config.h"
 #include "Singleton.h"
 
 class GameSave;
@@ -39,7 +40,7 @@ private:
 	std::vector<Request*> requestQueue;
 	std::vector<Request*> activeRequests;
 
-	static void * thumbnailQueueProcessHelper(void * ref);
+	TH_ENTRY_POINT static void * thumbnailQueueProcessHelper(void * ref);
 	void thumbnailQueueProcessTH();
 	void assureRunning();
 
diff --git a/src/gui/search/SearchModel.cpp b/src/gui/search/SearchModel.cpp
index f15f6f0eb..e0168fe7b 100644
--- a/src/gui/search/SearchModel.cpp
+++ b/src/gui/search/SearchModel.cpp
@@ -47,7 +47,7 @@ void * SearchModel::updateSaveListT()
 	return saveList;
 }
 
-void * SearchModel::updateTagListTHelper(void * obj)
+TH_ENTRY_POINT void * SearchModel::updateTagListTHelper(void * obj)
 {
 	return ((SearchModel *)obj)->updateTagListT();
 }
diff --git a/src/gui/search/SearchModel.h b/src/gui/search/SearchModel.h
index 61f51d03e..4275a5012 100644
--- a/src/gui/search/SearchModel.h
+++ b/src/gui/search/SearchModel.h
@@ -42,13 +42,13 @@ private:
 	bool updateSaveListWorking;
 	volatile bool updateSaveListFinished;
 	pthread_t updateSaveListThread;
-	static void * updateSaveListTHelper(void * obj);
+	TH_ENTRY_POINT static void * updateSaveListTHelper(void * obj);
 	void * updateSaveListT();
 
 	bool updateTagListWorking;
 	volatile bool updateTagListFinished;
 	pthread_t updateTagListThread;
-	static void * updateTagListTHelper(void * obj);
+	TH_ENTRY_POINT static void * updateTagListTHelper(void * obj);
 	void * updateTagListT();
 public:
     SearchModel();
diff --git a/src/simulation/Gravity.h b/src/simulation/Gravity.h
index 31efafacb..c9c612de0 100644
--- a/src/simulation/Gravity.h
+++ b/src/simulation/Gravity.h
@@ -85,7 +85,7 @@ public:
 	void gravity_cleanup();
 	void gravity_update_async();
 
-	static void *update_grav_async_helper(void * context);
+	TH_ENTRY_POINT static void *update_grav_async_helper(void * context);
 	void update_grav_async();
 
 	void start_grav_async();
diff --git a/src/tasks/Task.h b/src/tasks/Task.h
index a7bf1c756..d562f77fc 100644
--- a/src/tasks/Task.h
+++ b/src/tasks/Task.h
@@ -41,7 +41,7 @@ protected:
 	virtual void before();
 	virtual void after();
 	virtual bool doWork();
-	static void * doWork_helper(void * ref);
+	TH_ENTRY_POINT static void * doWork_helper(void * ref);
 
 	virtual void notifyProgress(int progress);
 	virtual void notifyError(std::string error);