5 files changed, 8 insertions, 7 deletions
diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
index 0a7a57b8..9f0ba6b0 100644
--- a/include/libcamera/base/meson.build
+++ b/include/libcamera/base/meson.build
@@ -3,6 +3,7 @@
 libcamera_base_include_dir = libcamera_include_dir / 'base'
 
 libcamera_base_headers = files([
+    'utils.h',
 ])
 
 install_headers(libcamera_base_headers,
diff --git a/include/libcamera/internal/utils.h b/include/libcamera/base/utils.h
index 15beb0f4..d1aaff65 100644
--- a/include/libcamera/internal/utils.h
+++ b/include/libcamera/base/utils.h
@@ -4,8 +4,8 @@
  *
  * utils.h - Miscellaneous utility functions
  */
-#ifndef __LIBCAMERA_INTERNAL_UTILS_H__
-#define __LIBCAMERA_INTERNAL_UTILS_H__
+#ifndef __LIBCAMERA_BASE_UTILS_H__
+#define __LIBCAMERA_BASE_UTILS_H__
 
 #include <algorithm>
 #include <chrono>
@@ -23,7 +23,7 @@
 
 /* uClibc and uClibc-ng don't provide O_TMPFILE */
 #ifndef O_TMPFILE
-#define O_TMPFILE	(020000000 | O_DIRECTORY)
+#define O_TMPFILE (020000000 | O_DIRECTORY)
 #endif
 
 #endif
@@ -352,4 +352,4 @@ std::basic_ostream<CharT, Traits> &operator<<(std::basic_ostream<CharT, Traits>
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_INTERNAL_UTILS_H__ */
+#endif /* __LIBCAMERA_BASE_UTILS_H__ */
diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h
index b8efb161..9c2beab6 100644
--- a/include/libcamera/internal/log.h
+++ b/include/libcamera/internal/log.h
@@ -12,7 +12,7 @@
 
 #include <libcamera/class.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
index 205b36a9..1348e926 100644
--- a/include/libcamera/internal/meson.build
+++ b/include/libcamera/internal/meson.build
@@ -43,7 +43,6 @@ libcamera_internal_headers = files([
     'sysfs.h',
     'thread.h',
     'timer.h',
-    'utils.h',
     'v4l2_device.h',
     'v4l2_pixelformat.h',
     'v4l2_subdevice.h',
diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h
index 25d0308d..9662e28b 100644
--- a/include/libcamera/internal/thread.h
+++ b/include/libcamera/internal/thread.h
@@ -14,8 +14,9 @@
 
 #include <libcamera/signal.h>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/message.h"
-#include "libcamera/internal/utils.h"
 
 namespace libcamera {