diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h
index b936fc88..84a3b086 100644
--- a/src/lib/arch/IArchMultithread.h
+++ b/src/lib/arch/IArchMultithread.h
@@ -71,7 +71,7 @@ barrier.  Each architecture must implement this interface.
 class IArchMultithread : public IInterface {
 public:
     //! Type of thread entry point
-    typedef void* (*ThreadFunc)(void*);
+    typedef void (*ThreadFunc)(void*);
     //! Type of thread identifier
     typedef unsigned int ThreadID;
     //! Types of signals
diff --git a/src/lib/arch/win32/ArchTaskBarWindows.cpp b/src/lib/arch/win32/ArchTaskBarWindows.cpp
index 1d8eac18..988a88c2 100644
--- a/src/lib/arch/win32/ArchTaskBarWindows.cpp
+++ b/src/lib/arch/win32/ArchTaskBarWindows.cpp
@@ -501,11 +501,9 @@ ArchTaskBarWindows::threadMainLoop()
     UnregisterClass(className, instanceWin32());
 }
 
-void*
-ArchTaskBarWindows::threadEntry(void* self)
+void ArchTaskBarWindows::threadEntry(void* self)
 {
     static_cast<ArchTaskBarWindows*>(self)->threadMainLoop();
-    return NULL;
 }
 
 HINSTANCE ArchTaskBarWindows::instanceWin32()
diff --git a/src/lib/arch/win32/ArchTaskBarWindows.h b/src/lib/arch/win32/ArchTaskBarWindows.h
index ee9e000e..6cf67f5a 100644
--- a/src/lib/arch/win32/ArchTaskBarWindows.h
+++ b/src/lib/arch/win32/ArchTaskBarWindows.h
@@ -84,7 +84,7 @@ private:
     static LRESULT CALLBACK
                         staticWndProc(HWND, UINT, WPARAM, LPARAM);
     void                threadMainLoop();
-    static void*        threadEntry(void*);
+    static void threadEntry(void*);
 
     HINSTANCE            instanceWin32();
 
diff --git a/src/lib/mt/Thread.cpp b/src/lib/mt/Thread.cpp
index 6367eb98..976a703d 100644
--- a/src/lib/mt/Thread.cpp
+++ b/src/lib/mt/Thread.cpp
@@ -126,8 +126,7 @@ Thread::operator!=(const Thread& thread) const
     return !ARCH->isSameThread(m_thread, thread.m_thread);
 }
 
-void*
-Thread::threadFunc(void* vjob)
+void Thread::threadFunc(void* vjob)
 {
     // get this thread's id for logging
     IArchMultithread::ThreadID id;
@@ -168,6 +167,4 @@ Thread::threadFunc(void* vjob)
 
     // done with job
     delete job;
-
-    return nullptr;
 }
diff --git a/src/lib/mt/Thread.h b/src/lib/mt/Thread.h
index 798539d5..1bcaefc5 100644
--- a/src/lib/mt/Thread.h
+++ b/src/lib/mt/Thread.h
@@ -192,7 +192,7 @@ public:
 private:
     Thread(ArchThread);
 
-    static void*        threadFunc(void*);
+    static void threadFunc(void*);
 
 private:
     ArchThread            m_thread;