diff --git a/bookmarks.c b/bookmarks.c
index f84ee10..e0a90ed 100644
--- a/bookmarks.c
+++ b/bookmarks.c
@@ -5,18 +5,28 @@
 #include "database.h"
 #include "document.h"
 
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+
+static int
+bookmark_compare_find(const void* item, const void* data)
+{
+  const zathura_bookmark_t* bookmark = item;
+  const char* id = data;
+
+  return g_strcmp0(bookmark->id, id);
+}
+
 zathura_bookmark_t*
 zathura_bookmark_add(zathura_t* zathura, const gchar* id, unsigned int page)
 {
   g_return_val_if_fail(zathura && zathura->document && zathura->bookmarks.bookmarks, NULL);
   g_return_val_if_fail(id, NULL);
 
-  GIRARA_LIST_FOREACH(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark)
-    if (strcmp(bookmark->id, id) == 0) {
-      girara_list_iterator_free(iter);
-      return NULL;
-    }
-  GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark);
+  zathura_bookmark_t* old = girara_list_find(zathura->bookmarks.bookmarks, bookmark_compare_find, id);
+  if (old != NULL) {
+    return NULL;
+  }
 
   zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t));
   bookmark->id = g_strdup(id);
@@ -58,14 +68,7 @@ zathura_bookmark_get(zathura_t* zathura, const gchar* id)
   g_return_val_if_fail(zathura && zathura->bookmarks.bookmarks, NULL);
   g_return_val_if_fail(id, NULL);
 
-  GIRARA_LIST_FOREACH(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark)
-    if (strcmp(bookmark->id, id) == 0) {
-      girara_list_iterator_free(iter);
-      return bookmark;
-    }
-  GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark);
-
-  return NULL;
+  return girara_list_find(zathura->bookmarks.bookmarks, bookmark_compare_find, id);
 }
 
 void
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 8443f63..f662215 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 3a80125..75cf885 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 72f314f..5ddb658 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..897da11 100644
--- a/document.c
+++ b/document.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/types.h>
@@ -15,6 +16,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <glib.h>
 
 #include "document.h"
 #include "utils.h"
@@ -22,6 +24,10 @@
 #include "render.h"
 #include "database.h"
 
+#include <girara/datastructures.h>
+#include <girara/utils.h>
+#include <girara/statusbar.h>
+
 /**
  * Register document plugin
  */
@@ -144,6 +150,47 @@ zathura_document_plugin_register(zathura_t* zathura, zathura_document_plugin_t*
   return atleastone;
 }
 
+static const gchar*
+guess_type(const char* path)
+{
+  gboolean uncertain;
+  const gchar* content_type = g_content_type_guess(path, NULL, 0, &uncertain);
+  if (content_type == NULL) {
+    return NULL;
+  }
+
+  FILE* f = fopen(path, "r");
+  if (f == NULL) {
+    return NULL;
+  }
+
+  const int fd = fileno(f);
+  guchar* content = NULL;
+  size_t length = 0u;
+  while (uncertain == TRUE) {
+    g_free((void*)content_type);
+    content_type = NULL;
+
+    content = g_realloc(content, length + BUFSIZ);
+    const ssize_t r = read(fd, content + length, BUFSIZ);
+    if (r == -1) {
+      break;
+    }
+
+    length += r;
+    content_type = g_content_type_guess(NULL, content, length, &uncertain);
+  }
+
+  fclose(f);
+  if (uncertain == TRUE) {
+    g_free((void*)content_type);
+    content_type = NULL;
+  }
+
+  g_free(content);
+  return content_type;
+}
+
 zathura_document_t*
 zathura_document_open(zathura_t* zathura, const char* path, const char* password)
 {
@@ -156,33 +203,12 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
     return NULL;
   }
 
-  gboolean uncertain;
-  const gchar* content_type = g_content_type_guess(path, NULL, 0, &uncertain);
+  const gchar* content_type = guess_type(path);
   if (content_type == NULL) {
-    girara_error("Could not determine file type");
+    girara_error("Could not determine file type.");
     return NULL;
   }
 
-  if (uncertain == TRUE) {
-    g_free((void*)content_type);
-    content_type = NULL;
-
-    gchar* contents = NULL;
-    gsize length = 0;
-    if (g_file_get_contents(path, &contents, &length, NULL) == FALSE) {
-      girara_error("Could not determine file type");
-      return NULL;
-    }
-
-    content_type = g_content_type_guess(NULL, (guchar*) contents, length, &uncertain);
-    g_free(contents);
-    if (content_type == NULL || uncertain == TRUE) {
-      g_free((void*)content_type);
-      girara_error("Could not determine file type");
-      return NULL;
-    }
-  }
-
   /* determine real path */
   long path_max;
 #ifdef PATH_MAX
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..696b570 100644
--- a/zathura.c
+++ b/zathura.c
@@ -1,11 +1,16 @@
 /* See LICENSE file for license and copyright information */
 
 #define _BSD_SOURCE
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
 
 #include <stdlib.h>
+#include <unistd.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"
@@ -348,8 +353,9 @@ document_info_open(gpointer data)
       if (file == NULL) {
         girara_notify(document_info->zathura->ui.session, GIRARA_ERROR,
             "Could not read file from stdin and write it to a temporary file.");
+      } else {
+        document_info->zathura->stdin_support.file = g_strdup(file);
       }
-      document_info->zathura->stdin_support.file = file;
     } else {
       file = g_strdup(document_info->path);
     }
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__)