diff --git a/src/client.c b/src/client.c
index 47acbb23..85e2d641 100644
--- a/src/client.c
+++ b/src/client.c
@@ -36,10 +36,10 @@
 
 #include "client.h"
 #include "logging.h"
-
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
+
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif
 
 #undef CATMODULE
 #define CATMODULE "client"
diff --git a/src/format_ogg.c b/src/format_ogg.c
index dc45969c..0b490c89 100644
--- a/src/format_ogg.c
+++ b/src/format_ogg.c
@@ -42,10 +42,10 @@
 #endif
 #include "format_midi.h"
 #include "format_flac.h"
-
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
+
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif
 
 #define CATMODULE "format-ogg"
 #include "logging.h"
diff --git a/src/slave.h b/src/slave.h
index 9164f299..e5c2fdaf 100644
--- a/src/slave.h
+++ b/src/slave.h
@@ -13,7 +13,7 @@
 #ifndef __SLAVE_H__
 #define __SLAVE_H__
 
-#include <thread/thread.h>
+#include "thread/thread.h"
 
 typedef struct _relay_server {
     char *server;
diff --git a/src/stats.c b/src/stats.c
index aff0bc1d..89bfe65c 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -23,10 +23,10 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <thread/thread.h>
-#include <avl/avl.h>
-#include <httpp/httpp.h>
-#include <net/sock.h>
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
+#include "net/sock.h"
 
 #include "connection.h"
 
diff --git a/src/yp.c b/src/yp.c
index 15131667..71483117 100644
--- a/src/yp.c
+++ b/src/yp.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <curl/curl.h>
 
-#include <thread/thread.h>
+#include "thread/thread.h"
 
 #include "connection.h"
 #include "refbuf.h"