diff --git a/bookmarks.c b/bookmarks.c
index f84ee10..6841824 100644
--- a/bookmarks.c
+++ b/bookmarks.c
@@ -5,6 +5,9 @@
 #include "database.h"
 #include "document.h"
 
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+
 zathura_bookmark_t*
 zathura_bookmark_add(zathura_t* zathura, const gchar* id, unsigned int page)
 {
diff --git a/callbacks.c b/callbacks.c
index a9d0f64..662223b 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -1,6 +1,8 @@
 /* See LICENSE file for license and copyright information */
 
-#include <girara.h>
+#include <girara/statusbar.h>
+#include <girara/session.h>
+#include <girara/settings.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
diff --git a/callbacks.h b/callbacks.h
index a4edc1a..cfa7e20 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -4,7 +4,7 @@
 #define CALLBACKS_H
 
 #include <gtk/gtk.h>
-#include <girara.h>
+#include <girara/types.h>
 
 #include "zathura.h"
 
diff --git a/commands.c b/commands.c
index c98c10b..35c3ac8 100644
--- a/commands.c
+++ b/commands.c
@@ -11,6 +11,9 @@
 #include "document.h"
 #include "utils.h"
 
+#include <girara/session.h>
+#include <girara/datastructures.h>
+
 bool
 cmd_bookmark_create(girara_session_t* session, girara_list_t* argument_list)
 {
diff --git a/commands.h b/commands.h
index 1f09318..33c727a 100644
--- a/commands.h
+++ b/commands.h
@@ -4,7 +4,7 @@
 #define COMMANDS_H
 
 #include <stdbool.h>
-#include <girara.h>
+#include <girara/types.h>
 
 /**
  * Create a bookmark
diff --git a/completion.c b/completion.c
index 872dfba..f113168 100644
--- a/completion.c
+++ b/completion.c
@@ -10,6 +10,11 @@
 #include "completion.h"
 #include "utils.h"
 
+#include <girara/session.h>
+#include <girara/completion.h>
+#include <girara/utils.h>
+#include <girara/datastructures.h>
+
 girara_completion_t*
 cc_open(girara_session_t* session, const char* input)
 {
diff --git a/completion.h b/completion.h
index 947e9d8..6bead72 100644
--- a/completion.h
+++ b/completion.h
@@ -3,7 +3,7 @@
 #ifndef COMPLETION_H
 #define COMPLETION_H
 
-#include <girara.h>
+#include <girara/types.h>
 
 /**
  * Completion for the open command - Creates a list of accesible directories or
diff --git a/config.c b/config.c
index 5cf1475..d9343b7 100644
--- a/config.c
+++ b/config.c
@@ -7,6 +7,12 @@
 #include "shortcuts.h"
 #include "zathura.h"
 
+#include <girara/settings.h>
+#include <girara/session.h>
+#include <girara/shortcuts.h>
+#include <girara/config.h>
+#include <girara/commands.h>
+
 void
 config_load_default(zathura_t* zathura)
 {
diff --git a/database-plain.c b/database-plain.c
index 783e3b2..411646a 100644
--- a/database-plain.c
+++ b/database-plain.c
@@ -1,12 +1,13 @@
 /* See LICENSE file for license and copyright information */
 
-#include <girara.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <girara/utils.h>
+#include <girara/datastructures.h>
 
 #include "database.h"
 
diff --git a/database-sqlite.c b/database-sqlite.c
index a6bfa2e..6ec5d44 100644
--- a/database-sqlite.c
+++ b/database-sqlite.c
@@ -2,7 +2,8 @@
 
 #include <glib.h>
 #include <sqlite3.h>
-#include <girara.h>
+#include <girara/utils.h>
+#include <girara/datastructures.h>
 
 #include "database.h"
 
diff --git a/database.h b/database.h
index 6958b39..71a2b83 100644
--- a/database.h
+++ b/database.h
@@ -4,7 +4,7 @@
 #define DATABASE_H
 
 #include <stdbool.h>
-#include <girara.h>
+#include <girara/types.h>
 
 #include "zathura.h"
 #include "bookmarks.h"
diff --git a/document.c b/document.c
index 0285b4d..37a1db8 100644
--- a/document.c
+++ b/document.c
@@ -22,6 +22,10 @@
 #include "render.h"
 #include "database.h"
 
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+#include <girara/statusbar.h>
+
 /**
  * Register document plugin
  */
diff --git a/document.h b/document.h
index 0df6bbd..84d6a5c 100644
--- a/document.h
+++ b/document.h
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <stdbool.h>
 
-#include <girara-datastructures.h>
+#include <girara/types.h>
 #include "zathura.h"
 
 #define PLUGIN_REGISTER_FUNCTION "plugin_register"
diff --git a/print.c b/print.c
index 2c6d14d..e213c65 100644
--- a/print.c
+++ b/print.c
@@ -4,6 +4,9 @@
 #include "document.h"
 #include "render.h"
 
+#include <girara/utils.h>
+#include <girara/statusbar.h>
+
 void
 print(zathura_t* zathura)
 {
diff --git a/render.c b/render.c
index fcb2ca4..7a2f470 100644
--- a/render.c
+++ b/render.c
@@ -1,6 +1,9 @@
 /* See LICENSE file for license and copyright information */
 
 #include <math.h>
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+#include <girara/session.h>
 
 #include "render.h"
 #include "zathura.h"
diff --git a/render.h b/render.h
index a8628cf..87ef366 100644
--- a/render.h
+++ b/render.h
@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <girara-datastructures.h>
+#include <girara/types.h>
 
 #include "zathura.h"
 #include "callbacks.h"
diff --git a/shortcuts.c b/shortcuts.c
index b88d600..e41883c 100644
--- a/shortcuts.c
+++ b/shortcuts.c
@@ -1,6 +1,9 @@
 /* See LICENSE file for license and copyright information */
 
-#include <girara.h>
+#include <girara/session.h>
+#include <girara/settings.h>
+#include <girara/datastructures.h>
+#include <girara/shortcuts.h>
 #include <gtk/gtk.h>
 
 #include "callbacks.h"
diff --git a/shortcuts.h b/shortcuts.h
index 7123b08..8bf9284 100644
--- a/shortcuts.h
+++ b/shortcuts.h
@@ -3,7 +3,7 @@
 #ifndef SHORTCUTS_H
 #define SHORTCUTS_H
 
-#include <girara.h>
+#include <girara/types.h>
 
 /**
  * Abort the current action and return to normal mode
diff --git a/utils.c b/utils.c
index 4ce9462..e10dab6 100644
--- a/utils.c
+++ b/utils.c
@@ -12,6 +12,8 @@
 #include "zathura.h"
 #include "document.h"
 
+#include <girara/datastructures.h>
+
 #define BLOCK_SIZE 64
 
 bool
diff --git a/utils.h b/utils.h
index f073476..d04e75f 100644
--- a/utils.h
+++ b/utils.h
@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 #include <gtk/gtk.h>
-#include <girara.h>
+#include <girara/types.h>
 
 #include "document.h"
 
diff --git a/zathura.c b/zathura.c
index d5ee0da..ebaf12d 100644
--- a/zathura.c
+++ b/zathura.c
@@ -5,7 +5,11 @@
 
 #include <stdlib.h>
 
-#include <girara.h>
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+#include <girara/session.h>
+#include <girara/statusbar.h>
+#include <girara/settings.h>
 #include <glib/gstdio.h>
 
 #include "bookmarks.h"
diff --git a/zathura.h b/zathura.h
index df3d963..cd8b7be 100644
--- a/zathura.h
+++ b/zathura.h
@@ -4,7 +4,8 @@
 #define ZATHURA_H
 
 #include <stdbool.h>
-#include <girara.h>
+#include <girara/types.h>
+#include <gtk/gtk.h>
 
 #ifdef UNUSED
 #elif defined(__GNUC__)