diff --git a/Makefile b/Makefile
index 6e61fc1..1f54d94 100644
--- a/Makefile
+++ b/Makefile
@@ -6,4 +6,4 @@ LDFLAGS := $(shell pkg-config --libs ${LIBS})
 CC_COMMAND := ${CC} ${INCDIR} ${CFLAGS}
 all: build
 build:
-	${CC_COMMAND} src/util/regex.c src/util/string.c src/util/xml.c src/util/soup.c src/view/list_view_manga.c src/view/main_view.c src/manga.c src/backend/readmng.c manga.c main.c -o main ${LDFLAGS} -ggdb
+	${CC_COMMAND} src/util/regex.c src/util/string.c src/util/xml.c src/util/soup.c src/view/list_view_manga.c src/view/main_view.c src/manga.c src/backend/readmng.c src/main.c -o main ${LDFLAGS} -ggdb
diff --git a/include/openmg/util/xml.h b/include/openmg/util/xml.h
index 424fdc1..3e3c21f 100644
--- a/include/openmg/util/xml.h
+++ b/include/openmg/util/xml.h
@@ -5,8 +5,6 @@
 #include <libxml/HTMLparser.h>
 #include <libxml/xpath.h>
 
-#include <manga.h> //Nasty file
-
 G_BEGIN_DECLS;
 
 #define XML_COPY_NODE_RECURSIVE 2 | 1
diff --git a/src/backend/readmng.c b/src/backend/readmng.c
index 60ca01f..99a9f4d 100644
--- a/src/backend/readmng.c
+++ b/src/backend/readmng.c
@@ -6,8 +6,6 @@
 #include <openmg/util/xml.h>
 #include <openmg/manga.h>
 
-#include <manga.h>
-
 typedef enum {
     MG_BACKEND_READMNG_BASE_URL = 1,
     MG_BACKEND_READMNG_N_PROPERTIES
diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/src/manga.c b/src/manga.c
index a2b03b6..5a52f22 100644
--- a/src/manga.c
+++ b/src/manga.c
@@ -3,8 +3,6 @@
 #include <openmg/util/string.h>
 #include <openmg/manga.h>
 
-#include <manga.h>
-
 struct _MgManga {
     GObject parent_instance;
     char *image_url;
diff --git a/src/view/list_view_manga.c b/src/view/list_view_manga.c
index 1be882a..2abfbd3 100644
--- a/src/view/list_view_manga.c
+++ b/src/view/list_view_manga.c
@@ -5,8 +5,6 @@
 
 #include <openmg/view/list_view_manga.h>
 
-#include <manga.h>
-
 static void
 g_object_set_property_int(GObject *object, char *property_key, int value);
 static void
diff --git a/src/view/main_view.c b/src/view/main_view.c
index c2ca3d3..495624a 100644
--- a/src/view/main_view.c
+++ b/src/view/main_view.c
@@ -6,7 +6,6 @@
 #include <openmg/view/list_view_manga.h>
 
 #include <readmng.h>
-#include <manga.h>
 
 static AdwHeaderBar *
 create_headerbar (GtkBox *box);