Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -125,11 +125,13 @@
 	OFString *_programName;
 	OFArray OF_GENERIC(OFString *) *_arguments;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_environment;
 	int *_argc;
 	char ***_argv;
+#ifdef OF_APPLICATION_M
 @public
+#endif
 	id <OFApplicationDelegate> _Nullable _delegate;
 	void (*_Nullable _SIGINTHandler)(id, SEL);
 #ifndef OF_WINDOWS
 	void (*_Nullable _SIGHUPHandler)(id, SEL);
 	void (*_Nullable _SIGUSR1Handler)(id, SEL);

Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -14,10 +14,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_APPLICATION_M
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -55,12 +55,10 @@
 #ifdef OF_HAVE_THREADS
     <OFCopying>
 {
 # ifdef OF_THREAD_M
 @public
-# else
-@private
 # endif
 	of_thread_t _thread;
 	of_thread_attr_t _attr;
 	enum of_thread_running {
 		OF_THREAD_NOT_RUNNING,

Index: src/OFThreadPool.h
==================================================================
--- src/OFThreadPool.h
+++ src/OFThreadPool.h
@@ -44,11 +44,13 @@
 @interface OFThreadPool: OFObject
 {
 	size_t _size;
 	OFMutableArray *_threads;
 	volatile int _count;
+#ifdef OF_THREAD_POOL_M
 @public
+#endif
 	OFList *_queue;
 	OFCondition *_queueCondition;
 	volatile int _doneCount;
 	OFCondition *_countCondition;
 }

Index: src/OFThreadPool.m
==================================================================
--- src/OFThreadPool.m
+++ src/OFThreadPool.m
@@ -14,10 +14,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_THREAD_POOL_M
 
 #import "OFThreadPool.h"
 #import "OFArray.h"
 #import "OFList.h"
 #import "OFThread.h"