diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index 2329ce80..6c359cde 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -486,7 +486,7 @@ do_nothing_handler(int sig)
     snprintf (buf, sizeof(buf), "received signal %d during shutdown (ignored)\n", sig);
 }
 
-LIB_EXPORT sigset_t
+SERVER_EXPORT sigset_t
 jackctl_setup_signals(
     unsigned int flags)
 {
@@ -564,7 +564,7 @@ jackctl_setup_signals(
     return signals;
 }
 
-LIB_EXPORT void
+SERVER_EXPORT void
 jackctl_wait_signals(sigset_t signals)
 {
     int sig;
@@ -631,7 +631,7 @@ get_realtime_priority_constraint()
     return constraint_ptr;
 }
 
-LIB_EXPORT jackctl_server_t * jackctl_server_create(
+SERVER_EXPORT jackctl_server_t * jackctl_server_create(
     bool (* on_device_acquire)(const char * device_name),
     void (* on_device_release)(const char * device_name))
 {
@@ -813,7 +813,7 @@ fail:
     return NULL;
 }
 
-LIB_EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
+SERVER_EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
 {
     jackctl_server_free_drivers(server_ptr);
     jackctl_server_free_internals(server_ptr);
@@ -821,18 +821,18 @@ LIB_EXPORT void jackctl_server_destroy(jackctl_server *server_ptr)
     free(server_ptr);
 }
 
-LIB_EXPORT const JSList * jackctl_server_get_drivers_list(jackctl_server *server_ptr)
+SERVER_EXPORT const JSList * jackctl_server_get_drivers_list(jackctl_server *server_ptr)
 {
     return server_ptr->drivers;
 }
 
-LIB_EXPORT bool jackctl_server_stop(jackctl_server *server_ptr)
+SERVER_EXPORT bool jackctl_server_stop(jackctl_server *server_ptr)
 {
     server_ptr->engine->Stop();
     return true;
 }
 
-LIB_EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
+SERVER_EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
 {
     server_ptr->engine->Close();
     delete server_ptr->engine;
@@ -855,12 +855,12 @@ LIB_EXPORT bool jackctl_server_close(jackctl_server *server_ptr)
     return true;
 }
 
-LIB_EXPORT const JSList * jackctl_server_get_parameters(jackctl_server *server_ptr)
+SERVER_EXPORT const JSList * jackctl_server_get_parameters(jackctl_server *server_ptr)
 {
     return server_ptr->parameters;
 }
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_open(
     jackctl_server *server_ptr,
     jackctl_driver *driver_ptr)
@@ -944,7 +944,7 @@ fail:
     return false;
 }
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_start(
     jackctl_server *server_ptr)
 {
@@ -957,47 +957,47 @@ jackctl_server_start(
     return result;
 }
 
-LIB_EXPORT const char * jackctl_driver_get_name(jackctl_driver *driver_ptr)
+SERVER_EXPORT const char * jackctl_driver_get_name(jackctl_driver *driver_ptr)
 {
     return driver_ptr->desc_ptr->name;
 }
 
-LIB_EXPORT const JSList * jackctl_driver_get_parameters(jackctl_driver *driver_ptr)
+SERVER_EXPORT const JSList * jackctl_driver_get_parameters(jackctl_driver *driver_ptr)
 {
     return driver_ptr->parameters;
 }
 
-LIB_EXPORT jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver *driver_ptr)
+SERVER_EXPORT jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver *driver_ptr)
 {
     return driver_ptr->desc_ptr;
 }
 
