diff --git a/flatland_server/include/flatland_server/collision_filter_registry.h b/flatland_server/include/flatland_server/collision_filter_registry.h
index 866f403d..ba17506d 100644
--- a/flatland_server/include/flatland_server/collision_filter_registry.h
+++ b/flatland_server/include/flatland_server/collision_filter_registry.h
@@ -47,6 +47,7 @@
 #ifndef FLATLAND_SERVER_COLLISION_FILTER_REGISTRY_H
 #define FLATLAND_SERVER_COLLISION_FILTER_REGISTRY_H
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/flatland_server/include/flatland_server/types.h b/flatland_server/include/flatland_server/types.h
index fef728f7..fa009bae 100644
--- a/flatland_server/include/flatland_server/types.h
+++ b/flatland_server/include/flatland_server/types.h
@@ -46,6 +46,7 @@
 
 #include <Box2D/Box2D.h>
 #include <geometry_msgs/Pose2D.h>
+#include <array>
 
 #ifndef FLATLAND_SERVER_TYPES_H
 #define FLATLAND_SERVER_TYPES_H