libcamera: Move internal headers to include/libcamera/internal/

The libcamera internal headers are located in src/libcamera/include/.
The directory is added to the compiler headers search path with a meson
include_directories() directive, and internal headers are included with
(e.g. for the internal semaphore.h header)

  #include "semaphore.h"

All was well, until libcxx decided to implement the C++20
synchronization library. The __threading_support header gained a

  #include <semaphore.h>

to include the pthread's semaphore support. As include_directories()
adds src/libcamera/include/ to the compiler search path with -I, the
internal semaphore.h is included instead of the pthread version.
Needless to say, the compiler isn't happy.

Three options have been considered to fix this issue:

- Use -iquote instead of -I. The -iquote option instructs gcc to only
  consider the header search path for headers included with the ""
  version. Meson unfortunately doesn't support this option.

- Rename the internal semaphore.h header. This was deemed to be the
  beginning of a long whack-a-mole game, where namespace clashes with
  system libraries would appear over time (possibly dependent on
  particular system configurations) and would need to be constantly
  fixed.

- Move the internal headers to another directory to create a unique
  namespace through path components. This causes lots of churn in all
  the existing source files through the all project.

The first option would be best, but isn't available to us due to missing
support in meson. Even if -iquote support was added, we would need to
fix the problem before a new version of meson containing the required
support would be released.

The third option is thus the only practical solution available. Bite the
bullet, and do it, moving headers to include/libcamera/internal/.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>

Documentation/Doxyfile.in

@@ -842,10 +842,10 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = @TOP_SRCDIR@/include/libcamera/span.h \
+			 @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_sysfs.h \
+			 @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_udev.h \
 			 @TOP_SRCDIR@/src/libcamera/device_enumerator_sysfs.cpp \
 			 @TOP_SRCDIR@/src/libcamera/device_enumerator_udev.cpp \
-			 @TOP_SRCDIR@/src/libcamera/include/device_enumerator_sysfs.h \
-			 @TOP_SRCDIR@/src/libcamera/include/device_enumerator_udev.h \
 			 @TOP_SRCDIR@/src/libcamera/pipeline/ \
 			 @TOP_SRCDIR@/src/libcamera/proxy/
 
@@ -2053,7 +2053,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = "@TOP_SRCDIR@/include/libcamera" "@TOP_SRCDIR@/src/libcamera/include"
+INCLUDE_PATH           = "@TOP_SRCDIR@/include/libcamera"
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the

include/libcamera/internal/camera_controls.h

@@ -7,7 +7,7 @@
 #ifndef __LIBCAMERA_CAMERA_CONTROLS_H__
 #define __LIBCAMERA_CAMERA_CONTROLS_H__
 
