[{"id":4924,"web_url":"https://patchwork.libcamera.org/comment/4924/","msgid":"<f19353f0-0357-5812-5789-90994e342da3@ideasonboard.com>","date":"2020-05-28T09:36:41","subject":"Re: [libcamera-devel] [PATCH/RFC 03/11] libcamera: Rename header\n\tguards for internal headers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/05/2020 15:54, Laurent Pinchart wrote:\n> With the internal headers now in include/libcamera/internal/, we may\n> have identically named headers in include/libcamera/. Their header\n> guards would clash. Rename the header guards of internal headers to\n> prevent any issue.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  include/libcamera/internal/byte_stream_buffer.h      | 6 +++---\n>  include/libcamera/internal/camera_controls.h         | 6 +++---\n>  include/libcamera/internal/camera_sensor.h           | 6 +++---\n>  include/libcamera/internal/control_serializer.h      | 6 +++---\n>  include/libcamera/internal/control_validator.h       | 6 +++---\n>  include/libcamera/internal/device_enumerator.h       | 6 +++---\n>  include/libcamera/internal/device_enumerator_sysfs.h | 6 +++---\n>  include/libcamera/internal/device_enumerator_udev.h  | 6 +++---\n>  include/libcamera/internal/event_dispatcher_poll.h   | 6 +++---\n>  include/libcamera/internal/file.h                    | 6 +++---\n>  include/libcamera/internal/formats.h                 | 6 +++---\n>  include/libcamera/internal/ipa_context_wrapper.h     | 6 +++---\n>  include/libcamera/internal/ipa_manager.h             | 6 +++---\n>  include/libcamera/internal/ipa_module.h              | 6 +++---\n>  include/libcamera/internal/ipa_proxy.h               | 6 +++---\n>  include/libcamera/internal/ipc_unixsocket.h          | 6 +++---\n>  include/libcamera/internal/log.h                     | 6 +++---\n>  include/libcamera/internal/media_device.h            | 6 +++---\n>  include/libcamera/internal/media_object.h            | 6 +++---\n>  include/libcamera/internal/message.h                 | 6 +++---\n>  include/libcamera/internal/pipeline_handler.h        | 6 +++---\n>  include/libcamera/internal/process.h                 | 6 +++---\n>  include/libcamera/internal/pub_key.h                 | 6 +++---\n>  include/libcamera/internal/semaphore.h               | 6 +++---\n>  include/libcamera/internal/thread.h                  | 6 +++---\n>  include/libcamera/internal/utils.h                   | 6 +++---\n>  include/libcamera/internal/v4l2_controls.h           | 6 +++---\n>  include/libcamera/internal/v4l2_device.h             | 6 +++---\n>  include/libcamera/internal/v4l2_pixelformat.h        | 6 +++---\n>  include/libcamera/internal/v4l2_subdevice.h          | 6 +++---\n>  include/libcamera/internal/v4l2_videodevice.h        | 6 +++---\n>  31 files changed, 93 insertions(+), 93 deletions(-)\n> \n> diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h\n> index b3aaa8b9fb28..db59577dc332 100644\n> --- a/include/libcamera/internal/byte_stream_buffer.h\n> +++ b/include/libcamera/internal/byte_stream_buffer.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * byte_stream_buffer.h - Byte stream buffer\n>   */\n> -#ifndef __LIBCAMERA_BYTE_STREAM_BUFFER_H__\n> -#define __LIBCAMERA_BYTE_STREAM_BUFFER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__\n> +#define __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__\n>  \n>  #include <stddef.h>\n>  #include <stdint.h>\n> @@ -86,4 +86,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_BYTE_STREAM_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__ */\n> diff --git a/include/libcamera/internal/camera_controls.h b/include/libcamera/internal/camera_controls.h\n> index dc8b3ba84bc4..6e40f4436cad 100644\n> --- a/include/libcamera/internal/camera_controls.h\n> +++ b/include/libcamera/internal/camera_controls.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * camera_controls.h - Camera controls\n>   */\n> -#ifndef __LIBCAMERA_CAMERA_CONTROLS_H__\n> -#define __LIBCAMERA_CAMERA_CONTROLS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__\n> +#define __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__\n>  \n>  #include \"libcamera/internal/control_validator.h\"\n>  \n> @@ -27,4 +27,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CAMERA_CONTROLS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__ */\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index d79bd9ce9d58..1f9de03c7563 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * camera_sensor.h - A camera sensor\n>   */\n> -#ifndef __LIBCAMERA_CAMERA_SENSOR_H__\n> -#define __LIBCAMERA_CAMERA_SENSOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__\n> +#define __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -85,4 +85,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CAMERA_SENSOR_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__ */\n> diff --git a/include/libcamera/internal/control_serializer.h b/include/libcamera/internal/control_serializer.h\n> index 99bacd920fce..0ab29d9ad8bc 100644\n> --- a/include/libcamera/internal/control_serializer.h\n> +++ b/include/libcamera/internal/control_serializer.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * control_serializer.h - Control (de)serializer\n>   */\n> -#ifndef __LIBCAMERA_CONTROL_SERIALIZER_H__\n> -#define __LIBCAMERA_CONTROL_SERIALIZER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__\n> +#define __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__\n>  \n>  #include <map>\n>  #include <memory>\n> @@ -52,4 +52,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CONTROL_SERIALIZER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__ */\n> diff --git a/include/libcamera/internal/control_validator.h b/include/libcamera/internal/control_validator.h\n> index f1c9110b158f..4a00b9b7f686 100644\n> --- a/include/libcamera/internal/control_validator.h\n> +++ b/include/libcamera/internal/control_validator.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * control_validator.h - Control validator\n>   */\n> -#ifndef __LIBCAMERA_CONTROL_VALIDATOR_H__\n> -#define __LIBCAMERA_CONTROL_VALIDATOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__\n> +#define __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__\n>  \n>  #include <string>\n>  \n> @@ -24,4 +24,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CONTROL_VALIDATOR_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h\n> index 433e357aebae..25a363086e49 100644\n> --- a/include/libcamera/internal/device_enumerator.h\n> +++ b/include/libcamera/internal/device_enumerator.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator.h - API to enumerate and find media devices\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -54,4 +54,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif\t/* __LIBCAMERA_DEVICE_ENUMERATOR_H__ */\n> +#endif\t/* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator_sysfs.h b/include/libcamera/internal/device_enumerator_sysfs.h\n> index a63e737a78d5..2112bc543054 100644\n> --- a/include/libcamera/internal/device_enumerator_sysfs.h\n> +++ b/include/libcamera/internal/device_enumerator_sysfs.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator_sysfs.h - sysfs-based device enumerator\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -29,4 +29,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h\n> index fdaa20968ef0..818d8bc71d67 100644\n> --- a/include/libcamera/internal/device_enumerator_udev.h\n> +++ b/include/libcamera/internal/device_enumerator_udev.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator_udev.h - udev-based device enumerator\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -72,4 +72,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif\t/* __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__ */\n> +#endif\t/* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__ */\n> diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h\n> index 1f0738617425..fb774efd3d97 100644\n> --- a/include/libcamera/internal/event_dispatcher_poll.h\n> +++ b/include/libcamera/internal/event_dispatcher_poll.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * event_dispatcher_poll.h - Poll-based event dispatcher\n>   */\n> -#ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__\n> -#define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__\n> +#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__\n> +#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -55,4 +55,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_EVENT_DISPATCHER_POLL_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ */\n> diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h\n> index f020f2ccba1d..e3e72132e336 100644\n> --- a/include/libcamera/internal/file.h\n> +++ b/include/libcamera/internal/file.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * file.h - File I/O operations\n>   */\n> -#ifndef __LIBCAMERA_FILE_H__\n> -#define __LIBCAMERA_FILE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FILE_H__\n> +#define __LIBCAMERA_INTERNAL_FILE_H__\n>  \n>  #include <map>\n>  #include <string>\n> @@ -68,4 +68,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_FILE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FILE_H__ */\n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index 4455b0f9b050..4b172efc6588 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -5,8 +5,8 @@\n>   * formats.h - libcamera image formats\n>   */\n>  \n> -#ifndef __LIBCAMERA_FORMATS_H__\n> -#define __LIBCAMERA_FORMATS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FORMATS_H__\n> +#define __LIBCAMERA_INTERNAL_FORMATS_H__\n>  \n>  #include <map>\n>  #include <vector>\n> @@ -55,4 +55,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_FORMATS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FORMATS_H__ */\n> diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h\n> index bd770e132c0c..4e6f791d18e6 100644\n> --- a/include/libcamera/internal/ipa_context_wrapper.h\n> +++ b/include/libcamera/internal/ipa_context_wrapper.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_context_wrapper.h - Image Processing Algorithm context wrapper\n>   */\n> -#ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n> -#define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__\n>  \n>  #include <libcamera/ipa/ipa_interface.h>\n>  \n> @@ -47,4 +47,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__ */\n> diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\n> index 2412d75746ac..63430ade8a7a 100644\n> --- a/include/libcamera/internal/ipa_manager.h\n> +++ b/include/libcamera/internal/ipa_manager.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_manager.h - Image Processing Algorithm module manager\n>   */\n> -#ifndef __LIBCAMERA_IPA_MANAGER_H__\n> -#define __LIBCAMERA_IPA_MANAGER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_MANAGER_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_MANAGER_H__\n>  \n>  #include <stdint.h>\n>  #include <vector>\n> @@ -48,4 +48,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_MANAGER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_MANAGER_H__ */\n> diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h\n> index 5b54cb31a48a..c80aaf46f81b 100644\n> --- a/include/libcamera/internal/ipa_module.h\n> +++ b/include/libcamera/internal/ipa_module.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_module.h - Image Processing Algorithm module\n>   */\n> -#ifndef __LIBCAMERA_IPA_MODULE_H__\n> -#define __LIBCAMERA_IPA_MODULE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_MODULE_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_MODULE_H__\n>  \n>  #include <stdint.h>\n>  #include <string>\n> @@ -58,4 +58,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_MODULE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_MODULE_H__ */\n> diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h\n> index e9a36608bd31..aec8f04ffc15 100644\n> --- a/include/libcamera/internal/ipa_proxy.h\n> +++ b/include/libcamera/internal/ipa_proxy.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_proxy.h - Image Processing Algorithm proxy\n>   */\n> -#ifndef __LIBCAMERA_IPA_PROXY_H__\n> -#define __LIBCAMERA_IPA_PROXY_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_PROXY_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_PROXY_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -67,4 +67,4 @@ static proxy##Factory global_##proxy##Factory;\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_PROXY_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_PROXY_H__ */\n> diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h\n> index 820d05611049..9dcaaa26956d 100644\n> --- a/include/libcamera/internal/ipc_unixsocket.h\n> +++ b/include/libcamera/internal/ipc_unixsocket.h\n> @@ -5,8 +5,8 @@\n>   * ipc_unixsocket.h - IPC mechanism based on Unix sockets\n>   */\n>  \n> -#ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__\n> -#define __LIBCAMERA_IPC_UNIXSOCKET_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__\n> +#define __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__\n>  \n>  #include <stdint.h>\n>  #include <sys/types.h>\n> @@ -56,4 +56,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPC_UNIXSOCKET_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__ */\n> diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h\n> index cab2034aae6b..4b10087a4718 100644\n> --- a/include/libcamera/internal/log.h\n> +++ b/include/libcamera/internal/log.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * log.h - Logging infrastructure\n>   */\n> -#ifndef __LIBCAMERA_LOG_H__\n> -#define __LIBCAMERA_LOG_H__\n> +#ifndef __LIBCAMERA_INTERNAL_LOG_H__\n> +#define __LIBCAMERA_INTERNAL_LOG_H__\n>  \n>  #include <chrono>\n>  #include <sstream>\n> @@ -127,4 +127,4 @@ LogMessage _log(const char *file, unsigned int line,\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_LOG_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_LOG_H__ */\n> diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h\n> index 9fe76c514b17..24093674fe15 100644\n> --- a/include/libcamera/internal/media_device.h\n> +++ b/include/libcamera/internal/media_device.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * media_device.h - Media device handler\n>   */\n> -#ifndef __LIBCAMERA_MEDIA_DEVICE_H__\n> -#define __LIBCAMERA_MEDIA_DEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__\n>  \n>  #include <map>\n>  #include <sstream>\n> @@ -91,4 +91,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MEDIA_DEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ */\n> diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h\n> index 748eafdc880b..d9b1c19bbf96 100644\n> --- a/include/libcamera/internal/media_object.h\n> +++ b/include/libcamera/internal/media_object.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * media_object.h - Media Device objects: entities, pads and links.\n>   */\n> -#ifndef __LIBCAMERA_MEDIA_OBJECT_H__\n> -#define __LIBCAMERA_MEDIA_OBJECT_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__\n> +#define __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -121,4 +121,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MEDIA_OBJECT_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__ */\n> diff --git a/include/libcamera/internal/message.h b/include/libcamera/internal/message.h\n> index 8e8b013dcd18..92ea64a5d714 100644\n> --- a/include/libcamera/internal/message.h\n> +++ b/include/libcamera/internal/message.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * message.h - Message queue support\n>   */\n> -#ifndef __LIBCAMERA_MESSAGE_H__\n> -#define __LIBCAMERA_MESSAGE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MESSAGE_H__\n> +#define __LIBCAMERA_INTERNAL_MESSAGE_H__\n>  \n>  #include <atomic>\n>  \n> @@ -67,4 +67,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MESSAGE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MESSAGE_H__ */\n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 428f5887c76b..56968d14a6e8 100644\n> --- a/include/libcamera/internal/pipeline_handler.h\n> +++ b/include/libcamera/internal/pipeline_handler.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * pipeline_handler.h - Pipeline handler infrastructure\n>   */\n> -#ifndef __LIBCAMERA_PIPELINE_HANDLER_H__\n> -#define __LIBCAMERA_PIPELINE_HANDLER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n> +#define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -148,4 +148,4 @@ static handler##Factory global_##handler##Factory;\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PIPELINE_HANDLER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__ */\n> diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\n> index d322fce13ae4..36595106f3b9 100644\n> --- a/include/libcamera/internal/process.h\n> +++ b/include/libcamera/internal/process.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * process.h - Process object\n>   */\n> -#ifndef __LIBCAMERA_PROCESS_H__\n> -#define __LIBCAMERA_PROCESS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PROCESS_H__\n> +#define __LIBCAMERA_INTERNAL_PROCESS_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -52,4 +52,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PROCESS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PROCESS_H__ */\n> diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h\n> index f35bf3738c6f..f5f988b58f74 100644\n> --- a/include/libcamera/internal/pub_key.h\n> +++ b/include/libcamera/internal/pub_key.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * pub_key.h - Public key signature verification\n>   */\n> -#ifndef __LIBCAMERA_PUB_KEY_H__\n> -#define __LIBCAMERA_PUB_KEY_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PUB_KEY_H__\n> +#define __LIBCAMERA_INTERNAL_PUB_KEY_H__\n>  \n>  #include <stdint.h>\n>  \n> @@ -35,4 +35,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PUB_KEY_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PUB_KEY_H__ */\n> diff --git a/include/libcamera/internal/semaphore.h b/include/libcamera/internal/semaphore.h\n> index 4d93077c776f..9dc65d299cfd 100644\n> --- a/include/libcamera/internal/semaphore.h\n> +++ b/include/libcamera/internal/semaphore.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * semaphore.h - General-purpose counting semaphore\n>   */\n> -#ifndef __LIBCAMERA_SEMAPHORE_H__\n> -#define __LIBCAMERA_SEMAPHORE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_SEMAPHORE_H__\n> +#define __LIBCAMERA_INTERNAL_SEMAPHORE_H__\n>  \n>  #include <condition_variable>\n>  \n> @@ -31,4 +31,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_SEMAPHORE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_SEMAPHORE_H__ */\n> diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h\n> index 6594c9b06b8d..7b59e583c19f 100644\n> --- a/include/libcamera/internal/thread.h\n> +++ b/include/libcamera/internal/thread.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * thread.h - Thread support\n>   */\n> -#ifndef __LIBCAMERA_THREAD_H__\n> -#define __LIBCAMERA_THREAD_H__\n> +#ifndef __LIBCAMERA_INTERNAL_THREAD_H__\n> +#define __LIBCAMERA_INTERNAL_THREAD_H__\n>  \n>  #include <memory>\n>  #include <mutex>\n> @@ -74,4 +74,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_THREAD_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_THREAD_H__ */\n> diff --git a/include/libcamera/internal/utils.h b/include/libcamera/internal/utils.h\n> index 3334ff16613d..0953423ee8d0 100644\n> --- a/include/libcamera/internal/utils.h\n> +++ b/include/libcamera/internal/utils.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * utils.h - Miscellaneous utility functions\n>   */\n> -#ifndef __LIBCAMERA_UTILS_H__\n> -#define __LIBCAMERA_UTILS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_UTILS_H__\n> +#define __LIBCAMERA_INTERNAL_UTILS_H__\n>  \n>  #include <algorithm>\n>  #include <chrono>\n> @@ -194,4 +194,4 @@ std::string libcameraSourcePath();\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_UTILS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_UTILS_H__ */\n> diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h\n> index cffe9efd9919..0851b8ddb128 100644\n> --- a/include/libcamera/internal/v4l2_controls.h\n> +++ b/include/libcamera/internal/v4l2_controls.h\n> @@ -5,8 +5,8 @@\n>   * v4l2_controls.h - V4L2 Controls Support\n>   */\n>  \n> -#ifndef __LIBCAMERA_V4L2_CONTROLS_H__\n> -#define __LIBCAMERA_V4L2_CONTROLS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__\n>  \n>  #include <linux/videodev2.h>\n>  \n> @@ -28,4 +28,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_CONTROLS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ */\n> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\n> index d491eafd262e..bf643f2ec966 100644\n> --- a/include/libcamera/internal/v4l2_device.h\n> +++ b/include/libcamera/internal/v4l2_device.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_device.h - Common base for V4L2 video devices and subdevices\n>   */\n> -#ifndef __LIBCAMERA_V4L2_DEVICE_H__\n> -#define __LIBCAMERA_V4L2_DEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__\n>  \n>  #include <map>\n>  #include <memory>\n> @@ -57,4 +57,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_DEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__ */\n> diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h\n> index 4d0e034b8b51..9bfd81ad6651 100644\n> --- a/include/libcamera/internal/v4l2_pixelformat.h\n> +++ b/include/libcamera/internal/v4l2_pixelformat.h\n> @@ -5,8 +5,8 @@\n>   *\n>   * v4l2_pixelformat.h - V4L2 Pixel Format\n>   */\n> -#ifndef __LIBCAMERA_V4L2_PIXELFORMAT_H__\n> -#define __LIBCAMERA_V4L2_PIXELFORMAT_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__\n>  \n>  #include <stdint.h>\n>  #include <string>\n> @@ -46,4 +46,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_PIXELFORMAT_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__ */\n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 1be454f0ddda..8016fa5da68c 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_subdevice.h - V4L2 Subdevice\n>   */\n> -#ifndef __LIBCAMERA_V4L2_SUBDEVICE_H__\n> -#define __LIBCAMERA_V4L2_SUBDEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -74,4 +74,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_SUBDEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__ */\n> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> index c93cf816373b..29d819a8dacd 100644\n> --- a/include/libcamera/internal/v4l2_videodevice.h\n> +++ b/include/libcamera/internal/v4l2_videodevice.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_videodevice.h - V4L2 Video Device\n>   */\n> -#ifndef __LIBCAMERA_V4L2_VIDEODEVICE_H__\n> -#define __LIBCAMERA_V4L2_VIDEODEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__\n>  \n>  #include <atomic>\n>  #include <memory>\n> @@ -274,4 +274,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_VIDEODEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__ */\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 618DC603CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 May 2020 11:36:45 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C7A962A3;\n\tThu, 28 May 2020 11:36:44 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"kYWADWCu\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590658605;\n\tbh=GFth9QJczbUPbXpLiUYnnLrhYIGAD3qelfpZ3/nrw30=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=kYWADWCu2Ue75AeZZiXdOI2sWTtL9YPS/pyN+8wbWJ9dZEmNSCs6E1omPzayMRqKW\n\tH7RrDsrwthf2dTSVK8C8REkSjuELUi2+qRGq3YIrQv9wcSnYoY2HStJznnn9EBBSq0\n\tefCy6Mu1R6+sGE4Bfp8MrNm4xVaSN/rVHBi4Hzh8=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>\n\t<20200522145459.16836-5-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<f19353f0-0357-5812-5789-90994e342da3@ideasonboard.com>","Date":"Thu, 28 May 2020 10:36:41 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200522145459.16836-5-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH/RFC 03/11] libcamera: Rename header\n\tguards for internal headers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 28 May 2020 09:36:45 -0000"}},{"id":5068,"web_url":"https://patchwork.libcamera.org/comment/5068/","msgid":"<20200605200056.GQ5864@oden.dyn.berto.se>","date":"2020-06-05T20:00:56","subject":"Re: [libcamera-devel] [PATCH/RFC 03/11] libcamera: Rename header\n\tguards for internal headers","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2020-05-22 17:54:51 +0300, Laurent Pinchart wrote:\n> With the internal headers now in include/libcamera/internal/, we may\n> have identically named headers in include/libcamera/. Their header\n> guards would clash. Rename the header guards of internal headers to\n> prevent any issue.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nI have not verified every addition of 'INTERNAL_' but I agree with the \npattern and trust you repeated it correctly for all files :-)\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  include/libcamera/internal/byte_stream_buffer.h      | 6 +++---\n>  include/libcamera/internal/camera_controls.h         | 6 +++---\n>  include/libcamera/internal/camera_sensor.h           | 6 +++---\n>  include/libcamera/internal/control_serializer.h      | 6 +++---\n>  include/libcamera/internal/control_validator.h       | 6 +++---\n>  include/libcamera/internal/device_enumerator.h       | 6 +++---\n>  include/libcamera/internal/device_enumerator_sysfs.h | 6 +++---\n>  include/libcamera/internal/device_enumerator_udev.h  | 6 +++---\n>  include/libcamera/internal/event_dispatcher_poll.h   | 6 +++---\n>  include/libcamera/internal/file.h                    | 6 +++---\n>  include/libcamera/internal/formats.h                 | 6 +++---\n>  include/libcamera/internal/ipa_context_wrapper.h     | 6 +++---\n>  include/libcamera/internal/ipa_manager.h             | 6 +++---\n>  include/libcamera/internal/ipa_module.h              | 6 +++---\n>  include/libcamera/internal/ipa_proxy.h               | 6 +++---\n>  include/libcamera/internal/ipc_unixsocket.h          | 6 +++---\n>  include/libcamera/internal/log.h                     | 6 +++---\n>  include/libcamera/internal/media_device.h            | 6 +++---\n>  include/libcamera/internal/media_object.h            | 6 +++---\n>  include/libcamera/internal/message.h                 | 6 +++---\n>  include/libcamera/internal/pipeline_handler.h        | 6 +++---\n>  include/libcamera/internal/process.h                 | 6 +++---\n>  include/libcamera/internal/pub_key.h                 | 6 +++---\n>  include/libcamera/internal/semaphore.h               | 6 +++---\n>  include/libcamera/internal/thread.h                  | 6 +++---\n>  include/libcamera/internal/utils.h                   | 6 +++---\n>  include/libcamera/internal/v4l2_controls.h           | 6 +++---\n>  include/libcamera/internal/v4l2_device.h             | 6 +++---\n>  include/libcamera/internal/v4l2_pixelformat.h        | 6 +++---\n>  include/libcamera/internal/v4l2_subdevice.h          | 6 +++---\n>  include/libcamera/internal/v4l2_videodevice.h        | 6 +++---\n>  31 files changed, 93 insertions(+), 93 deletions(-)\n> \n> diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h\n> index b3aaa8b9fb28..db59577dc332 100644\n> --- a/include/libcamera/internal/byte_stream_buffer.h\n> +++ b/include/libcamera/internal/byte_stream_buffer.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * byte_stream_buffer.h - Byte stream buffer\n>   */\n> -#ifndef __LIBCAMERA_BYTE_STREAM_BUFFER_H__\n> -#define __LIBCAMERA_BYTE_STREAM_BUFFER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__\n> +#define __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__\n>  \n>  #include <stddef.h>\n>  #include <stdint.h>\n> @@ -86,4 +86,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_BYTE_STREAM_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__ */\n> diff --git a/include/libcamera/internal/camera_controls.h b/include/libcamera/internal/camera_controls.h\n> index dc8b3ba84bc4..6e40f4436cad 100644\n> --- a/include/libcamera/internal/camera_controls.h\n> +++ b/include/libcamera/internal/camera_controls.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * camera_controls.h - Camera controls\n>   */\n> -#ifndef __LIBCAMERA_CAMERA_CONTROLS_H__\n> -#define __LIBCAMERA_CAMERA_CONTROLS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__\n> +#define __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__\n>  \n>  #include \"libcamera/internal/control_validator.h\"\n>  \n> @@ -27,4 +27,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CAMERA_CONTROLS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__ */\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index d79bd9ce9d58..1f9de03c7563 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * camera_sensor.h - A camera sensor\n>   */\n> -#ifndef __LIBCAMERA_CAMERA_SENSOR_H__\n> -#define __LIBCAMERA_CAMERA_SENSOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__\n> +#define __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -85,4 +85,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CAMERA_SENSOR_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__ */\n> diff --git a/include/libcamera/internal/control_serializer.h b/include/libcamera/internal/control_serializer.h\n> index 99bacd920fce..0ab29d9ad8bc 100644\n> --- a/include/libcamera/internal/control_serializer.h\n> +++ b/include/libcamera/internal/control_serializer.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * control_serializer.h - Control (de)serializer\n>   */\n> -#ifndef __LIBCAMERA_CONTROL_SERIALIZER_H__\n> -#define __LIBCAMERA_CONTROL_SERIALIZER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__\n> +#define __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__\n>  \n>  #include <map>\n>  #include <memory>\n> @@ -52,4 +52,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CONTROL_SERIALIZER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__ */\n> diff --git a/include/libcamera/internal/control_validator.h b/include/libcamera/internal/control_validator.h\n> index f1c9110b158f..4a00b9b7f686 100644\n> --- a/include/libcamera/internal/control_validator.h\n> +++ b/include/libcamera/internal/control_validator.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * control_validator.h - Control validator\n>   */\n> -#ifndef __LIBCAMERA_CONTROL_VALIDATOR_H__\n> -#define __LIBCAMERA_CONTROL_VALIDATOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__\n> +#define __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__\n>  \n>  #include <string>\n>  \n> @@ -24,4 +24,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_CONTROL_VALIDATOR_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h\n> index 433e357aebae..25a363086e49 100644\n> --- a/include/libcamera/internal/device_enumerator.h\n> +++ b/include/libcamera/internal/device_enumerator.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator.h - API to enumerate and find media devices\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -54,4 +54,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif\t/* __LIBCAMERA_DEVICE_ENUMERATOR_H__ */\n> +#endif\t/* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator_sysfs.h b/include/libcamera/internal/device_enumerator_sysfs.h\n> index a63e737a78d5..2112bc543054 100644\n> --- a/include/libcamera/internal/device_enumerator_sysfs.h\n> +++ b/include/libcamera/internal/device_enumerator_sysfs.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator_sysfs.h - sysfs-based device enumerator\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -29,4 +29,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__ */\n> diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h\n> index fdaa20968ef0..818d8bc71d67 100644\n> --- a/include/libcamera/internal/device_enumerator_udev.h\n> +++ b/include/libcamera/internal/device_enumerator_udev.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * device_enumerator_udev.h - udev-based device enumerator\n>   */\n> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__\n> -#define __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__\n> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__\n> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -72,4 +72,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif\t/* __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__ */\n> +#endif\t/* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__ */\n> diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h\n> index 1f0738617425..fb774efd3d97 100644\n> --- a/include/libcamera/internal/event_dispatcher_poll.h\n> +++ b/include/libcamera/internal/event_dispatcher_poll.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * event_dispatcher_poll.h - Poll-based event dispatcher\n>   */\n> -#ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__\n> -#define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__\n> +#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__\n> +#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -55,4 +55,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_EVENT_DISPATCHER_POLL_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ */\n> diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h\n> index f020f2ccba1d..e3e72132e336 100644\n> --- a/include/libcamera/internal/file.h\n> +++ b/include/libcamera/internal/file.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * file.h - File I/O operations\n>   */\n> -#ifndef __LIBCAMERA_FILE_H__\n> -#define __LIBCAMERA_FILE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FILE_H__\n> +#define __LIBCAMERA_INTERNAL_FILE_H__\n>  \n>  #include <map>\n>  #include <string>\n> @@ -68,4 +68,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_FILE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FILE_H__ */\n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index 4455b0f9b050..4b172efc6588 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -5,8 +5,8 @@\n>   * formats.h - libcamera image formats\n>   */\n>  \n> -#ifndef __LIBCAMERA_FORMATS_H__\n> -#define __LIBCAMERA_FORMATS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FORMATS_H__\n> +#define __LIBCAMERA_INTERNAL_FORMATS_H__\n>  \n>  #include <map>\n>  #include <vector>\n> @@ -55,4 +55,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_FORMATS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FORMATS_H__ */\n> diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h\n> index bd770e132c0c..4e6f791d18e6 100644\n> --- a/include/libcamera/internal/ipa_context_wrapper.h\n> +++ b/include/libcamera/internal/ipa_context_wrapper.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_context_wrapper.h - Image Processing Algorithm context wrapper\n>   */\n> -#ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n> -#define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__\n>  \n>  #include <libcamera/ipa/ipa_interface.h>\n>  \n> @@ -47,4 +47,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__ */\n> diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\n> index 2412d75746ac..63430ade8a7a 100644\n> --- a/include/libcamera/internal/ipa_manager.h\n> +++ b/include/libcamera/internal/ipa_manager.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_manager.h - Image Processing Algorithm module manager\n>   */\n> -#ifndef __LIBCAMERA_IPA_MANAGER_H__\n> -#define __LIBCAMERA_IPA_MANAGER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_MANAGER_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_MANAGER_H__\n>  \n>  #include <stdint.h>\n>  #include <vector>\n> @@ -48,4 +48,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_MANAGER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_MANAGER_H__ */\n> diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h\n> index 5b54cb31a48a..c80aaf46f81b 100644\n> --- a/include/libcamera/internal/ipa_module.h\n> +++ b/include/libcamera/internal/ipa_module.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_module.h - Image Processing Algorithm module\n>   */\n> -#ifndef __LIBCAMERA_IPA_MODULE_H__\n> -#define __LIBCAMERA_IPA_MODULE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_MODULE_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_MODULE_H__\n>  \n>  #include <stdint.h>\n>  #include <string>\n> @@ -58,4 +58,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_MODULE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_MODULE_H__ */\n> diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h\n> index e9a36608bd31..aec8f04ffc15 100644\n> --- a/include/libcamera/internal/ipa_proxy.h\n> +++ b/include/libcamera/internal/ipa_proxy.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * ipa_proxy.h - Image Processing Algorithm proxy\n>   */\n> -#ifndef __LIBCAMERA_IPA_PROXY_H__\n> -#define __LIBCAMERA_IPA_PROXY_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPA_PROXY_H__\n> +#define __LIBCAMERA_INTERNAL_IPA_PROXY_H__\n>  \n>  #include <memory>\n>  #include <string>\n> @@ -67,4 +67,4 @@ static proxy##Factory global_##proxy##Factory;\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPA_PROXY_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPA_PROXY_H__ */\n> diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h\n> index 820d05611049..9dcaaa26956d 100644\n> --- a/include/libcamera/internal/ipc_unixsocket.h\n> +++ b/include/libcamera/internal/ipc_unixsocket.h\n> @@ -5,8 +5,8 @@\n>   * ipc_unixsocket.h - IPC mechanism based on Unix sockets\n>   */\n>  \n> -#ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__\n> -#define __LIBCAMERA_IPC_UNIXSOCKET_H__\n> +#ifndef __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__\n> +#define __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__\n>  \n>  #include <stdint.h>\n>  #include <sys/types.h>\n> @@ -56,4 +56,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_IPC_UNIXSOCKET_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__ */\n> diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h\n> index cab2034aae6b..4b10087a4718 100644\n> --- a/include/libcamera/internal/log.h\n> +++ b/include/libcamera/internal/log.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * log.h - Logging infrastructure\n>   */\n> -#ifndef __LIBCAMERA_LOG_H__\n> -#define __LIBCAMERA_LOG_H__\n> +#ifndef __LIBCAMERA_INTERNAL_LOG_H__\n> +#define __LIBCAMERA_INTERNAL_LOG_H__\n>  \n>  #include <chrono>\n>  #include <sstream>\n> @@ -127,4 +127,4 @@ LogMessage _log(const char *file, unsigned int line,\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_LOG_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_LOG_H__ */\n> diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h\n> index 9fe76c514b17..24093674fe15 100644\n> --- a/include/libcamera/internal/media_device.h\n> +++ b/include/libcamera/internal/media_device.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * media_device.h - Media device handler\n>   */\n> -#ifndef __LIBCAMERA_MEDIA_DEVICE_H__\n> -#define __LIBCAMERA_MEDIA_DEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__\n>  \n>  #include <map>\n>  #include <sstream>\n> @@ -91,4 +91,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MEDIA_DEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ */\n> diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h\n> index 748eafdc880b..d9b1c19bbf96 100644\n> --- a/include/libcamera/internal/media_object.h\n> +++ b/include/libcamera/internal/media_object.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * media_object.h - Media Device objects: entities, pads and links.\n>   */\n> -#ifndef __LIBCAMERA_MEDIA_OBJECT_H__\n> -#define __LIBCAMERA_MEDIA_OBJECT_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__\n> +#define __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -121,4 +121,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MEDIA_OBJECT_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__ */\n> diff --git a/include/libcamera/internal/message.h b/include/libcamera/internal/message.h\n> index 8e8b013dcd18..92ea64a5d714 100644\n> --- a/include/libcamera/internal/message.h\n> +++ b/include/libcamera/internal/message.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * message.h - Message queue support\n>   */\n> -#ifndef __LIBCAMERA_MESSAGE_H__\n> -#define __LIBCAMERA_MESSAGE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_MESSAGE_H__\n> +#define __LIBCAMERA_INTERNAL_MESSAGE_H__\n>  \n>  #include <atomic>\n>  \n> @@ -67,4 +67,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_MESSAGE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_MESSAGE_H__ */\n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 428f5887c76b..56968d14a6e8 100644\n> --- a/include/libcamera/internal/pipeline_handler.h\n> +++ b/include/libcamera/internal/pipeline_handler.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * pipeline_handler.h - Pipeline handler infrastructure\n>   */\n> -#ifndef __LIBCAMERA_PIPELINE_HANDLER_H__\n> -#define __LIBCAMERA_PIPELINE_HANDLER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n> +#define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n>  \n>  #include <list>\n>  #include <map>\n> @@ -148,4 +148,4 @@ static handler##Factory global_##handler##Factory;\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PIPELINE_HANDLER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__ */\n> diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\n> index d322fce13ae4..36595106f3b9 100644\n> --- a/include/libcamera/internal/process.h\n> +++ b/include/libcamera/internal/process.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * process.h - Process object\n>   */\n> -#ifndef __LIBCAMERA_PROCESS_H__\n> -#define __LIBCAMERA_PROCESS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PROCESS_H__\n> +#define __LIBCAMERA_INTERNAL_PROCESS_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -52,4 +52,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PROCESS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PROCESS_H__ */\n> diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h\n> index f35bf3738c6f..f5f988b58f74 100644\n> --- a/include/libcamera/internal/pub_key.h\n> +++ b/include/libcamera/internal/pub_key.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * pub_key.h - Public key signature verification\n>   */\n> -#ifndef __LIBCAMERA_PUB_KEY_H__\n> -#define __LIBCAMERA_PUB_KEY_H__\n> +#ifndef __LIBCAMERA_INTERNAL_PUB_KEY_H__\n> +#define __LIBCAMERA_INTERNAL_PUB_KEY_H__\n>  \n>  #include <stdint.h>\n>  \n> @@ -35,4 +35,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_PUB_KEY_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_PUB_KEY_H__ */\n> diff --git a/include/libcamera/internal/semaphore.h b/include/libcamera/internal/semaphore.h\n> index 4d93077c776f..9dc65d299cfd 100644\n> --- a/include/libcamera/internal/semaphore.h\n> +++ b/include/libcamera/internal/semaphore.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * semaphore.h - General-purpose counting semaphore\n>   */\n> -#ifndef __LIBCAMERA_SEMAPHORE_H__\n> -#define __LIBCAMERA_SEMAPHORE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_SEMAPHORE_H__\n> +#define __LIBCAMERA_INTERNAL_SEMAPHORE_H__\n>  \n>  #include <condition_variable>\n>  \n> @@ -31,4 +31,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_SEMAPHORE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_SEMAPHORE_H__ */\n> diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h\n> index 6594c9b06b8d..7b59e583c19f 100644\n> --- a/include/libcamera/internal/thread.h\n> +++ b/include/libcamera/internal/thread.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * thread.h - Thread support\n>   */\n> -#ifndef __LIBCAMERA_THREAD_H__\n> -#define __LIBCAMERA_THREAD_H__\n> +#ifndef __LIBCAMERA_INTERNAL_THREAD_H__\n> +#define __LIBCAMERA_INTERNAL_THREAD_H__\n>  \n>  #include <memory>\n>  #include <mutex>\n> @@ -74,4 +74,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_THREAD_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_THREAD_H__ */\n> diff --git a/include/libcamera/internal/utils.h b/include/libcamera/internal/utils.h\n> index 3334ff16613d..0953423ee8d0 100644\n> --- a/include/libcamera/internal/utils.h\n> +++ b/include/libcamera/internal/utils.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * utils.h - Miscellaneous utility functions\n>   */\n> -#ifndef __LIBCAMERA_UTILS_H__\n> -#define __LIBCAMERA_UTILS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_UTILS_H__\n> +#define __LIBCAMERA_INTERNAL_UTILS_H__\n>  \n>  #include <algorithm>\n>  #include <chrono>\n> @@ -194,4 +194,4 @@ std::string libcameraSourcePath();\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_UTILS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_UTILS_H__ */\n> diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h\n> index cffe9efd9919..0851b8ddb128 100644\n> --- a/include/libcamera/internal/v4l2_controls.h\n> +++ b/include/libcamera/internal/v4l2_controls.h\n> @@ -5,8 +5,8 @@\n>   * v4l2_controls.h - V4L2 Controls Support\n>   */\n>  \n> -#ifndef __LIBCAMERA_V4L2_CONTROLS_H__\n> -#define __LIBCAMERA_V4L2_CONTROLS_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__\n>  \n>  #include <linux/videodev2.h>\n>  \n> @@ -28,4 +28,4 @@ public:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_CONTROLS_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ */\n> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\n> index d491eafd262e..bf643f2ec966 100644\n> --- a/include/libcamera/internal/v4l2_device.h\n> +++ b/include/libcamera/internal/v4l2_device.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_device.h - Common base for V4L2 video devices and subdevices\n>   */\n> -#ifndef __LIBCAMERA_V4L2_DEVICE_H__\n> -#define __LIBCAMERA_V4L2_DEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__\n>  \n>  #include <map>\n>  #include <memory>\n> @@ -57,4 +57,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_DEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__ */\n> diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h\n> index 4d0e034b8b51..9bfd81ad6651 100644\n> --- a/include/libcamera/internal/v4l2_pixelformat.h\n> +++ b/include/libcamera/internal/v4l2_pixelformat.h\n> @@ -5,8 +5,8 @@\n>   *\n>   * v4l2_pixelformat.h - V4L2 Pixel Format\n>   */\n> -#ifndef __LIBCAMERA_V4L2_PIXELFORMAT_H__\n> -#define __LIBCAMERA_V4L2_PIXELFORMAT_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__\n>  \n>  #include <stdint.h>\n>  #include <string>\n> @@ -46,4 +46,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_PIXELFORMAT_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__ */\n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 1be454f0ddda..8016fa5da68c 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_subdevice.h - V4L2 Subdevice\n>   */\n> -#ifndef __LIBCAMERA_V4L2_SUBDEVICE_H__\n> -#define __LIBCAMERA_V4L2_SUBDEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n>  \n>  #include <string>\n>  #include <vector>\n> @@ -74,4 +74,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_SUBDEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__ */\n> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> index c93cf816373b..29d819a8dacd 100644\n> --- a/include/libcamera/internal/v4l2_videodevice.h\n> +++ b/include/libcamera/internal/v4l2_videodevice.h\n> @@ -4,8 +4,8 @@\n>   *\n>   * v4l2_videodevice.h - V4L2 Video Device\n>   */\n> -#ifndef __LIBCAMERA_V4L2_VIDEODEVICE_H__\n> -#define __LIBCAMERA_V4L2_VIDEODEVICE_H__\n> +#ifndef __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__\n> +#define __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__\n>  \n>  #include <atomic>\n>  #include <memory>\n> @@ -274,4 +274,4 @@ private:\n>  \n>  } /* namespace libcamera */\n>  \n> -#endif /* __LIBCAMERA_V4L2_VIDEODEVICE_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__ */\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lf1-x136.google.com (mail-lf1-x136.google.com\n\t[IPv6:2a00:1450:4864:20::136])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A6D95603CA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  5 Jun 2020 22:00:58 +0200 (CEST)","by mail-lf1-x136.google.com with SMTP id x27so6512142lfg.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 05 Jun 2020 13:00:58 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tf19sm1332706lfk.24.2020.06.05.13.00.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 05 Jun 2020 13:00:57 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"cvns5Arb\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=V/JHwbs2tNCIojisQYklueoMAGiWBYpGLQL/U87ftDc=;\n\tb=cvns5Arbia2XDwSNkv0ttP8BO3tu02YGB+7mRcenSr8c1/viL5qM+hWLLUD4iTwqkW\n\tU+icgdCDHzcOVPszBFQmmF/u1F3S9ONdjEinkMAJ/nCLOak2c6+oQmp6I/ONpLdsHf5w\n\tcWp2wIIEKrKjF+AhftnmJKXd2TmTU+Sas8Yi+8CP+IYUUKCSOYEIcmctwuRY3nfxScRU\n\t1+RBgLZ93crdm70GoP2vS1TUHaWIGgBxaxdEtS3Dc7TIYfH8U+rk9dx3PIzIAdwK8N3B\n\ta4w7Hij8WsyxiOFrpnLBPIZfslFAlNFD61QFFIuaK5hQD8dXKtK4m4HR7yMV5+OIK4lk\n\tYXiA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=V/JHwbs2tNCIojisQYklueoMAGiWBYpGLQL/U87ftDc=;\n\tb=jA9UIB5WdzaWNhtMYITEJuUev4nU33e0OMlCoIPLuT32m0DmvfGKF6kUb0bG8txT26\n\t/8Bdob0AjDMv9yhDfXZlLYmRMJb3cwUQyp7i0F9O4SxKs+nF0E91Z5vnOzQT1k/89AM1\n\t3gE+IvygxjK7FN4HR4vfgVR6yqqBbv1q525GwKS8tai20xAlXvRpHZdweRgVJtK4i/FN\n\tdA5kY6kIOHvyMhllJjiCIk07C9x7d6WyKsIewaFYYkgH9dqeJ3ENil53p3zCWxJw+GyO\n\tGg4/aU3sW5a9VtFZ2PXvPNCe3yG3c4nE39y9JLlbEKFVBTNaYqDenj3T7U5KHwyJypaJ\n\twMpw==","X-Gm-Message-State":"AOAM531vSZj/D1a/FfaZMxQjcvhhqqhqUsJcx2JyOP6bRYtfSHEsQUPB\n\tq96R0YJ8yuezwGfEH9MjmruZSw==","X-Google-Smtp-Source":"ABdhPJyH/I7DRGADzyK/AvL6jdPcVIDjSwIcKJlLBkBtKuM0SMJvrn4ZP6Lqa12Vra0Ls5tWUP09Hw==","X-Received":"by 2002:a19:5d44:: with SMTP id p4mr6161001lfj.56.1591387257659; \n\tFri, 05 Jun 2020 13:00:57 -0700 (PDT)","Date":"Fri, 5 Jun 2020 22:00:56 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200605200056.GQ5864@oden.dyn.berto.se>","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>\n\t<20200522145459.16836-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200522145459.16836-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH/RFC 03/11] libcamera: Rename header\n\tguards for internal headers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Fri, 05 Jun 2020 20:00:58 -0000"}}]