diff --git a/client/client_shared.c b/client/client_shared.c
index 7c01aeb8..4b228ae1 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -664,11 +664,15 @@ int client_connect(struct mosquitto *mosq, struct mosq_config *cfg)
 	char err[1024];
 	int rc;
 
+#ifdef WITH_SRV
 	if(cfg->use_srv){
 		rc = mosquitto_connect_srv(mosq, cfg->host, cfg->keepalive, cfg->bind_address);
 	}else{
 		rc = mosquitto_connect_bind(mosq, cfg->host, cfg->port, cfg->keepalive, cfg->bind_address);
 	}
+#else
+	rc = mosquitto_connect_bind(mosq, cfg->host, cfg->port, cfg->keepalive, cfg->bind_address);
+#endif
 	if(rc){
 		if(!cfg->quiet){
 			if(rc == MOSQ_ERR_ERRNO){
diff --git a/client/client_shared.h b/client/client_shared.h
index 5fd994aa..aaa9efad 100644
--- a/client/client_shared.h
+++ b/client/client_shared.h
@@ -44,7 +44,9 @@ struct mosq_config {
 	long msglen; /* pub */
 	char *topic; /* pub */
 	char *bind_address;
+#ifdef WITH_SRV
 	bool use_srv;
+#endif
 	bool debug;
 	bool quiet;
 	unsigned int max_inflight;
diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
index 02594c09..78332a67 100644
--- a/lib/memory_mosq.h
+++ b/lib/memory_mosq.h
@@ -20,7 +20,7 @@ Contributors:
 #include <stdio.h>
 #include <sys/types.h>
 
-#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__)
+#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__)
 #define REAL_WITH_MEMORY_TRACKING
 #endif
 
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index acb84a53..a22bc5a5 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -28,7 +28,7 @@ Contributors:
 #include <ws2tcpip.h>
 #endif
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <sys/endian.h>
diff --git a/src/Makefile b/src/Makefile
index 1b439199..e7ef1f07 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,5 @@
+include ../config.mk
+
 .PHONY: all install uninstall clean reallyclean
 
 ifeq ($(WITH_TLS),yes)
diff --git a/src/linker-macosx.syms b/src/linker-macosx.syms
new file mode 100644
index 00000000..8e0dfa9a
--- /dev/null
+++ b/src/linker-macosx.syms
@@ -0,0 +1 @@
+mosquitto_log_printf
diff --git a/src/linker.syms b/src/linker.syms
new file mode 100644
index 00000000..83d23668
--- /dev/null
+++ b/src/linker.syms
@@ -0,0 +1,3 @@
+{
+	mosquitto_log_printf;
+};
diff --git a/src/subs.c b/src/subs.c
index d3215f58..ffdd18f6 100644
--- a/src/subs.c
+++ b/src/subs.c
@@ -654,7 +654,7 @@ static int _retain_search(struct mosquitto_db *db, struct _mosquitto_subhier *su
 			if(branch->children){
 				_retain_search(db, branch, tokens, context, sub, sub_qos, level+1);
 			}
-		}else if(strcmp(branch->topic, "+") && (!strcmp(branch->topic, tokens->topic) || !strcmp(branch->topic, "+"))){
+		}else if(strcmp(branch->topic, "+") && (!strcmp(branch->topic, tokens->topic) || !strcmp(tokens->topic, "+"))){
 			if(tokens->next){
 				if(_retain_search(db, branch, tokens->next, context, sub, sub_qos, level+1) == -1
 						|| (!branch->next && tokens->next && !strcmp(tokens->next->topic, "#") && level>0)){
diff --git a/src/sys_tree.c b/src/sys_tree.c
index 97848e35..343e6246 100644
--- a/src/sys_tree.c
+++ b/src/sys_tree.c
@@ -84,7 +84,7 @@ static void _sys_update_clients(struct mosquitto_db *db, char *buf)
 	}
 }
 
-#ifdef WITH_MEMORY_TRACKING
+#ifdef REAL_WITH_MEMORY_TRACKING
 static void _sys_update_memory(struct mosquitto_db *db, char *buf)
 {
 	static unsigned long current_heap = -1;
@@ -268,7 +268,7 @@ void mqtt3_db_sys_update(struct mosquitto_db *db, int interval, time_t start_tim
 			mqtt3_db_messages_easy_queue(db, NULL, "$SYS/broker/retained messages/count", 2, strlen(buf), buf, 1);
 		}
 
-#ifdef WITH_MEMORY_TRACKING
+#ifdef REAL_WITH_MEMORY_TRACKING
 		_sys_update_memory(db, buf);
 #endif