diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c
index f11e834..802373f 100644
--- a/drivers/dummy/dummy_driver.c
+++ b/drivers/dummy/dummy_driver.c
@@ -43,7 +43,7 @@
 void
 FakeVideoSync( dummy_driver_t *driver )
 {
-        static const int VIDEO_SYNC_PERIOD = 48000 / 30;
+        #define VIDEO_SYNC_PERIOD (48000 / 30)
         static int vidCounter = VIDEO_SYNC_PERIOD;
         
         int period = driver->period_size;
diff --git a/example-clients/tw.c b/example-clients/tw.c
index 348f7af..3ba62cc 100644
--- a/example-clients/tw.c
+++ b/example-clients/tw.c
@@ -61,6 +61,8 @@ process (jack_nframes_t nframes, void* arg)
 	jack_client_t* client = (jack_client_t*) arg;
 
 	while ((nframes = jack_thread_wait (client, _process (nframes))) != 0);
+
+	return 0;
 }
 
 /**
diff --git a/libjack/messagebuffer.c b/libjack/messagebuffer.c
index 38d2040..a636a0f 100644
--- a/libjack/messagebuffer.c
+++ b/libjack/messagebuffer.c
@@ -33,6 +33,7 @@
 
 #include <jack/messagebuffer.h>
 #include <jack/atomicity.h>
+#include <jack/internal.h>
 
 /* MB_NEXT() relies on the fact that MB_BUFFERS is a power of two */
 #define MB_BUFFERS	128
diff --git a/libjack/unlock.c b/libjack/unlock.c
index e365dad..b9a9046 100644
--- a/libjack/unlock.c
+++ b/libjack/unlock.c
@@ -25,6 +25,7 @@
 #include <sys/mman.h>
 
 #include "jack/unlock.h"
+#include "jack/internal.h"
 
 static char* blacklist[] = {
 	"/libgtk",