diff --git a/src/client.c b/src/client.c
index 47acbb2309fda1b4902172b74fb1e517d1daaf3d..85e2d64196b82b13a591bbe63d7be75aa1e20ddd 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 dc45969c1967a9a38afa8d1042b0152e1979f851..0b490c89dac6e949084fb3b66833e567f9ece465 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 9164f2998c09f4bdbfaf111814c621f4152d99e2..e5c2fdaf3354e0729e90a1ff74efbe0350142dd8 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 aff0bc1d569979c9f8792d87b6e7c001c1c4e9d3..89bfe65cf5314276dc18435cecf24b645218031d 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 15131667399748a6d4193462489038e259711bf0..71483117c8c2d1ab0f1118ce53018ce24bf4e9c6 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"