diff --git a/Makefile b/Makefile
index 0ad7f248..49406eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ LDFLAGS = `pkg-config --libs gtk4`
 
 # Define target executable and source files
 TARGET = bin/Yoda
-SRCS =  src/main.cpp $(wildcard src/**/*.cpp)
+SRCS =  src/*.cpp\
+		src/Yoda/*.cpp\
+		src/Yoda/Browser/*.cpp
 
 OBJS = $(SRCS:.cpp=.o)
 
diff --git a/src/Yoda/Browser.h b/src/Yoda/Browser.h
index 952f2adb..101872bb 100644
--- a/src/Yoda/Browser.h
+++ b/src/Yoda/Browser.h
@@ -1,8 +1,10 @@
 #ifndef YODA_BROWSER_H
 #define YODA_BROWSER_H
 
+// Dependencies
 #include "../main.h"
 
+// Requirements
 #include "Browser/Header.h"
 
 namespace Yoda
diff --git a/src/Yoda/Browser/Header.h b/src/Yoda/Browser/Header.h
index 719148b6..1f50e6fb 100644
--- a/src/Yoda/Browser/Header.h
+++ b/src/Yoda/Browser/Header.h
@@ -1,7 +1,8 @@
 #ifndef YODA_BROWSER_HEADER_H
 #define YODA_BROWSER_HEADER_H
 
-#include "../../main.h"
+// Dependencies
+#include "../Browser.h"
 
 namespace YodaBrowser
 {