diff --git a/client/client_shared.c b/client/client_shared.c
index e4d8891d..2afe2e66 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -14,6 +14,7 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 200809L
 
 #include <errno.h>
 #include <fcntl.h>
@@ -22,6 +23,7 @@ Contributors:
 #include <string.h>
 #ifndef WIN32
 #include <unistd.h>
+#include <strings.h>
 #else
 #include <process.h>
 #include <winsock2.h>
diff --git a/client/pub_client.c b/client/pub_client.c
index b39abc21..7d596ada 100644
--- a/client/pub_client.c
+++ b/client/pub_client.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+/* For nanosleep */
+#define _POSIX_C_SOURCE 200809L
 
 #include <errno.h>
 #include <fcntl.h>
@@ -21,7 +23,7 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 #ifndef WIN32
-#include <unistd.h>
+#include <time.h>
 #else
 #include <process.h>
 #include <winsock2.h>
@@ -442,7 +444,10 @@ int main(int argc, char *argv[])
 #ifdef WIN32
 				Sleep(100);
 #else
-				usleep(100000);
+				struct timespec ts;
+				ts.tv_sec = 0;
+				ts.tv_nsec = 100000000;
+				nanosleep(&ts, NULL);
 #endif
 			}
 			rc = MOSQ_ERR_SUCCESS;
diff --git a/client/sub_client_output.c b/client/sub_client_output.c
index f11f13fd..1ca207b7 100644
--- a/client/sub_client_output.c
+++ b/client/sub_client_output.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 199309L
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/config.h b/config.h
index 6d80bbd1..0b10a8f4 100644
--- a/config.h
+++ b/config.h
@@ -28,3 +28,4 @@
 #define uthash_malloc(sz) mosquitto__malloc(sz)
 #define uthash_free(ptr,sz) mosquitto__free(ptr)
 
+#define _POSIX_C_SOURCE 200809L
diff --git a/config.mk b/config.mk
index 01850274..b1476d2e 100644
--- a/config.mk
+++ b/config.mk
@@ -123,12 +123,12 @@ else
 	CFLAGS?=-Wall -ggdb -O2
 endif
 
-LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
+LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib -std=c99
 LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
 LIB_LDFLAGS:=${LDFLAGS}
 
-BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
-CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
+BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER -std=c99
+CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\"" -std=c99
 
 ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)
 	BROKER_LIBS:=-lm
diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index 575a6ebe..56a4fb1d 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -14,12 +14,15 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #ifndef WIN32
+#include <strings.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -45,8 +48,6 @@ typedef int ssize_t;
 #include "util_mosq.h"
 #include "will_mosq.h"
 
-#include "config.h"
-
 #if !defined(WIN32) && !defined(__SYMBIAN32__)
 #define HAVE_PSELECT
 #endif
diff --git a/lib/time_mosq.c b/lib/time_mosq.c
index 16a9c291..888eb644 100644
--- a/lib/time_mosq.c
+++ b/lib/time_mosq.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #ifdef __APPLE__
 #include <mach/mach.h>
 #include <mach/mach_time.h>
diff --git a/lib/tls_mosq.c b/lib/tls_mosq.c
index 2a78ab18..77557ea6 100644
--- a/lib/tls_mosq.c
+++ b/lib/tls_mosq.c
@@ -16,12 +16,15 @@ Contributors:
 
 #ifdef WITH_TLS
 
+#include "config.h"
+
 #ifdef WIN32
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #else
 #  include <arpa/inet.h>
 #  include <sys/socket.h>
+#  include <strings.h>
 #endif
 
 #include <string.h>
diff --git a/src/bridge.c b/src/bridge.c
index 6cea9995..40149910 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -27,8 +29,6 @@ Contributors:
 #include <ws2tcpip.h>
 #endif
 
-#include "config.h"
-
 #include "mosquitto.h"
 #include "mosquitto_broker_internal.h"
 #include "mosquitto_internal.h"
diff --git a/src/conf.c b/src/conf.c
index e79b79b2..7ee1736a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -14,7 +14,7 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <limits.h>
 #include <stdio.h>
@@ -25,6 +25,7 @@ Contributors:
 #ifdef WIN32
 #else
 #  include <dirent.h>
+#  include <strings.h>
 #endif
 
 #ifndef WIN32
diff --git a/src/conf_includedir.c b/src/conf_includedir.c
index 4a528d52..cf1b48f8 100644
--- a/src/conf_includedir.c
+++ b/src/conf_includedir.c
@@ -28,6 +28,7 @@ Contributors:
 #endif
 
 #ifndef WIN32
+#  include <strings.h>
 #  include <netdb.h>
 #  include <sys/socket.h>
 #else
diff --git a/src/mosquitto_passwd.c b/src/mosquitto_passwd.c
index 0523a3b4..4d62a436 100644
--- a/src/mosquitto_passwd.c
+++ b/src/mosquitto_passwd.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 200809L
+#define _BSD_SOURCE
 
 #include <errno.h>
 #include <openssl/evp.h>
diff --git a/test/broker/c/auth_plugin_v2.so b/test/broker/c/auth_plugin_v2.so
deleted file mode 100755
index 3b7d95e5..00000000
Binary files a/test/broker/c/auth_plugin_v2.so and /dev/null differ