diff --git a/Makefile b/Makefile
index f0d88bc..60651c1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ $(error "$(PKG_CONFIG) failed!")
 endif
 endif
 
-CFLAGS  := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} -I. ${INCS}
-LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} -L. ${LIBS}
+CFLAGS  := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS}
+LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS}
 
 SRC := $(sort $(shell find src/ -name '*.c'))
 OBJ := ${SRC:.c=.o}
diff --git a/src/draw.h b/src/draw.h
index 581d0ca..d646dc2 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -1,7 +1,7 @@
 #ifndef DUNST_DRAW_H
 #define DUNST_DRAW_H
 
-#include "src/x11/x.h"
+#include "x11/x.h"
 extern struct window_x11 *win; // Temporary
 
 void draw_setup(void);
diff --git a/src/settings.c b/src/settings.c
index c27cc4b..aad5c9d 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "rules.h" // put before config.h to fix missing include
-#include "config.h"
+#include "../config.h"
 #include "dunst.h"
 #include "log.h"
 #include "notification.h"
diff --git a/src/x11/screen.c b/src/x11/screen.c
index af47e85..7425c03 100644
--- a/src/x11/screen.c
+++ b/src/x11/screen.c
@@ -15,9 +15,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/log.h"
-#include "src/settings.h"
-#include "src/utils.h"
+#include "../log.h"
+#include "../settings.h"
+#include "../utils.h"
 #include "x.h"
 
 struct screen_info *screens;
diff --git a/src/x11/x.c b/src/x11/x.c
index 673cd1a..d269595 100644
--- a/src/x11/x.c
+++ b/src/x11/x.c
@@ -19,16 +19,16 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "src/draw.h"
-#include "src/dbus.h"
-#include "src/dunst.h"
-#include "src/log.h"
-#include "src/markup.h"
-#include "src/menu.h"
-#include "src/notification.h"
-#include "src/queues.h"
-#include "src/settings.h"
-#include "src/utils.h"
+#include "../draw.h"
+#include "../dbus.h"
+#include "../dunst.h"
+#include "../log.h"
+#include "../markup.h"
+#include "../menu.h"
+#include "../notification.h"
+#include "../queues.h"
+#include "../settings.h"
+#include "../utils.h"
 
 #include "screen.h"
 
diff --git a/src/x11/x.h b/src/x11/x.h
index 3a644cf..0be1329 100644
--- a/src/x11/x.h
+++ b/src/x11/x.h
@@ -22,7 +22,7 @@ struct keyboard_shortcut {
 };
 
 // Cyclical dependency
-#include "src/settings.h"
+#include "../settings.h"
 
 struct window_x11;
 
diff --git a/test/markup.c b/test/markup.c
index c4afa8d..0644dd2 100644
--- a/test/markup.c
+++ b/test/markup.c
@@ -1,4 +1,4 @@
-#include "src/markup.c"
+#include "../src/markup.c"
 #include "greatest.h"
 
 TEST test_markup_strip(void)
diff --git a/test/notification.c b/test/notification.c
index 87e6ef1..6738f84 100644
--- a/test/notification.c
+++ b/test/notification.c
@@ -1,8 +1,8 @@
-#include "src/notification.c"
+#include "../src/notification.c"
 #include "greatest.h"
 
-#include "src/option_parser.h"
-#include "src/settings.h"
+#include "../src/option_parser.h"
+#include "../src/settings.h"
 
 extern const char *base;
 
diff --git a/test/option_parser.c b/test/option_parser.c
index 48c2a11..0c7f807 100644
--- a/test/option_parser.c
+++ b/test/option_parser.c
@@ -1,4 +1,4 @@
-#include "src/option_parser.c"
+#include "../src/option_parser.c"
 #include "greatest.h"
 
 extern const char *base;
diff --git a/test/test.c b/test/test.c
index 258af1d..799ef4a 100644
--- a/test/test.c
+++ b/test/test.c
@@ -5,7 +5,7 @@
 #include <libgen.h>
 #include <errno.h>
 
-#include "src/log.h"
+#include "../src/log.h"
 
 const char *base;
 
diff --git a/test/utils.c b/test/utils.c
index 04cd223..bb79375 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,4 @@
-#include "src/utils.c"
+#include "../src/utils.c"
 #include "greatest.h"
 
 TEST test_string_replace_char(void)