diff --git a/ggdeploymentd/src/dependency_resolver.c b/ggdeploymentd/src/dependency_resolver.c
index 875b1eede..6f04f9818 100644
--- a/ggdeploymentd/src/dependency_resolver.c
+++ b/ggdeploymentd/src/dependency_resolver.c
@@ -5,6 +5,7 @@
 #include "dependency_resolver.h"
 #include "component_manager.h"
 #include "deployment_configuration.h"
+#include <sys/types.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <ggl/base64.h>
@@ -21,6 +22,8 @@
 #include <ggl/semver.h>
 #include <limits.h>
 #include <string.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 static GglError get_device_thing_groups(GglBuffer *response) {
     GglByteVec data_endpoint = GGL_BYTE_VEC(config.data_endpoint);
diff --git a/ggdeploymentd/src/dependency_resolver.h b/ggdeploymentd/src/dependency_resolver.h
index e87a837e4..f032c7f37 100644
--- a/ggdeploymentd/src/dependency_resolver.h
+++ b/ggdeploymentd/src/dependency_resolver.h
@@ -7,6 +7,7 @@
 
 #include "deployment_handler.h"
 #include <ggl/alloc.h>
+#include <ggl/buffer.h>
 #include <ggl/error.h>
 #include <ggl/object.h>
 #include <ggl/vector.h>
diff --git a/ggdeploymentd/src/deployment_configuration.h b/ggdeploymentd/src/deployment_configuration.h
index 3082c78da..f30f89aa8 100644
--- a/ggdeploymentd/src/deployment_configuration.h
+++ b/ggdeploymentd/src/deployment_configuration.h
@@ -5,7 +5,6 @@
 #ifndef GGDEPLOYMENTD_DEPLOYMENT_CONFIGURATION_H
 #define GGDEPLOYMENTD_DEPLOYMENT_CONFIGURATION_H
 
-#include <ggl/buffer.h>
 #include <ggl/error.h>
 #include <ggl/vector.h>
 
diff --git a/ggdeploymentd/src/deployment_model.h b/ggdeploymentd/src/deployment_model.h
index c9acab02a..1a3bca45d 100644
--- a/ggdeploymentd/src/deployment_model.h
+++ b/ggdeploymentd/src/deployment_model.h
@@ -14,8 +14,8 @@ typedef enum {
 } GglDeploymentState;
 
 typedef enum {
-  LOCAL,
-  IOT_JOBS
+    LOCAL,
+    IOT_JOBS
 } GglDeploymentType;
 
 typedef struct {