Index: src/OFNotificationCenter.m
==================================================================
--- src/OFNotificationCenter.m
+++ src/OFNotificationCenter.m
@@ -269,12 +269,14 @@
 
 - (void)removeObserver: (OFNotificationCenterHandle *)handle
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	if (![handle isKindOfClass: [OFNotificationCenterHandle class]])
+	/* {} required to avoid -Wmisleading-indentation false positive. */
+	if (![handle isKindOfClass: [OFNotificationCenterHandle class]]) {
 		@throw [OFInvalidArgumentException exception];
+	}
 
 #ifdef OF_HAVE_THREADS
 	[_mutex lock];
 	@try {
 #endif

Index: src/OFRunLoop.m
==================================================================
--- src/OFRunLoop.m
+++ src/OFRunLoop.m
@@ -1414,17 +1414,14 @@
 
 - (void)of_removeTimer: (OFTimer *)timer forMode: (OFRunLoopMode)mode
 {
 	OFRunLoopState *state = stateForMode(self, mode, false);
 
-	if (state == nil)
+	/* {} required to avoid -Wmisleading-indentation false positive. */
+	if (state == nil) {
 		return;
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wunknown-warning-option"
-#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+	}
 
 #ifdef OF_HAVE_THREADS
 	[state->_timersQueueMutex lock];
 	@try {
 #endif
@@ -1438,12 +1435,10 @@
 #ifdef OF_HAVE_THREADS
 	} @finally {
 		[state->_timersQueueMutex unlock];
 	}
 #endif
-
-#pragma GCC diagnostic pop
 }
 
 #ifdef OF_AMIGAOS
 - (void)addExecSignal: (ULONG)signal target: (id)target selector: (SEL)selector
 {