{"id":3801,"url":"https://patchwork.libcamera.org/api/1.1/patches/3801/?format=json","web_url":"https://patchwork.libcamera.org/patch/3801/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200515163505.24330-2-laurent.pinchart@ideasonboard.com>","date":"2020-05-15T16:35:03","name":"[libcamera-devel,v2,2/3] libcamera: Move IPA headers from include/ipa/ to include/libcamera/ipa/","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"31a8bd90397906e1b3e934a21976a01b89efa153","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3801/mbox/","series":[{"id":906,"url":"https://patchwork.libcamera.org/api/1.1/series/906/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=906","date":"2020-05-15T16:35:02","name":"[libcamera-devel,v2,1/3] libcamera: Move internal headers to include/libcamera/internal/","version":2,"mbox":"https://patchwork.libcamera.org/series/906/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3801/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3801/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@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 3EA0460E04\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 May 2020 18:35:18 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BF46E9C5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 May 2020 18:35:17 +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=\"gS3f9Zzz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589560517;\n\tbh=w+KlM2gYu/rf9GvPMkMw/AFBoClDUXEVmogzCmuvi7M=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=gS3f9ZzzUPKyHvJsuGs1HfO13qGt14Agx8hjZx+fdAcaDAt1t+IGD6XzNgQPHnYBu\n\tNvBLzjnHzkCUDtJxXhFRajz4LdLzh8aqg4mLiWIz+d9AgN9VHx+gsGFAaOeIoD7MYM\n\tA3B229x6pF+EMA5l+UqssY6SmGeSp0abu7qh9Zl8=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 15 May 2020 19:35:03 +0300","Message-Id":"<20200515163505.24330-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200515163505.24330-1-laurent.pinchart@ideasonboard.com>","References":"<20200515163505.24330-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/3] libcamera: Move IPA headers from\n\tinclude/ipa/ to include/libcamera/ipa/","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, 15 May 2020 16:35:18 -0000"},"content":"The IPA headers are installed into $prefix/include/libcamera/ipa/, but\nare located in the source tree in include/ipa/. This requires files\nwithin libcamera to include them with\n\n #include <ipa/foo.h>\n\nwhile a third party IPA would need to use\n\n #include <libcamera/ipa/foo.h>\n\nNot only is this inconsistent, it can create issues later if IPA headers\nneed to include each other, as the first form of include directive\nwouldn't be valid once the headers are installed.\n\nFix the problem by moving the IPA headers to include/libcamera/ipa/.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n Documentation/Doxyfile.in                             | 3 +--\n include/libcamera/internal/ipa_context_wrapper.h      | 2 +-\n include/libcamera/internal/ipa_manager.h              | 4 ++--\n include/libcamera/internal/ipa_module.h               | 4 ++--\n include/libcamera/internal/ipa_proxy.h                | 2 +-\n include/{ => libcamera}/ipa/ipa_controls.h            | 0\n include/{ => libcamera}/ipa/ipa_interface.h           | 0\n include/{ => libcamera}/ipa/ipa_module_info.h         | 0\n include/{ => libcamera}/ipa/ipa_vimc.h                | 0\n include/{ => libcamera}/ipa/meson.build               | 0\n include/{ => libcamera}/ipa/raspberrypi.h             | 0\n include/{ => libcamera}/ipa/rkisp1.h                  | 0\n include/libcamera/meson.build                         | 1 +\n include/meson.build                                   | 1 -\n src/ipa/libipa/ipa_interface_wrapper.cpp              | 2 +-\n src/ipa/libipa/ipa_interface_wrapper.h                | 2 +-\n src/ipa/raspberrypi/raspberrypi.cpp                   | 7 ++++---\n src/ipa/rkisp1/rkisp1.cpp                             | 7 ++++---\n src/ipa/vimc/vimc.cpp                                 | 6 +++---\n src/libcamera/control_serializer.cpp                  | 2 +-\n src/libcamera/ipa_controls.cpp                        | 2 +-\n src/libcamera/ipa_interface.cpp                       | 2 +-\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp    | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp              | 2 +-\n src/libcamera/pipeline/vimc/vimc.cpp                  | 4 ++--\n src/libcamera/proxy/ipa_proxy_linux.cpp               | 4 ++--\n src/libcamera/proxy/ipa_proxy_thread.cpp              | 4 ++--\n src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp | 2 +-\n test/ipa/ipa_interface_test.cpp                       | 3 +--\n 29 files changed, 34 insertions(+), 34 deletions(-)\n rename include/{ => libcamera}/ipa/ipa_controls.h (100%)\n rename include/{ => libcamera}/ipa/ipa_interface.h (100%)\n rename include/{ => libcamera}/ipa/ipa_module_info.h (100%)\n rename include/{ => libcamera}/ipa/ipa_vimc.h (100%)\n rename include/{ => libcamera}/ipa/meson.build (100%)\n rename include/{ => libcamera}/ipa/raspberrypi.h (100%)\n rename include/{ => libcamera}/ipa/rkisp1.h (100%)","diff":"diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex c3fe5f663f7c..5f4847523c53 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -794,8 +794,7 @@ WARN_LOGFILE           =\n # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING\n # Note: If this tag is empty the current directory is searched.\n \n-INPUT                  = \"@TOP_SRCDIR@/include/ipa\" \\\n-\t\t\t \"@TOP_SRCDIR@/include/libcamera\" \\\n+INPUT                  = \"@TOP_SRCDIR@/include/libcamera\" \\\n \t\t\t \"@TOP_SRCDIR@/src/ipa/libipa\" \\\n \t\t\t \"@TOP_SRCDIR@/src/libcamera\" \\\n \t\t\t \"@TOP_BUILDDIR@/include/libcamera\" \\\ndiff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h\nindex a717d4067498..bd770e132c0c 100644\n--- a/include/libcamera/internal/ipa_context_wrapper.h\n+++ b/include/libcamera/internal/ipa_context_wrapper.h\n@@ -7,7 +7,7 @@\n #ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n #define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__\n \n-#include <ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_interface.h>\n \n #include \"libcamera/internal/control_serializer.h\"\n \ndiff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex f07d91fc7bbf..2412d75746ac 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -10,8 +10,8 @@\n #include <stdint.h>\n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n \n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\ndiff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h\nindex 2f569db0b848..5b54cb31a48a 100644\n--- a/include/libcamera/internal/ipa_module.h\n+++ b/include/libcamera/internal/ipa_module.h\n@@ -11,8 +11,8 @@\n #include <string>\n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n \n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\ndiff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h\nindex 1111065b36a7..e9a36608bd31 100644\n--- a/include/libcamera/internal/ipa_proxy.h\n+++ b/include/libcamera/internal/ipa_proxy.h\n@@ -11,7 +11,7 @@\n #include <string>\n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_interface.h>\n \n namespace libcamera {\n \ndiff --git a/include/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h\nsimilarity index 100%\nrename from include/ipa/ipa_controls.h\nrename to include/libcamera/ipa/ipa_controls.h\ndiff --git a/include/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\nsimilarity index 100%\nrename from include/ipa/ipa_interface.h\nrename to include/libcamera/ipa/ipa_interface.h\ndiff --git a/include/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h\nsimilarity index 100%\nrename from include/ipa/ipa_module_info.h\nrename to include/libcamera/ipa/ipa_module_info.h\ndiff --git a/include/ipa/ipa_vimc.h b/include/libcamera/ipa/ipa_vimc.h\nsimilarity index 100%\nrename from include/ipa/ipa_vimc.h\nrename to include/libcamera/ipa/ipa_vimc.h\ndiff --git a/include/ipa/meson.build b/include/libcamera/ipa/meson.build\nsimilarity index 100%\nrename from include/ipa/meson.build\nrename to include/libcamera/ipa/meson.build\ndiff --git a/include/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h\nsimilarity index 100%\nrename from include/ipa/raspberrypi.h\nrename to include/libcamera/ipa/raspberrypi.h\ndiff --git a/include/ipa/rkisp1.h b/include/libcamera/ipa/rkisp1.h\nsimilarity index 100%\nrename from include/ipa/rkisp1.h\nrename to include/libcamera/ipa/rkisp1.h\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex f9c8e64bd50c..32b8d14211a4 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -24,6 +24,7 @@ libcamera_api = files([\n include_dir = join_paths(libcamera_include_dir, 'libcamera')\n \n subdir('internal')\n+subdir('ipa')\n \n install_headers(libcamera_api,\n                 subdir : include_dir)\ndiff --git a/include/meson.build b/include/meson.build\nindex 4f41c9ceeb4c..2ac9a3a049f2 100644\n--- a/include/meson.build\n+++ b/include/meson.build\n@@ -3,5 +3,4 @@\n libcamera_include_dir = 'libcamera'\n \n subdir('android')\n-subdir('ipa')\n subdir('libcamera')\ndiff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp\nindex 90f270c021a9..2a2e43abc708 100644\n--- a/src/ipa/libipa/ipa_interface_wrapper.cpp\n+++ b/src/ipa/libipa/ipa_interface_wrapper.cpp\n@@ -12,7 +12,7 @@\n #include <unistd.h>\n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_interface.h>\n \n #include \"libcamera/internal/byte_stream_buffer.h\"\n #include \"libcamera/internal/camera_sensor.h\"\ndiff --git a/src/ipa/libipa/ipa_interface_wrapper.h b/src/ipa/libipa/ipa_interface_wrapper.h\nindex b426034d551d..a1c701599b56 100644\n--- a/src/ipa/libipa/ipa_interface_wrapper.h\n+++ b/src/ipa/libipa/ipa_interface_wrapper.h\n@@ -9,7 +9,7 @@\n \n #include <memory>\n \n-#include <ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_interface.h>\n \n #include \"libcamera/internal/control_serializer.h\"\n \ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 46b244538e32..9669f2126e6c 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -12,14 +12,15 @@\n #include <string.h>\n #include <sys/mman.h>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n-#include <ipa/raspberrypi.h>\n #include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n+#include <libcamera/ipa/raspberrypi.h>\n #include <libcamera/request.h>\n #include <libcamera/span.h>\n+\n #include <libipa/ipa_interface_wrapper.h>\n \n #include \"libcamera/internal/camera_sensor.h\"\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 4f6e0342dac1..fbdc908fc816 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -14,12 +14,13 @@\n \n #include <linux/rkisp1-config.h>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n-#include <ipa/rkisp1.h>\n #include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n+#include <libcamera/ipa/rkisp1.h>\n #include <libcamera/request.h>\n+\n #include <libipa/ipa_interface_wrapper.h>\n \n #include \"libcamera/internal/log.h\"\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 3fa6be6535e2..af278a482b8a 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -5,7 +5,7 @@\n  * ipa_vimc.cpp - Vimc Image Processing Algorithm module\n  */\n \n-#include <ipa/ipa_vimc.h>\n+#include <libcamera/ipa/ipa_vimc.h>\n \n #include <fcntl.h>\n #include <string.h>\n@@ -14,8 +14,8 @@\n \n #include <iostream>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n \n #include <libipa/ipa_interface_wrapper.h>\n \ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex bf162b6cc471..258db6dfbf5a 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -11,9 +11,9 @@\n #include <memory>\n #include <vector>\n \n-#include <ipa/ipa_controls.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n+#include <libcamera/ipa/ipa_controls.h>\n #include <libcamera/span.h>\n \n #include \"libcamera/internal/byte_stream_buffer.h\"\ndiff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp\nindex b1d14190e3fe..8fd726513182 100644\n--- a/src/libcamera/ipa_controls.cpp\n+++ b/src/libcamera/ipa_controls.cpp\n@@ -5,7 +5,7 @@\n  * ipa_controls.cpp - IPA control handling\n  */\n \n-#include <ipa/ipa_controls.h>\n+#include <libcamera/ipa/ipa_controls.h>\n \n /**\n  * \\file ipa_controls.h\ndiff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp\nindex c890eadaf6c8..69835e63ab46 100644\n--- a/src/libcamera/ipa_interface.cpp\n+++ b/src/libcamera/ipa_interface.cpp\n@@ -5,7 +5,7 @@\n  * ipa_interface.cpp - Image Processing Algorithm interface\n  */\n \n-#include <ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_interface.h>\n \n /**\n  * \\file ipa_interface.h\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex e254e5558d92..07ca9f5d7f53 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -11,9 +11,9 @@\n #include <queue>\n #include <sys/mman.h>\n \n-#include <ipa/raspberrypi.h>\n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/ipa/raspberrypi.h>\n #include <libcamera/logging.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 7a0c8771ba54..d807fc2cf535 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -13,10 +13,10 @@\n \n #include <linux/media-bus-format.h>\n \n-#include <ipa/rkisp1.h>\n #include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/ipa/rkisp1.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 50a9f2df4c24..ca36348a5eb6 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -14,11 +14,11 @@\n #include <linux/media-bus-format.h>\n #include <linux/version.h>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \ndiff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\nindex 7d6f8799f8ff..be34f20aa857 100644\n--- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n@@ -7,8 +7,8 @@\n \n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n \n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/ipa_proxy.h\"\ndiff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp\nindex 03d4c0d927b9..6fbebed2ba72 100644\n--- a/src/libcamera/proxy/ipa_proxy_thread.cpp\n+++ b/src/libcamera/proxy/ipa_proxy_thread.cpp\n@@ -7,8 +7,8 @@\n \n #include <memory>\n \n-#include <ipa/ipa_interface.h>\n-#include <ipa/ipa_module_info.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n \n #include \"libcamera/internal/ipa_context_wrapper.h\"\n #include \"libcamera/internal/ipa_module.h\"\ndiff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\nindex 9ba94d01d0ca..0c4687f737a3 100644\n--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n@@ -9,8 +9,8 @@\n #include <sys/types.h>\n #include <unistd.h>\n \n-#include <ipa/ipa_interface.h>\n #include <libcamera/event_dispatcher.h>\n+#include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/logging.h>\n \n #include \"libcamera/internal/ipa_module.h\"\ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex c394377dacd0..2f02af49cce9 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -14,10 +14,9 @@\n \n #include <libcamera/event_dispatcher.h>\n #include <libcamera/event_notifier.h>\n+#include <libcamera/ipa/ipa_vimc.h>\n #include <libcamera/timer.h>\n \n-#include <ipa/ipa_vimc.h>\n-\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/ipa_module.h\"\n","prefixes":["libcamera-devel","v2","2/3"]}