diff --git a/libjack/client.c b/libjack/client.c
index bbb80a1..5f5a964 100644
--- a/libjack/client.c
+++ b/libjack/client.c
@@ -34,9 +34,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#ifdef USE_MLOCK
 #include <sys/mman.h>
-#endif /* USE_MLOCK */
 
 #include <jack/internal.h>
 #include <jack/jack.h>
diff --git a/libjack/thread.c b/libjack/thread.c
index 339025f..90c3fbe 100644
--- a/libjack/thread.c
+++ b/libjack/thread.c
@@ -58,11 +58,13 @@ jack_create_thread (pthread_t* thread,
 		    void*(*start_routine)(void*),
 		    void* arg)
 {
+#ifndef JACK_USE_MACH_THREADS
 	pthread_attr_t attr;
 	int policy;
 	struct sched_param param;
 	int actual_policy;
 	struct sched_param actual_param;
+#endif /* JACK_USE_MACH_THREADS */
 	int result = 0;
 
 	if (!realtime) {
@@ -192,7 +194,7 @@ jack_create_thread (pthread_t* thread,
 	/* time constraint thread */
 	setThreadToPriority (*thread, 96, TRUE, 10000000);
 	
-#endif
+#endif /* JACK_USE_MACH_THREADS */
 
 	return 0;
 }
@@ -214,7 +216,7 @@ jack_acquire_real_time_scheduling (pthread_t thread, int priority)
 	return 0;
 }
 
-#else
+#else /* !JACK_USE_MACH_THREADS */
 
 int
 jack_drop_real_time_scheduling (pthread_t thread)
@@ -251,4 +253,4 @@ jack_acquire_real_time_scheduling (pthread_t thread, int priority)
         return 0;
 }
 
-#endif
+#endif /* JACK_USE_MACH_THREADS */