diff --git a/include/ipc-server.h b/include/ipc-server.h
index 35b3748b..5ac255cf 100644
--- a/include/ipc-server.h
+++ b/include/ipc-server.h
@@ -9,5 +9,6 @@ void ipc_terminate(void);
 struct sockaddr_un *ipc_user_sockaddr(void);
 
 void ipc_event_workspace(swayc_t *old, swayc_t *new);
+const char *swayc_type_string(enum swayc_types type);
 
 #endif
diff --git a/include/layout.h b/include/layout.h
index a3cf006a..62e4c202 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -2,6 +2,7 @@
 #define _SWAY_LAYOUT_H
 
 #include <wlc/wlc.h>
+#include "log.h"
 #include "list.h"
 #include "container.h"
 #include "focus.h"
@@ -59,4 +60,7 @@ swayc_t *get_swayc_in_direction_under(swayc_t *container, enum movement_directio
 
 void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge);
 
+void layout_log(const swayc_t *c, int depth);
+void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ...) __attribute__((format(printf,3,4)));
+
 #endif
diff --git a/include/log.h b/include/log.h
index eada025e..268783f4 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,7 +1,6 @@
 #ifndef _SWAY_LOG_H
 #define _SWAY_LOG_H
 #include <stdbool.h>
-#include "container.h"
 
 typedef enum {
 	L_SILENT = 0,
@@ -35,7 +34,4 @@ void _sway_log(log_importance_t verbosity, const char* format, ...) __attribute_
 
 void error_handler(int sig);
 
-void layout_log(const swayc_t *c, int depth);
-const char *swayc_type_string(enum swayc_types type);
-void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ...) __attribute__((format(printf,3,4)));
 #endif
diff --git a/swaybg/main.c b/swaybg/main.c
index 73a8de0a..ec64ddb7 100644
--- a/swaybg/main.c
+++ b/swaybg/main.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <wayland-client.h>
 #include <time.h>
+#include <string.h>
 #include "client/window.h"
 #include "client/registry.h"
 #include "log.h"
diff --git a/swaygrab/main.c b/swaygrab/main.c
index 99d5f88b..092fc1b3 100644
--- a/swaygrab/main.c
+++ b/swaygrab/main.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <math.h>
 #include <time.h>
 #include "log.h"