diff --git a/common/JackExternalClient.cpp b/common/JackExternalClient.cpp
index 6dacf0da..bf164937 100644
--- a/common/JackExternalClient.cpp
+++ b/common/JackExternalClient.cpp
@@ -32,12 +32,10 @@ namespace Jack
 {
 
 JackExternalClient::JackExternalClient(): fClientControl(NULL)
-{
-}
+{}
 
 JackExternalClient::~JackExternalClient()
-{
-}
+{}
 
 int JackExternalClient::ClientNotify(int refnum, const char* name, int notify, int sync, int value1, int value2)
 {
diff --git a/common/JackGlobals.cpp b/common/JackGlobals.cpp
index d6674123..51600714 100644
--- a/common/JackGlobals.cpp
+++ b/common/JackGlobals.cpp
@@ -32,11 +32,6 @@ jack_tls_key g_key_log_function;
 // Initialisation at library load time
 #ifdef WIN32
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 static void jack_init()
 {
     if (!gKeyRealtimeInitialized) {
@@ -60,6 +55,11 @@ static void jack_uninit()
     }
 }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 BOOL WINAPI DllEntryPoint(HINSTANCE  hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     switch (fdwReason) {