diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 53734e9cc..e4320ec57 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#define _XOPEN_SOURCE
 #include <unistd.h>
 #include <crypt.h>
 #include <users.h>
diff --git a/server/core/config.c b/server/core/config.c
index 58dd42b7a..60f68a1e1 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -310,7 +310,7 @@ if((monitorhash = hashtable_alloc(5,simple_str_hash,strcmp)) == NULL)
     return 0;
 }
 
-hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL);
+hashtable_memory_fns(monitorhash,(HASHMEMORYFN)strdup,NULL,(HASHMEMORYFN)free,NULL);
 	/**
 	 * Process the data and create the services and servers defined
 	 * in the data.
diff --git a/server/modules/include/shardrouter.h b/server/modules/include/shardrouter.h
index dfd83d520..63572671e 100644
--- a/server/modules/include/shardrouter.h
+++ b/server/modules/include/shardrouter.h
@@ -245,4 +245,6 @@ typedef struct router_instance {
 #define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER :    \
         (SERVER_IS_SLAVE((b)->backend_server) ? BE_SLAVE :  BE_UNDEFINED));
 
+bool subsvc_is_valid(SUBSERVICE*);
+
 #endif /*< _SHARDROUTER_H */
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index be2fb68df..433cec8ef 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -3554,7 +3554,6 @@ static rses_property_t* rses_property_init(
 	prop->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY;
 #endif
 	
-return_prop:
 	CHK_RSES_PROP(prop);
 	return prop;
 }
diff --git a/server/modules/routing/schemarouter/shardrouter.c b/server/modules/routing/schemarouter/shardrouter.c
index 94ab35974..a0b2a4a43 100644
--- a/server/modules/routing/schemarouter/shardrouter.c
+++ b/server/modules/routing/schemarouter/shardrouter.c
@@ -319,7 +319,7 @@ parse_mapping_response(ROUTER_CLIENT_SES* rses, char* target, GWBUF* buf)
    if(PTR_IS_RESULTSET(((unsigned char*)buf->start)) &&
       modutil_count_signal_packets(buf,0,0,&more) == 2)
    {
-       ptr = (char*)buf->start;
+       ptr = (unsigned char*)buf->start;
 
        if(ptr[5] != 1)
        {