-#include "control_validator.h"
+#include "libcamera/internal/control_validator.h"
 
 namespace libcamera {
 

include/libcamera/internal/camera_sensor.h

@@ -14,8 +14,8 @@
 #include <libcamera/controls.h>
 #include <libcamera/geometry.h>
 
-#include "formats.h"
+#include "libcamera/internal/formats.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 namespace libcamera {
 

include/libcamera/internal/device_enumerator_sysfs.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
 
 class MediaDevice;
 

include/libcamera/internal/device_enumerator_udev.h

@@ -14,7 +14,7 @@
 #include <string>
 #include <sys/types.h>
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
 
 struct udev;
 struct udev_device;

include/libcamera/internal/formats.h

@@ -14,7 +14,7 @@
 #include <libcamera/geometry.h>
 #include <libcamera/pixelformats.h>
 
-#include "v4l2_pixelformat.h"
+#include "libcamera/internal/v4l2_pixelformat.h"
 
 namespace libcamera {
 

include/libcamera/internal/ipa_context_wrapper.h

@@ -9,7 +9,7 @@
 
 #include <ipa/ipa_interface.h>
 
-#include "control_serializer.h"
+#include "libcamera/internal/control_serializer.h"
 
 namespace libcamera {
 

include/libcamera/internal/ipa_manager.h

@@ -13,9 +13,9 @@
 #include <ipa/ipa_interface.h>
 #include <ipa/ipa_module_info.h>
 
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "pub_key.h"
+#include "libcamera/internal/pub_key.h"
 
 namespace libcamera {
 

include/libcamera/internal/ipa_module.h

@@ -14,8 +14,8 @@
 #include <ipa/ipa_interface.h>
 #include <ipa/ipa_module_info.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
 
 namespace libcamera {
 

include/libcamera/internal/log.h

@@ -10,7 +10,7 @@
 #include <chrono>
 #include <sstream>
 
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 namespace libcamera {
 

include/libcamera/internal/media_device.h

@@ -16,8 +16,8 @@
 
 #include <libcamera/signal.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_object.h"
+#include "libcamera/internal/media_object.h"
 
 namespace libcamera {
 

include/libcamera/internal/pipeline_handler.h

@@ -19,7 +19,7 @@
 #include <libcamera/object.h>
 #include <libcamera/stream.h>
 
-#include "ipa_proxy.h"
+#include "libcamera/internal/ipa_proxy.h"
 
 namespace libcamera {
 

include/libcamera/internal/semaphore.h

@@ -9,7 +9,7 @@
 
 #include <condition_variable>
 
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 namespace libcamera {
 

include/libcamera/internal/thread.h

@@ -14,7 +14,7 @@
 
 #include <libcamera/signal.h>
 
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 namespace libcamera {
 

include/libcamera/internal/v4l2_device.h

@@ -13,8 +13,8 @@
 
 #include <linux/videodev2.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "v4l2_controls.h"
+#include "libcamera/internal/v4l2_controls.h"
 
 namespace libcamera {
 

include/libcamera/internal/v4l2_subdevice.h

@@ -12,10 +12,10 @@
 
 #include <libcamera/geometry.h>
 
-#include "formats.h"
+#include "libcamera/internal/formats.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_object.h"
+#include "libcamera/internal/media_object.h"
-#include "v4l2_device.h"
+#include "libcamera/internal/v4l2_device.h"
 
 namespace libcamera {
 

include/libcamera/internal/v4l2_videodevice.h

@@ -20,10 +20,10 @@
 #include <libcamera/pixelformats.h>
 #include <libcamera/signal.h>
 
-#include "formats.h"
+#include "libcamera/internal/formats.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "v4l2_device.h"
+#include "libcamera/internal/v4l2_device.h"
-#include "v4l2_pixelformat.h"
+#include "libcamera/internal/v4l2_pixelformat.h"
 
 namespace libcamera {
 

include/libcamera/meson.build

@@ -23,6 +23,8 @@ libcamera_api = files([
 
 include_dir = join_paths(libcamera_include_dir, 'libcamera')
 
+subdir('internal')
+
 install_headers(libcamera_api,
                 subdir : include_dir)
 

src/android/camera3_hal.cpp

@@ -7,9 +7,10 @@
 
 #include <hardware/camera_common.h>
 
+#include "libcamera/internal/log.h"
+
 #include "camera_device.h"
 #include "camera_hal_manager.h"
-#include "log.h"
 
 using namespace libcamera;
 

src/android/camera_device.cpp

@@ -11,8 +11,8 @@
 #include <libcamera/controls.h>
 #include <libcamera/property_ids.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 #include "camera_metadata.h"
 

src/android/camera_device.h

@@ -16,7 +16,7 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "message.h"
+#include "libcamera/internal/message.h"
 
 class CameraMetadata;
 

src/android/camera_hal_manager.cpp

@@ -9,7 +9,7 @@
 
 #include <libcamera/camera.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 #include "camera_device.h"
 

src/android/camera_metadata.cpp

@@ -7,7 +7,7 @@
 
 #include "camera_metadata.h"
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 using namespace libcamera;
 

src/ipa/libipa/ipa_interface_wrapper.cpp

@@ -14,8 +14,8 @@
 
 #include <ipa/ipa_interface.h>
 
-#include "byte_stream_buffer.h"
+#include "libcamera/internal/byte_stream_buffer.h"
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
 
 /**
  * \file ipa_interface_wrapper.h

src/ipa/libipa/ipa_interface_wrapper.h

@@ -11,7 +11,7 @@
 
 #include <ipa/ipa_interface.h>
 
-#include "control_serializer.h"
+#include "libcamera/internal/control_serializer.h"
 
 namespace libcamera {
 

src/ipa/meson.build

@@ -6,7 +6,6 @@ ipa_sysconf_dir = join_paths(get_option('sysconfdir'), 'libcamera', 'ipa')
 
 ipa_includes = [
     libcamera_includes,
-    libcamera_internal_includes,
 ]
 
 config_h.set('IPA_CONFIG_DIR',

src/ipa/raspberrypi/cam_helper.cpp

@@ -11,11 +11,11 @@
 #include <map>
 #include <string.h>
 
+#include "libcamera/internal/v4l2_videodevice.h"
+
 #include "cam_helper.hpp"
 #include "md_parser.hpp"
 
-#include "v4l2_videodevice.h"
-
 using namespace RPi;
 
 static std::map<std::string, CamHelperCreateFunc> cam_helpers;

src/ipa/raspberrypi/cam_helper.hpp

@@ -11,7 +11,7 @@
 #include "camera_mode.h"
 #include "md_parser.hpp"
 
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace RPi {
 

src/ipa/raspberrypi/raspberrypi.cpp

@@ -22,6 +22,10 @@
 #include <libcamera/span.h>
 #include <libipa/ipa_interface_wrapper.h>
 
+#include "libcamera/internal/camera_sensor.h"
+#include "libcamera/internal/log.h"
+#include "libcamera/internal/utils.h"
+
 #include <linux/bcm2835-isp.h>
 
 #include "agc_algorithm.hpp"
@@ -44,10 +48,6 @@
 #include "sdn_status.h"
 #include "sharpen_status.h"
 
-#include "camera_sensor.h"
-#include "log.h"
-#include "utils.h"
-
 namespace libcamera {
 
 /* Configure the sensor with these values initially. */

src/ipa/rkisp1/rkisp1.cpp

@@ -22,8 +22,8 @@
 #include <libcamera/request.h>
 #include <libipa/ipa_interface_wrapper.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 namespace libcamera {
 

src/ipa/vimc/vimc.cpp

@@ -19,8 +19,8 @@
 
 #include <libipa/ipa_interface_wrapper.h>
 
-#include "file.h"
+#include "libcamera/internal/file.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 namespace libcamera {
 

src/libcamera/bound_method.cpp

@@ -7,9 +7,9 @@
 
 #include <libcamera/bound_method.h>
 
-#include "message.h"
+#include "libcamera/internal/message.h"
-#include "semaphore.h"
+#include "libcamera/internal/semaphore.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 /**
  * \file bound_method.h

src/libcamera/buffer.cpp

@@ -12,7 +12,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file buffer.h

src/libcamera/byte_stream_buffer.cpp

@@ -5,12 +5,12 @@
  * byte_stream_buffer.cpp - Byte stream buffer
  */
 
-#include "byte_stream_buffer.h"
+#include "libcamera/internal/byte_stream_buffer.h"
 
 #include <stdint.h>
 #include <string.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 namespace libcamera {
 

src/libcamera/camera.cpp

@@ -14,9 +14,9 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file camera.h

src/libcamera/camera_controls.cpp

@@ -5,7 +5,7 @@
  * camera_controls.cpp - Camera controls
  */
 
-#include "camera_controls.h"
+#include "libcamera/internal/camera_controls.h"
 
 #include <libcamera/camera.h>
 #include <libcamera/controls.h>

src/libcamera/camera_manager.cpp

@@ -13,12 +13,12 @@
 #include <libcamera/camera.h>
 #include <libcamera/event_dispatcher.h>
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "event_dispatcher_poll.h"
+#include "libcamera/internal/event_dispatcher_poll.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file camera_manager.h

src/libcamera/camera_sensor.cpp

@@ -5,7 +5,7 @@
  * camera_sensor.cpp - A camera sensor
  */
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
 
 #include <algorithm>
 #include <float.h>
@@ -16,9 +16,9 @@
 
 #include <libcamera/property_ids.h>
 
-#include "formats.h"
+#include "libcamera/internal/formats.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
-#include "v4l2_subdevice.h"
+#include "libcamera/internal/v4l2_subdevice.h"
 
 /**
  * \file camera_sensor.h

src/libcamera/control_serializer.cpp

@@ -5,7 +5,7 @@
  * control_serializer.cpp - Control (de)serializer
  */
 
-#include "control_serializer.h"
+#include "libcamera/internal/control_serializer.h"
 
 #include <algorithm>
 #include <memory>
@@ -16,8 +16,8 @@
 #include <libcamera/controls.h>
 #include <libcamera/span.h>
 
-#include "byte_stream_buffer.h"
+#include "libcamera/internal/byte_stream_buffer.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file control_serializer.h

src/libcamera/control_validator.cpp

@@ -5,7 +5,7 @@
  * control_validator.cpp - Control validator
  */
 
-#include "control_validator.h"
+#include "libcamera/internal/control_validator.h"
 
 /**
  * \file control_validator.h

src/libcamera/controls.cpp

@@ -12,9 +12,9 @@
 #include <string>
 #include <string.h>
 
-#include "control_validator.h"
+#include "libcamera/internal/control_validator.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file controls.h

src/libcamera/device_enumerator.cpp

@@ -5,14 +5,14 @@
  * device_enumerator.cpp - Enumeration and matching
  */
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "device_enumerator_sysfs.h"
+#include "libcamera/internal/device_enumerator_sysfs.h"
-#include "device_enumerator_udev.h"
+#include "libcamera/internal/device_enumerator_udev.h"
 
 #include <string.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 /**
  * \file device_enumerator.h

src/libcamera/device_enumerator_sysfs.cpp

@@ -5,7 +5,7 @@
  * device_enumerator_sysfs.cpp - sysfs-based device enumerator
  */
 
-#include "device_enumerator_sysfs.h"
+#include "libcamera/internal/device_enumerator_sysfs.h"
 
 #include <dirent.h>
 #include <fcntl.h>
@@ -17,8 +17,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 namespace libcamera {
 

src/libcamera/device_enumerator_udev.cpp

@@ -5,7 +5,7 @@
  * device_enumerator_udev.cpp - udev-based device enumerator
  */
 
-#include "device_enumerator_udev.h"
+#include "libcamera/internal/device_enumerator_udev.h"
 
 #include <algorithm>
 #include <fcntl.h>
@@ -19,8 +19,8 @@
 
 #include <libcamera/event_notifier.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 namespace libcamera {
 

src/libcamera/event_dispatcher.cpp

@@ -7,7 +7,7 @@
 
 #include <libcamera/event_dispatcher.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file event_dispatcher.h

src/libcamera/event_dispatcher_poll.cpp

@@ -5,7 +5,7 @@
  * event_dispatcher_poll.cpp - Poll-based event dispatcher
  */
 
-#include "event_dispatcher_poll.h"
+#include "libcamera/internal/event_dispatcher_poll.h"
 
 #include <algorithm>
 #include <chrono>
@@ -19,9 +19,9 @@
 #include <libcamera/event_notifier.h>
 #include <libcamera/timer.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file event_dispatcher_poll.h

src/libcamera/event_notifier.cpp

@@ -10,8 +10,8 @@
 #include <libcamera/camera_manager.h>
 #include <libcamera/event_dispatcher.h>
 
-#include "message.h"
+#include "libcamera/internal/message.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 /**
  * \file event_notifier.h

src/libcamera/file.cpp

@@ -5,7 +5,7 @@
  * file.cpp - File I/O operations
  */
 
-#include "file.h"
+#include "libcamera/internal/file.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file file.h

src/libcamera/file_descriptor.cpp

@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <utility>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file file_descriptor.h

src/libcamera/formats.cpp

@@ -5,11 +5,11 @@
  * formats.cpp - libcamera image formats
  */
 
-#include "formats.h"
+#include "libcamera/internal/formats.h"
 
 #include <errno.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file formats.h

src/libcamera/framebuffer_allocator.cpp

@@ -13,8 +13,8 @@
 #include <libcamera/camera.h>
 #include <libcamera/stream.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
 
 /**
  * \file framebuffer_allocator.h

src/libcamera/ipa_context_wrapper.cpp

@@ -5,15 +5,15 @@
  * ipa_context_wrapper.cpp - Image Processing Algorithm context wrapper
  */
 
-#include "ipa_context_wrapper.h"
+#include "libcamera/internal/ipa_context_wrapper.h"
 
 #include <vector>
 
 #include <libcamera/controls.h>
 
-#include "byte_stream_buffer.h"
+#include "libcamera/internal/byte_stream_buffer.h"
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file ipa_context_wrapper.h

src/libcamera/ipa_manager.cpp

@@ -5,19 +5,19 @@
  * ipa_manager.cpp - Image Processing Algorithm module manager
  */
 
-#include "ipa_manager.h"
+#include "libcamera/internal/ipa_manager.h"
 
 #include <algorithm>
 #include <dirent.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "file.h"
+#include "libcamera/internal/file.h"
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "ipa_proxy.h"
+#include "libcamera/internal/ipa_proxy.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file ipa_manager.h

src/libcamera/ipa_module.cpp

@@ -5,7 +5,7 @@
  * ipa_module.cpp - Image Processing Algorithm module
  */
 
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
 
 #include <algorithm>
 #include <array>
@@ -23,10 +23,10 @@
 
 #include <libcamera/span.h>
 
-#include "file.h"
+#include "libcamera/internal/file.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file ipa_module.h

src/libcamera/ipa_proxy.cpp

@@ -5,16 +5,16 @@
  * ipa_proxy.cpp - Image Processing Algorithm proxy
  */
 
-#include "ipa_proxy.h"
+#include "libcamera/internal/ipa_proxy.h"
 
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file ipa_proxy.h

src/libcamera/ipa_pub_key.cpp.in

@@ -7,7 +7,7 @@
  * This file is auto-generated. Do not edit.
  */
 
-#include "ipa_manager.h"
+#include "libcamera/internal/ipa_manager.h"
 
 namespace libcamera {
 

src/libcamera/ipc_unixsocket.cpp

@@ -5,14 +5,14 @@
  * ipc_unixsocket.cpp - IPC mechanism based on Unix sockets
  */
 
-#include "ipc_unixsocket.h"
+#include "libcamera/internal/ipc_unixsocket.h"
 
 #include <poll.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file ipc_unixsocket.h

src/libcamera/log.cpp

@@ -5,7 +5,7 @@
  * log.cpp - Logging infrastructure
  */
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 #if HAVE_BACKTRACE
 #include <execinfo.h>
@@ -22,8 +22,8 @@
 
 #include <libcamera/logging.h>
 
-#include "thread.h"
+#include "libcamera/internal/thread.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file log.h

src/libcamera/media_device.cpp

@@ -5,7 +5,7 @@
  * media_device.cpp - Media device handler
  */
 
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -18,7 +18,7 @@
 
 #include <linux/media.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file media_device.h

src/libcamera/media_object.cpp

@@ -5,7 +5,7 @@
  * media_object.cpp - Media device objects: entities, pads and links
  */
 
-#include "media_object.h"
+#include "libcamera/internal/media_object.h"
 
 #include <errno.h>
 #include <string>
@@ -15,8 +15,8 @@
 
 #include <linux/media.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 /**
  * \file media_object.h

src/libcamera/meson.build

@@ -51,13 +51,8 @@ libcamera_sources = files([
     'v4l2_videodevice.cpp',
 ])
 
-subdir('include')
-
-libcamera_internal_includes =  include_directories('include')
-
 includes = [
     libcamera_includes,
-    libcamera_internal_includes,
 ]
 
 subdir('pipeline')

src/libcamera/message.cpp

@@ -5,11 +5,11 @@
  * message.cpp - Message queue support
  */
 
-#include "message.h"
+#include "libcamera/internal/message.h"
 
 #include <libcamera/signal.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file message.h

src/libcamera/object.cpp

@@ -11,11 +11,11 @@
 
 #include <libcamera/signal.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "message.h"
+#include "libcamera/internal/message.h"
-#include "semaphore.h"
+#include "libcamera/internal/semaphore.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file object.h

src/libcamera/pipeline/ipu3/ipu3.cpp

@@ -17,15 +17,15 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
-#include "v4l2_controls.h"
+#include "libcamera/internal/v4l2_controls.h"
-#include "v4l2_subdevice.h"
+#include "libcamera/internal/v4l2_subdevice.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/raspberrypi/raspberrypi.cpp

@@ -21,15 +21,16 @@
 #include <linux/drm_fourcc.h>
 #include <linux/videodev2.h>
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "ipa_manager.h"
+#include "libcamera/internal/ipa_manager.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
+#include "libcamera/internal/utils.h"
+#include "libcamera/internal/v4l2_controls.h"
+#include "libcamera/internal/v4l2_videodevice.h"
+
 #include "staggered_ctrl.h"
-#include "utils.h"
-#include "v4l2_controls.h"
-#include "v4l2_videodevice.h"
 #include "vcsm.h"
 
 namespace libcamera {

src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp

@@ -11,9 +11,9 @@
 
 #include <libcamera/controls.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/rkisp1/rkisp1.cpp

@@ -20,16 +20,17 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "ipa_manager.h"
+#include "libcamera/internal/ipa_manager.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
+#include "libcamera/internal/utils.h"
+#include "libcamera/internal/v4l2_subdevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
+
 #include "timeline.h"
-#include "utils.h"
-#include "v4l2_subdevice.h"
-#include "v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/rkisp1/timeline.cpp

@@ -7,7 +7,7 @@
 
 #include "timeline.h"
 
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file timeline.h

src/libcamera/pipeline/rkisp1/timeline.h

@@ -12,7 +12,7 @@
 
 #include <libcamera/timer.h>
 
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/simple/converter.cpp

@@ -13,9 +13,9 @@
 #include <libcamera/geometry.h>
 #include <libcamera/signal.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/simple/simple.cpp

@@ -24,13 +24,13 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "v4l2_subdevice.h"
+#include "libcamera/internal/v4l2_subdevice.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 #include "converter.h"
 

src/libcamera/pipeline/uvcvideo/uvcvideo.cpp

@@ -17,13 +17,13 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
-#include "v4l2_controls.h"
+#include "libcamera/internal/v4l2_controls.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline/vimc/vimc.cpp

@@ -22,16 +22,16 @@
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "camera_sensor.h"
+#include "libcamera/internal/camera_sensor.h"
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "ipa_manager.h"
+#include "libcamera/internal/ipa_manager.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
-#include "v4l2_controls.h"
+#include "libcamera/internal/v4l2_controls.h"
-#include "v4l2_subdevice.h"
+#include "libcamera/internal/v4l2_subdevice.h"
-#include "v4l2_videodevice.h"
+#include "libcamera/internal/v4l2_videodevice.h"
 
 namespace libcamera {
 

src/libcamera/pipeline_handler.cpp

@@ -5,7 +5,7 @@
  * pipeline_handler.cpp - Pipeline handler infrastructure
  */
 
-#include "pipeline_handler.h"
+#include "libcamera/internal/pipeline_handler.h"
 
 #include <sys/sysmacros.h>
 
@@ -13,10 +13,10 @@
 #include <libcamera/camera.h>
 #include <libcamera/camera_manager.h>
 
-#include "device_enumerator.h"
+#include "libcamera/internal/device_enumerator.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file pipeline_handler.h

src/libcamera/process.cpp

@@ -5,7 +5,7 @@
  * process.cpp - Process object
  */
 
-#include "process.h"
+#include "libcamera/internal/process.h"
 
 #include <algorithm>
 #include <dirent.h>
@@ -22,8 +22,8 @@
 
 #include <libcamera/event_notifier.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file process.h

src/libcamera/proxy/ipa_proxy_linux.cpp

@@ -10,11 +10,11 @@
 #include <ipa/ipa_interface.h>
 #include <ipa/ipa_module_info.h>
 
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "ipa_proxy.h"
+#include "libcamera/internal/ipa_proxy.h"
-#include "ipc_unixsocket.h"
+#include "libcamera/internal/ipc_unixsocket.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "process.h"
+#include "libcamera/internal/process.h"
 
 namespace libcamera {
 

src/libcamera/proxy/ipa_proxy_thread.cpp

@@ -10,11 +10,11 @@
 #include <ipa/ipa_interface.h>
 #include <ipa/ipa_module_info.h>
 
-#include "ipa_context_wrapper.h"
+#include "libcamera/internal/ipa_context_wrapper.h"
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "ipa_proxy.h"
+#include "libcamera/internal/ipa_proxy.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 namespace libcamera {
 

src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp

@@ -13,10 +13,10 @@
 #include <libcamera/event_dispatcher.h>
 #include <libcamera/logging.h>
 
-#include "ipa_module.h"
+#include "libcamera/internal/ipa_module.h"
-#include "ipc_unixsocket.h"
+#include "libcamera/internal/ipc_unixsocket.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 using namespace libcamera;
 

src/libcamera/proxy/worker/meson.build

@@ -8,7 +8,6 @@ proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera')
 
 foreach t : ipa_proxy_sources
     proxy = executable(t[0], t[1],
-                       include_directories : libcamera_internal_includes,
                        install : true,
                        install_dir : proxy_install_dir,
                        dependencies : libcamera_dep)

src/libcamera/pub_key.cpp

@@ -5,7 +5,7 @@
  * pub_key.cpp - Public key signature verification
  */
 
-#include "pub_key.h"
+#include "libcamera/internal/pub_key.h"
 
 #if HAVE_GNUTLS
 #include <gnutls/abstract.h>

src/libcamera/request.cpp

@@ -14,8 +14,8 @@
 #include <libcamera/control_ids.h>
 #include <libcamera/stream.h>
 
-#include "camera_controls.h"
+#include "libcamera/internal/camera_controls.h"
-#include "log.h"
+#include "libcamera/internal/log.h"
 
 /**
  * \file request.h

src/libcamera/semaphore.cpp

@@ -5,8 +5,8 @@
  * semaphore.cpp - General-purpose counting semaphore
  */
 
-#include "semaphore.h"
+#include "libcamera/internal/semaphore.h"
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 /**
  * \file semaphore.h

src/libcamera/signal.cpp

@@ -7,7 +7,7 @@
 
 #include <libcamera/signal.h>
 
-#include "thread.h"
+#include "libcamera/internal/thread.h"
 
 /**
  * \file signal.h

src/libcamera/stream.cpp

@@ -15,8 +15,8 @@
 
 #include <libcamera/request.h>
 
-#include "log.h"
+#include "libcamera/internal/log.h"
-#include "utils.h"
+#include "libcamera/internal/utils.h"
 
 /**
  * \file stream.h