-LIB_EXPORT const char * jackctl_parameter_get_name(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT const char * jackctl_parameter_get_name(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->name;
 }
 
-LIB_EXPORT const char * jackctl_parameter_get_short_description(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT const char * jackctl_parameter_get_short_description(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->short_description;
 }
 
-LIB_EXPORT const char * jackctl_parameter_get_long_description(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT const char * jackctl_parameter_get_long_description(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->long_description;
 }
 
-LIB_EXPORT bool jackctl_parameter_has_range_constraint(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_has_range_constraint(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_RANGE) != 0;
 }
 
-LIB_EXPORT bool jackctl_parameter_has_enum_constraint(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_has_enum_constraint(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_RANGE) == 0;
 }
 
-LIB_EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_parameter *parameter_ptr)
 {
     if (!jackctl_parameter_has_enum_constraint(parameter_ptr))
     {
@@ -1007,7 +1007,7 @@ LIB_EXPORT uint32_t jackctl_parameter_get_enum_constraints_count(jackctl_paramet
     return parameter_ptr->constraint_ptr->constraint.enumeration.count;
 }
 
-LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_value(jackctl_parameter *parameter_ptr, uint32_t index)
+SERVER_EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_value(jackctl_parameter *parameter_ptr, uint32_t index)
 {
     jack_driver_param_value_t * value_ptr;
     union jackctl_parameter_value jackctl_value;
@@ -1036,12 +1036,12 @@ LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_enum_constraint_v
     return jackctl_value;
 }
 
-LIB_EXPORT const char * jackctl_parameter_get_enum_constraint_description(jackctl_parameter *parameter_ptr, uint32_t index)
+SERVER_EXPORT const char * jackctl_parameter_get_enum_constraint_description(jackctl_parameter *parameter_ptr, uint32_t index)
 {
     return parameter_ptr->constraint_ptr->constraint.enumeration.possible_values_array[index].short_desc;
 }
 
-LIB_EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parameter_ptr, union jackctl_parameter_value * min_ptr, union jackctl_parameter_value * max_ptr)
+SERVER_EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parameter_ptr, union jackctl_parameter_value * min_ptr, union jackctl_parameter_value * max_ptr)
 {
     switch (parameter_ptr->type)
     {
@@ -1059,37 +1059,37 @@ LIB_EXPORT void jackctl_parameter_get_range_constraint(jackctl_parameter *parame
     }
 }
 
-LIB_EXPORT bool jackctl_parameter_constraint_is_strict(jackctl_parameter_t * parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_constraint_is_strict(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_STRICT) != 0;
 }
 
-LIB_EXPORT bool jackctl_parameter_constraint_is_fake_value(jackctl_parameter_t * parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_constraint_is_fake_value(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->constraint_ptr != NULL && (parameter_ptr->constraint_ptr->flags & JACK_CONSTRAINT_FLAG_FAKE_VALUE) != 0;
 }
 
-LIB_EXPORT jackctl_param_type_t jackctl_parameter_get_type(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT jackctl_param_type_t jackctl_parameter_get_type(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->type;
 }
 
-LIB_EXPORT char jackctl_parameter_get_id(jackctl_parameter_t * parameter_ptr)
+SERVER_EXPORT char jackctl_parameter_get_id(jackctl_parameter_t * parameter_ptr)
 {
     return parameter_ptr->id;
 }
 
-LIB_EXPORT bool jackctl_parameter_is_set(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_is_set(jackctl_parameter *parameter_ptr)
 {
     return parameter_ptr->is_set;
 }
 
-LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_parameter *parameter_ptr)
 {
     return *parameter_ptr->value_ptr;
 }
 
-LIB_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
 {
     if (!parameter_ptr->is_set)
     {
@@ -1103,7 +1103,7 @@ LIB_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
     return true;
 }
 
-LIB_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
+SERVER_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
 {
     bool new_driver_parameter;
 
@@ -1162,29 +1162,29 @@ LIB_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, co
     return true;
 }
 
-LIB_EXPORT union jackctl_parameter_value jackctl_parameter_get_default_value(jackctl_parameter *parameter_ptr)
+SERVER_EXPORT union jackctl_parameter_value jackctl_parameter_get_default_value(jackctl_parameter *parameter_ptr)
 {
     return *parameter_ptr->default_value_ptr;
 }
 
 // Internals clients
 
-LIB_EXPORT const JSList * jackctl_server_get_internals_list(jackctl_server *server_ptr)
+SERVER_EXPORT const JSList * jackctl_server_get_internals_list(jackctl_server *server_ptr)
 {
     return server_ptr->internals;
 }
 
-LIB_EXPORT const char * jackctl_internal_get_name(jackctl_internal *internal_ptr)
+SERVER_EXPORT const char * jackctl_internal_get_name(jackctl_internal *internal_ptr)
 {
     return internal_ptr->desc_ptr->name;
 }
 
-LIB_EXPORT const JSList * jackctl_internal_get_parameters(jackctl_internal *internal_ptr)
+SERVER_EXPORT const JSList * jackctl_internal_get_parameters(jackctl_internal *internal_ptr)
 {
     return internal_ptr->parameters;
 }
 
-LIB_EXPORT bool jackctl_server_load_internal(
+SERVER_EXPORT bool jackctl_server_load_internal(
     jackctl_server * server_ptr,
     jackctl_internal * internal)
 {
@@ -1197,7 +1197,7 @@ LIB_EXPORT bool jackctl_server_load_internal(
     }
 }
 
-LIB_EXPORT bool jackctl_server_unload_internal(
+SERVER_EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server_ptr,
     jackctl_internal * internal)
 {
@@ -1210,7 +1210,7 @@ LIB_EXPORT bool jackctl_server_unload_internal(
     }
 }
 
-LIB_EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+SERVER_EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         if (server_ptr->engine->IsRunning()) {
@@ -1230,7 +1230,7 @@ LIB_EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_dr
     }
 }
 
-LIB_EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+SERVER_EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         if (server_ptr->engine->IsRunning()) {
@@ -1253,7 +1253,7 @@ LIB_EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl
     }
 }
 
-LIB_EXPORT bool jackctl_server_switch_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+SERVER_EXPORT bool jackctl_server_switch_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         return (server_ptr->engine->SwitchMaster(driver_ptr->desc_ptr, driver_ptr->set_parameters) == 0);
diff --git a/common/JackControlAPI.h b/common/JackControlAPI.h
index b3462880..8011f9ba 100644
--- a/common/JackControlAPI.h
+++ b/common/JackControlAPI.h
@@ -80,164 +80,164 @@ extern "C" {
 } /* Adjust editor indent */
 #endif
 
-LIB_EXPORT sigset_t
+SERVER_EXPORT sigset_t
 jackctl_setup_signals(
     unsigned int flags);
 
-LIB_EXPORT void
+SERVER_EXPORT void
 jackctl_wait_signals(
     sigset_t signals);
 
-LIB_EXPORT jackctl_server_t *
+SERVER_EXPORT jackctl_server_t *
 jackctl_server_create(
     bool (* on_device_acquire)(const char * device_name),
     void (* on_device_release)(const char * device_name));
 
-LIB_EXPORT void
+SERVER_EXPORT void
 jackctl_server_destroy(
 	jackctl_server_t * server);
 
-LIB_EXPORT const JSList *
+SERVER_EXPORT const JSList *
 jackctl_server_get_drivers_list(
 	jackctl_server_t * server);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_open(
     jackctl_server_t * server,
     jackctl_driver_t * driver);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_start(
     jackctl_server_t * server);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_stop(
     jackctl_server_t * server);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_close(
     jackctl_server_t * server);
 
-LIB_EXPORT const JSList *
+SERVER_EXPORT const JSList *
 jackctl_server_get_parameters(
 	jackctl_server_t * server);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_driver_get_name(
 	jackctl_driver_t * driver);
 
-LIB_EXPORT const JSList *
+SERVER_EXPORT const JSList *
 jackctl_driver_get_parameters(
 	jackctl_driver_t * driver);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_parameter_get_name(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_parameter_get_short_description(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_parameter_get_long_description(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT jackctl_param_type_t
+SERVER_EXPORT jackctl_param_type_t
 jackctl_parameter_get_type(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT char
+SERVER_EXPORT char
 jackctl_parameter_get_id(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_is_set(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_reset(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT union jackctl_parameter_value
+SERVER_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_value(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_set_value(
 	jackctl_parameter_t * parameter,
 	const union jackctl_parameter_value * value_ptr);
 
-LIB_EXPORT union jackctl_parameter_value
+SERVER_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
 	jackctl_parameter_t * parameter);
 
-LIB_EXPORT union jackctl_parameter_value
+SERVER_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
     jackctl_parameter *parameter_ptr);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_has_range_constraint(
 	jackctl_parameter_t * parameter_ptr);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_has_enum_constraint(
 	jackctl_parameter_t * parameter_ptr);
 
-LIB_EXPORT uint32_t
+SERVER_EXPORT uint32_t
 jackctl_parameter_get_enum_constraints_count(
 	jackctl_parameter_t * parameter_ptr);
 
-LIB_EXPORT union jackctl_parameter_value
+SERVER_EXPORT union jackctl_parameter_value
 jackctl_parameter_get_enum_constraint_value(
 	jackctl_parameter_t * parameter_ptr,
 	uint32_t index);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_parameter_get_enum_constraint_description(
 	jackctl_parameter_t * parameter_ptr,
 	uint32_t index);
 
-LIB_EXPORT void
+SERVER_EXPORT void
 jackctl_parameter_get_range_constraint(
 	jackctl_parameter_t * parameter_ptr,
 	union jackctl_parameter_value * min_ptr,
 	union jackctl_parameter_value * max_ptr);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_constraint_is_strict(
 	jackctl_parameter_t * parameter_ptr);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_parameter_constraint_is_fake_value(
 	jackctl_parameter_t * parameter_ptr);
 
-LIB_EXPORT const JSList *
+SERVER_EXPORT const JSList *
 jackctl_server_get_internals_list(
     jackctl_server *server_ptr);
 
-LIB_EXPORT const char *
+SERVER_EXPORT const char *
 jackctl_internal_get_name(
     jackctl_internal *internal_ptr);
 
-LIB_EXPORT const JSList *
+SERVER_EXPORT const JSList *
 jackctl_internal_get_parameters(
     jackctl_internal *internal_ptr);
 
-LIB_EXPORT bool jackctl_server_load_internal(
+SERVER_EXPORT bool jackctl_server_load_internal(
     jackctl_server * server,
     jackctl_internal * internal);
 
-LIB_EXPORT bool jackctl_server_unload_internal(
+SERVER_EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server,
     jackctl_internal * internal);
 
-LIB_EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
+SERVER_EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-LIB_EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
+SERVER_EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-LIB_EXPORT bool
+SERVER_EXPORT bool
 jackctl_server_switch_master(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
diff --git a/common/JackDebugClient.h b/common/JackDebugClient.h
index 465d9465..f781b075 100644
--- a/common/JackDebugClient.h
+++ b/common/JackDebugClient.h
@@ -46,7 +46,7 @@ PortFollower;
 \brief A "decorator" debug client to validate API use.
 */
 
-class SERVER_EXPORT JackDebugClient : public JackClient
+class LIB_EXPORT JackDebugClient : public JackClient
 {
     protected:
 
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index ec6053f6..0caa402f 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -88,7 +88,7 @@ SERVER_EXPORT void jack_free_driver_params(JSList * driver_params)
     }
 }
 
-LIB_EXPORT int
+SERVER_EXPORT int
 jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr)
 {
     struct option * long_options;
@@ -835,7 +835,7 @@ JackDriverInfo::~JackDriverInfo()
         UnloadDriverModule(fHandle);
 }
 
-LIB_EXPORT
+SERVER_EXPORT
 jack_driver_desc_t *
 jack_driver_descriptor_construct(
     const char * name,
@@ -873,7 +873,7 @@ jack_driver_descriptor_construct(
     return desc_ptr;
 }
 
-LIB_EXPORT
+SERVER_EXPORT
 int
 jack_driver_descriptor_add_parameter(
     jack_driver_desc_t * desc_ptr,
diff --git a/common/JackGlobals.h b/common/JackGlobals.h
index 75c9b030..36d73c38 100644
--- a/common/JackGlobals.h
+++ b/common/JackGlobals.h
@@ -53,9 +53,9 @@ struct JackGlobals {
 };
 
 // Each "side" server and client will implement this to get the shared graph manager, engine control and inter-process synchro table.
-extern LIB_EXPORT JackGraphManager* GetGraphManager();
-extern LIB_EXPORT JackEngineControl* GetEngineControl();
-extern LIB_EXPORT JackSynchro* GetSynchroTable();
+extern SERVER_EXPORT JackGraphManager* GetGraphManager();
+extern SERVER_EXPORT JackEngineControl* GetEngineControl();
+extern SERVER_EXPORT JackSynchro* GetSynchroTable();
 
 } // end of namespace
 
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index 0882d5ad..12d0c671 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -38,17 +38,17 @@ JackGraphManager* JackInternalClient::fGraphManager = NULL;
 JackEngineControl* JackInternalClient::fEngineControl = NULL;
 
 // Used for external C API (JackAPI.cpp)
-LIB_EXPORT JackGraphManager* GetGraphManager()
+SERVER_EXPORT JackGraphManager* GetGraphManager()
 {
     return JackServerGlobals::fInstance->GetGraphManager();
 }
 
-LIB_EXPORT JackEngineControl* GetEngineControl()
+SERVER_EXPORT JackEngineControl* GetEngineControl()
 {
     return JackServerGlobals::fInstance->GetEngineControl();
 }
 
-LIB_EXPORT JackSynchro* GetSynchroTable()
+SERVER_EXPORT JackSynchro* GetSynchroTable()
 {
     return JackServerGlobals::fInstance->GetSynchroTable();
 }
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 403ce5d2..e0d83e76 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -42,6 +42,7 @@ extern "C"
     jack_client_t * jack_client_open_aux (const char *client_name,
             jack_options_t options,
             jack_status_t *status, va_list ap);
+
     LIB_EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
diff --git a/common/JackLibClient.h b/common/JackLibClient.h
index ef07581c..000c9aa6 100644
--- a/common/JackLibClient.h
+++ b/common/JackLibClient.h
@@ -32,7 +32,7 @@ namespace Jack
 \brief Client on the library side.
 */
 
-class SERVER_EXPORT JackLibClient : public JackClient
+class LIB_EXPORT JackLibClient : public JackClient
 {
 
     private:
diff --git a/common/JackLibGlobals.h b/common/JackLibGlobals.h
index a2f87ed1..be36cb47 100644
--- a/common/JackLibGlobals.h
+++ b/common/JackLibGlobals.h
@@ -50,7 +50,7 @@ class JackClient;
 \brief Global library static structure: singleton kind of pattern.
 */
 
-struct SERVER_EXPORT JackLibGlobals
+struct LIB_EXPORT JackLibGlobals
 {
     JackShmReadWritePtr<JackGraphManager> fGraphManager;	/*! Shared memory Port manager */
     JackShmReadWritePtr<JackEngineControl> fEngineControl;	/*! Shared engine control */  // transport engine has to be writable
diff --git a/common/JackMidiAPI.cpp b/common/JackMidiAPI.cpp
index 4e574394..c462cece 100644
--- a/common/JackMidiAPI.cpp
+++ b/common/JackMidiAPI.cpp
@@ -57,8 +57,9 @@ LIB_EXPORT
 jack_nframes_t jack_midi_get_event_count(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
-    if (!buf || !buf->IsValid())
+    if (!buf || !buf->IsValid()) {
         return 0;
+    }
     return buf->event_count;
 }
 
@@ -66,10 +67,12 @@ LIB_EXPORT
 int jack_midi_event_get(jack_midi_event_t *event, void* port_buffer, jack_nframes_t event_index)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
-    if (!buf || !buf->IsValid())
+    if (!buf || !buf->IsValid()) {
         return -EINVAL;
-    if (event_index >= buf->event_count)
+    }
+    if (event_index >= buf->event_count) {
         return -ENOBUFS;
+    }
     JackMidiEvent* ev = &buf->events[event_index];
     event->time = ev->time;
     event->size = ev->size;
@@ -81,8 +84,9 @@ LIB_EXPORT
 void jack_midi_clear_buffer(void* port_buffer)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
-    if (buf && buf->IsValid())
+    if (buf && buf->IsValid()) {
         buf->Reset(buf->nframes);
+    }
 }
 
 LIB_EXPORT
@@ -124,13 +128,16 @@ int jack_midi_event_write(void* port_buffer,
                           jack_nframes_t time, const jack_midi_data_t* data, size_t data_size)
 {
     JackMidiBuffer *buf = (JackMidiBuffer*)port_buffer;
-    if (!buf && !buf->IsValid())
+    if (!buf && !buf->IsValid()) {
         return -EINVAL;
-    if (time >= buf->nframes || (buf->event_count && buf->events[buf->event_count - 1].time > time))
+    }
+    if (time >= buf->nframes || (buf->event_count && buf->events[buf->event_count - 1].time > time)) {
         return -EINVAL;
+    }
     jack_midi_data_t* dest = buf->ReserveEvent(time, data_size);
-    if (!dest)
+    if (!dest) {
         return -ENOBUFS;
+    }
     memcpy(dest, data, data_size);
     return 0;
 }
diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp
index 9d0d030b..b754d60e 100644
--- a/common/JackNetAPI.cpp
+++ b/common/JackNetAPI.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2009 Grame
+Copyright (C) 2009-2011 Grame
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -94,10 +94,10 @@ extern "C"
     SERVER_EXPORT int jack_net_slave_activate(jack_net_slave_t* net);
     SERVER_EXPORT int jack_net_slave_deactivate(jack_net_slave_t* net);
 
-    SERVER_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t * net, JackNetSlaveProcessCallback net_callback, void *arg);
-    SERVER_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t *net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg);
-    SERVER_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t *net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg);
-    SERVER_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, JackNetSlaveShutdownCallback shutdown_callback, void *arg);
+    SERVER_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t* net, JackNetSlaveProcessCallback net_callback, void *arg);
+    SERVER_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t* net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg);
+    SERVER_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t* net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg);
+    SERVER_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t* net, JackNetSlaveShutdownCallback shutdown_callback, void *arg);
 
     // NetJack master API
 
diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index e0bccde4..0ed294c7 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -1,5 +1,4 @@
 /*
-Copyright (C) 2001 Paul Davis
 Copyright (C) 2008-2011 Romain Moret at Grame
 
 This program is free software; you can redistribute it and/or modify
diff --git a/common/JackNetDriver.h b/common/JackNetDriver.h
index 8c0ff602..786b465f 100644
--- a/common/JackNetDriver.h
+++ b/common/JackNetDriver.h
@@ -1,5 +1,4 @@
 /*
-Copyright (C) 2001 Paul Davis
 Copyright (C) 2008-2011 Romain Moret at Grame
 
 This program is free software; you can redistribute it and/or modify
diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp
index 80caa0fc..cc474594 100644
--- a/common/JackNetInterface.cpp
+++ b/common/JackNetInterface.cpp
@@ -1,5 +1,4 @@
 /*
-Copyright (C) 2001 Paul Davis
 Copyright (C) 2008-2011 Romain Moret at Grame
 
 This program is free software; you can redistribute it and/or modify
diff --git a/common/JackNetInterface.h b/common/JackNetInterface.h
index a13292e6..48b983eb 100644
--- a/common/JackNetInterface.h
+++ b/common/JackNetInterface.h
@@ -1,5 +1,4 @@
 /*
-Copyright (C) 2001 Paul Davis
 Copyright (C) 2008-2011 Romain Moret at Grame
 
 This program is free software; you can redistribute it and/or modify
diff --git a/common/JackNetManager.h b/common/JackNetManager.h
index 48b6c25c..a3c69295 100644
--- a/common/JackNetManager.h
+++ b/common/JackNetManager.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2008 Grame
+Copyright (C) 2008-2011 Romain Moret at Grame
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp
index a7bec4c6..16f86ece 100644
--- a/common/JackNetOneDriver.cpp
+++ b/common/JackNetOneDriver.cpp
@@ -1,6 +1,5 @@
 /*
-Copyright (C) 2001 Paul Davis
-Copyright (C) 2008-2011 Romain Moret at Grame
+Copyright (C) 2008-2011 Torben Horn
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/common/JackNetOneDriver.h b/common/JackNetOneDriver.h
index f0dfc165..cb2c4383 100644
--- a/common/JackNetOneDriver.h
+++ b/common/JackNetOneDriver.h
@@ -1,6 +1,5 @@
 /*
-Copyright (C) 2001 Paul Davis
-Copyright (C) 2008-2011 Romain Moret at Grame
+Copyright (C) 2008-2011 Torben Horn
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
index e5a0b057..3f637445 100644
--- a/common/JackServerAPI.cpp
+++ b/common/JackServerAPI.cpp
@@ -33,17 +33,14 @@ extern "C"
 {
 #endif
 
-    jack_client_t * jack_client_new_aux (const char *client_name,
-            jack_options_t options,
-            jack_status_t *status);
-    jack_client_t * jack_client_open_aux (const char *client_name,
-            jack_options_t options,
-            jack_status_t *status, va_list ap);
-    LIB_EXPORT jack_client_t * jack_client_open (const char *client_name,
+    jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t options, jack_status_t* status);
+    jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap);
+
+    SERVER_EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
-    LIB_EXPORT int jack_client_close (jack_client_t *client);
-    LIB_EXPORT int jack_get_client_pid (const char *name);
+    SERVER_EXPORT int jack_client_close (jack_client_t *client);
+    SERVER_EXPORT int jack_get_client_pid (const char *name);
 
 #ifdef __cplusplus
 }
@@ -153,7 +150,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
     }
 }
 
-LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
+SERVER_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
 #ifdef __CLIENTDEBUG__
     JackGlobals::CheckContext("jack_client_open");
@@ -176,7 +173,7 @@ LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_opt
     }
 }
 
-LIB_EXPORT int jack_client_close(jack_client_t* ext_client)
+SERVER_EXPORT int jack_client_close(jack_client_t* ext_client)
 {
 #ifdef __CLIENTDEBUG__
     JackGlobals::CheckContext("jack_client_close");
@@ -198,7 +195,7 @@ LIB_EXPORT int jack_client_close(jack_client_t* ext_client)
     return res;
 }
 
-LIB_EXPORT int jack_get_client_pid(const char *name)
+SERVER_EXPORT int jack_get_client_pid(const char *name)
 {
     return (JackServerGlobals::fInstance != NULL)
         ? JackServerGlobals::fInstance->GetEngine()->GetClientPID(name)
diff --git a/common/driver_interface.h b/common/driver_interface.h
index fad24137..4645c2f0 100644
--- a/common/driver_interface.h
+++ b/common/driver_interface.h
@@ -115,16 +115,16 @@ typedef struct {
 }
 jack_driver_desc_filler_t;
 
-LIB_EXPORT int jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
+SERVER_EXPORT int jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
 
-LIB_EXPORT jack_driver_desc_t *            /* newlly allocated driver descriptor, NULL on failure */
+SERVER_EXPORT jack_driver_desc_t *            /* newlly allocated driver descriptor, NULL on failure */
 jack_driver_descriptor_construct(
     const char * name,          /* driver name */
     const char * description,   /* driver description */
     jack_driver_desc_filler_t * filler); /* Pointer to stack var to be supplied to jack_driver_descriptor_add_parameter() as well.
                                             Can be NULL for drivers that have no parameters. */
 
-LIB_EXPORT int                            /* 0 on failure */
+SERVER_EXPORT int                            /* 0 on failure */
 jack_driver_descriptor_add_parameter(
     jack_driver_desc_t * driver_descr,  /* pointer to driver descriptor as returned by jack_driver_descriptor_construct() */
     jack_driver_desc_filler_t * filler, /* Pointer to the stack var that was supplied to jack_driver_descriptor_add_parameter(). */