update includes due to girara restructuring

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)
 {

callbacks.c

 /* 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>
 

callbacks.h

@@ -4,7 +4,7 @@
 #define CALLBACKS_H
 
 #include <gtk/gtk.h>
-#include <girara.h>
+#include <girara/types.h>
 
 #include "zathura.h"
 

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)
 {

commands.h

@@ -4,7 +4,7 @@
 #define COMMANDS_H
 
 #include <stdbool.h>
-#include <girara.h>
+#include <girara/types.h>
 
 /**
  * Create a bookmark

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)
 {

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

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)
 {

database-plain.c

 /* 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"
 

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"
 

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"

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
  */

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"

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)
 {

render.c

 /* 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"

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"

shortcuts.c

 /* 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"

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

utils.c

@@ -12,6 +12,8 @@
 #include "zathura.h"
 #include "document.h"
 
+#include <girara/datastructures.h>
+
 #define BLOCK_SIZE 64
 
 bool

utils.h

@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 #include <gtk/gtk.h>
-#include <girara.h>
+#include <girara/types.h>
 
 #include "document.h"
 

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"

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__)