7 files changed, 11 insertions, 14 deletions
diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp
index ddcd59ea..b2c5fd22 100644
--- a/src/libcamera/device_enumerator_udev.cpp
+++ b/src/libcamera/device_enumerator_udev.cpp
@@ -8,11 +8,10 @@
 #include "device_enumerator_udev.h"
 
 #include <algorithm>
-#include <list>
-#include <map>
-
 #include <fcntl.h>
 #include <libudev.h>
+#include <list>
+#include <map>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
diff --git a/src/libcamera/include/event_dispatcher_poll.h b/src/libcamera/include/event_dispatcher_poll.h
index d82b302c..1f073861 100644
--- a/src/libcamera/include/event_dispatcher_poll.h
+++ b/src/libcamera/include/event_dispatcher_poll.h
@@ -7,12 +7,12 @@
 #ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
 #define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
 
-#include <libcamera/event_dispatcher.h>
-
 #include <list>
 #include <map>
 #include <vector>
 
+#include <libcamera/event_dispatcher.h>
+
 struct pollfd;
 
 namespace libcamera {
diff --git a/src/libcamera/include/ipc_unixsocket.h b/src/libcamera/include/ipc_unixsocket.h
index 03e9fe49..820d0561 100644
--- a/src/libcamera/include/ipc_unixsocket.h
+++ b/src/libcamera/include/ipc_unixsocket.h
@@ -8,7 +8,7 @@
 #ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__
 #define __LIBCAMERA_IPC_UNIXSOCKET_H__
 
-#include <cstdint>
+#include <stdint.h>
 #include <sys/types.h>
 #include <vector>
 
diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp
index 51f9f86b..50f345b9 100644
--- a/src/libcamera/log.cpp
+++ b/src/libcamera/log.cpp
@@ -7,14 +7,14 @@
 
 #include "log.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
 #include <fstream>
 #include <iostream>
 #include <list>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 #include <unordered_set>
 
 #include <libcamera/logging.h>
diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp
index bd99deba..0d6630fb 100644
--- a/src/libcamera/media_device.cpp
+++ b/src/libcamera/media_device.cpp
@@ -9,11 +9,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <string>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-
-#include <string>
 #include <vector>
 
 #include <linux/media.h>
diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp
index 8794ff45..ef32065c 100644
--- a/src/libcamera/media_object.cpp
+++ b/src/libcamera/media_object.cpp
@@ -8,10 +8,9 @@
 #include "media_object.h"
 
 #include <errno.h>
+#include <string>
 #include <string.h>
 #include <unistd.h>
-
-#include <string>
 #include <vector>
 
 #include <linux/media.h>
diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
index 610920d1..b8e7209c 100644
--- a/src/libcamera/stream.cpp
+++ b/src/libcamera/stream.cpp
@@ -9,8 +9,8 @@
 
 #include <algorithm>
 #include <array>
-#include <climits>
 #include <iomanip>
+#include <limits.h>
 #include <sstream>
 
 #include <libcamera/request.h>