[libcamera-devel,13/15] ipa: raspberrypi: Rename header files from *.hpp to *.h
diff mbox series

Message ID 20220725134639.4572-14-naush@raspberrypi.com
State Superseded
Headers show
Series
  • Raspberry Pi IPA code refactor
Related show

Commit Message

Naushir Patuck July 25, 2022, 1:46 p.m. UTC
As per the libcamera coding guidelines, rename all .hpp header files to .h.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
 src/ipa/raspberrypi/cam_helper.cpp             |  4 ++--
 .../{cam_helper.hpp => cam_helper.h}           |  8 ++++----
 src/ipa/raspberrypi/cam_helper_imx219.cpp      |  4 ++--
 src/ipa/raspberrypi/cam_helper_imx290.cpp      |  2 +-
 src/ipa/raspberrypi/cam_helper_imx296.cpp      |  2 +-
 src/ipa/raspberrypi/cam_helper_imx477.cpp      |  4 ++--
 src/ipa/raspberrypi/cam_helper_imx519.cpp      |  4 ++--
 src/ipa/raspberrypi/cam_helper_ov5647.cpp      |  2 +-
 src/ipa/raspberrypi/cam_helper_ov9281.cpp      |  2 +-
 .../{agc_algorithm.hpp => agc_algorithm.h}     |  4 ++--
 src/ipa/raspberrypi/controller/algorithm.cpp   |  2 +-
 .../controller/{algorithm.hpp => algorithm.h}  |  4 ++--
 .../{awb_algorithm.hpp => awb_algorithm.h}     |  4 ++--
 .../{ccm_algorithm.hpp => ccm_algorithm.h}     |  4 ++--
 ...rast_algorithm.hpp => contrast_algorithm.h} |  4 ++--
 src/ipa/raspberrypi/controller/controller.cpp  |  4 ++--
 .../{controller.hpp => controller.h}           |  4 ++--
 ...noise_algorithm.hpp => denoise_algorithm.h} |  4 ++--
 src/ipa/raspberrypi/controller/histogram.cpp   |  2 +-
 .../controller/{histogram.hpp => histogram.h}  |  2 +-
 .../controller/{metadata.hpp => metadata.h}    |  2 +-
 src/ipa/raspberrypi/controller/pwl.cpp         |  2 +-
 .../raspberrypi/controller/{pwl.hpp => pwl.h}  |  2 +-
 src/ipa/raspberrypi/controller/rpi/agc.cpp     |  6 +++---
 .../controller/rpi/{agc.hpp => agc.h}          |  6 +++---
 src/ipa/raspberrypi/controller/rpi/alsc.cpp    |  2 +-
 .../controller/rpi/{alsc.hpp => alsc.h}        |  4 ++--
 src/ipa/raspberrypi/controller/rpi/awb.cpp     |  2 +-
 .../controller/rpi/{awb.hpp => awb.h}          |  6 +++---
 .../raspberrypi/controller/rpi/black_level.cpp |  2 +-
 .../rpi/{black_level.hpp => black_level.h}     |  4 ++--
 src/ipa/raspberrypi/controller/rpi/ccm.cpp     |  4 ++--
 .../controller/rpi/{ccm.hpp => ccm.h}          |  6 +++---
 .../raspberrypi/controller/rpi/contrast.cpp    |  4 ++--
 .../rpi/{contrast.hpp => contrast.h}           |  6 +++---
 src/ipa/raspberrypi/controller/rpi/dpc.cpp     |  2 +-
 .../controller/rpi/{dpc.hpp => dpc.h}          |  4 ++--
 src/ipa/raspberrypi/controller/rpi/focus.cpp   |  2 +-
 .../controller/rpi/{focus.hpp => focus.h}      |  6 +++---
 src/ipa/raspberrypi/controller/rpi/geq.cpp     |  4 ++--
 .../controller/rpi/{geq.hpp => geq.h}          |  4 ++--
 src/ipa/raspberrypi/controller/rpi/lux.cpp     |  2 +-
 .../controller/rpi/{lux.hpp => lux.h}          |  4 ++--
 src/ipa/raspberrypi/controller/rpi/noise.cpp   |  2 +-
 .../controller/rpi/{noise.hpp => noise.h}      |  4 ++--
 src/ipa/raspberrypi/controller/rpi/sdn.cpp     |  2 +-
 .../controller/rpi/{sdn.hpp => sdn.h}          |  6 +++---
 src/ipa/raspberrypi/controller/rpi/sharpen.cpp |  2 +-
 .../controller/rpi/{sharpen.hpp => sharpen.h}  |  4 ++--
 ...arpen_algorithm.hpp => sharpen_algorithm.h} |  4 ++--
 .../raspberrypi/{md_parser.hpp => md_parser.h} |  2 +-
 src/ipa/raspberrypi/md_parser_smia.cpp         |  2 +-
 src/ipa/raspberrypi/raspberrypi.cpp            | 18 +++++++++---------
 53 files changed, 101 insertions(+), 101 deletions(-)
 rename src/ipa/raspberrypi/{cam_helper.hpp => cam_helper.h} (96%)
 rename src/ipa/raspberrypi/controller/{agc_algorithm.hpp => agc_algorithm.h} (92%)
 rename src/ipa/raspberrypi/controller/{algorithm.hpp => algorithm.h} (95%)
 rename src/ipa/raspberrypi/controller/{awb_algorithm.hpp => awb_algorithm.h} (86%)
 rename src/ipa/raspberrypi/controller/{ccm_algorithm.hpp => ccm_algorithm.h} (78%)
 rename src/ipa/raspberrypi/controller/{contrast_algorithm.hpp => contrast_algorithm.h} (82%)
 rename src/ipa/raspberrypi/controller/{controller.hpp => controller.h} (95%)
 rename src/ipa/raspberrypi/controller/{denoise_algorithm.hpp => denoise_algorithm.h} (86%)
 rename src/ipa/raspberrypi/controller/{histogram.hpp => histogram.h} (96%)
 rename src/ipa/raspberrypi/controller/{metadata.hpp => metadata.h} (98%)
 rename src/ipa/raspberrypi/controller/{pwl.hpp => pwl.h} (98%)
 rename src/ipa/raspberrypi/controller/rpi/{agc.hpp => agc.h} (97%)
 rename src/ipa/raspberrypi/controller/rpi/{alsc.hpp => alsc.h} (97%)
 rename src/ipa/raspberrypi/controller/rpi/{awb.hpp => awb.h} (98%)
 rename src/ipa/raspberrypi/controller/rpi/{black_level.hpp => black_level.h} (88%)
 rename src/ipa/raspberrypi/controller/rpi/{ccm.hpp => ccm.h} (93%)
 rename src/ipa/raspberrypi/controller/rpi/{contrast.hpp => contrast.h} (90%)
 rename src/ipa/raspberrypi/controller/rpi/{dpc.hpp => dpc.h} (85%)
 rename src/ipa/raspberrypi/controller/rpi/{focus.hpp => focus.h} (85%)
 rename src/ipa/raspberrypi/controller/rpi/{geq.hpp => geq.h} (88%)
 rename src/ipa/raspberrypi/controller/rpi/{lux.hpp => lux.h} (94%)
 rename src/ipa/raspberrypi/controller/rpi/{noise.hpp => noise.h} (91%)
 rename src/ipa/raspberrypi/controller/rpi/{sdn.hpp => sdn.h} (84%)
 rename src/ipa/raspberrypi/controller/rpi/{sharpen.hpp => sharpen.h} (90%)
 rename src/ipa/raspberrypi/controller/{sharpen_algorithm.hpp => sharpen_algorithm.h} (82%)
 rename src/ipa/raspberrypi/{md_parser.hpp => md_parser.h} (98%)

Comments

Laurent Pinchart July 25, 2022, 9:03 p.m. UTC | #1
Hi Naush,

Thank you for the patch.

On Mon, Jul 25, 2022 at 02:46:37PM +0100, Naushir Patuck via libcamera-devel wrote:
> As per the libcamera coding guidelines, rename all .hpp header files to .h.
> 
> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/ipa/raspberrypi/cam_helper.cpp             |  4 ++--
>  .../{cam_helper.hpp => cam_helper.h}           |  8 ++++----
>  src/ipa/raspberrypi/cam_helper_imx219.cpp      |  4 ++--
>  src/ipa/raspberrypi/cam_helper_imx290.cpp      |  2 +-
>  src/ipa/raspberrypi/cam_helper_imx296.cpp      |  2 +-
>  src/ipa/raspberrypi/cam_helper_imx477.cpp      |  4 ++--
>  src/ipa/raspberrypi/cam_helper_imx519.cpp      |  4 ++--
>  src/ipa/raspberrypi/cam_helper_ov5647.cpp      |  2 +-
>  src/ipa/raspberrypi/cam_helper_ov9281.cpp      |  2 +-
>  .../{agc_algorithm.hpp => agc_algorithm.h}     |  4 ++--
>  src/ipa/raspberrypi/controller/algorithm.cpp   |  2 +-
>  .../controller/{algorithm.hpp => algorithm.h}  |  4 ++--
>  .../{awb_algorithm.hpp => awb_algorithm.h}     |  4 ++--
>  .../{ccm_algorithm.hpp => ccm_algorithm.h}     |  4 ++--
>  ...rast_algorithm.hpp => contrast_algorithm.h} |  4 ++--
>  src/ipa/raspberrypi/controller/controller.cpp  |  4 ++--
>  .../{controller.hpp => controller.h}           |  4 ++--
>  ...noise_algorithm.hpp => denoise_algorithm.h} |  4 ++--
>  src/ipa/raspberrypi/controller/histogram.cpp   |  2 +-
>  .../controller/{histogram.hpp => histogram.h}  |  2 +-
>  .../controller/{metadata.hpp => metadata.h}    |  2 +-
>  src/ipa/raspberrypi/controller/pwl.cpp         |  2 +-
>  .../raspberrypi/controller/{pwl.hpp => pwl.h}  |  2 +-
>  src/ipa/raspberrypi/controller/rpi/agc.cpp     |  6 +++---
>  .../controller/rpi/{agc.hpp => agc.h}          |  6 +++---
>  src/ipa/raspberrypi/controller/rpi/alsc.cpp    |  2 +-
>  .../controller/rpi/{alsc.hpp => alsc.h}        |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/awb.cpp     |  2 +-
>  .../controller/rpi/{awb.hpp => awb.h}          |  6 +++---
>  .../raspberrypi/controller/rpi/black_level.cpp |  2 +-
>  .../rpi/{black_level.hpp => black_level.h}     |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/ccm.cpp     |  4 ++--
>  .../controller/rpi/{ccm.hpp => ccm.h}          |  6 +++---
>  .../raspberrypi/controller/rpi/contrast.cpp    |  4 ++--
>  .../rpi/{contrast.hpp => contrast.h}           |  6 +++---
>  src/ipa/raspberrypi/controller/rpi/dpc.cpp     |  2 +-
>  .../controller/rpi/{dpc.hpp => dpc.h}          |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/focus.cpp   |  2 +-
>  .../controller/rpi/{focus.hpp => focus.h}      |  6 +++---
>  src/ipa/raspberrypi/controller/rpi/geq.cpp     |  4 ++--
>  .../controller/rpi/{geq.hpp => geq.h}          |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/lux.cpp     |  2 +-
>  .../controller/rpi/{lux.hpp => lux.h}          |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/noise.cpp   |  2 +-
>  .../controller/rpi/{noise.hpp => noise.h}      |  4 ++--
>  src/ipa/raspberrypi/controller/rpi/sdn.cpp     |  2 +-
>  .../controller/rpi/{sdn.hpp => sdn.h}          |  6 +++---
>  src/ipa/raspberrypi/controller/rpi/sharpen.cpp |  2 +-
>  .../controller/rpi/{sharpen.hpp => sharpen.h}  |  4 ++--
>  ...arpen_algorithm.hpp => sharpen_algorithm.h} |  4 ++--
>  .../raspberrypi/{md_parser.hpp => md_parser.h} |  2 +-
>  src/ipa/raspberrypi/md_parser_smia.cpp         |  2 +-
>  src/ipa/raspberrypi/raspberrypi.cpp            | 18 +++++++++---------
>  53 files changed, 101 insertions(+), 101 deletions(-)
>  rename src/ipa/raspberrypi/{cam_helper.hpp => cam_helper.h} (96%)
>  rename src/ipa/raspberrypi/controller/{agc_algorithm.hpp => agc_algorithm.h} (92%)
>  rename src/ipa/raspberrypi/controller/{algorithm.hpp => algorithm.h} (95%)
>  rename src/ipa/raspberrypi/controller/{awb_algorithm.hpp => awb_algorithm.h} (86%)
>  rename src/ipa/raspberrypi/controller/{ccm_algorithm.hpp => ccm_algorithm.h} (78%)
>  rename src/ipa/raspberrypi/controller/{contrast_algorithm.hpp => contrast_algorithm.h} (82%)
>  rename src/ipa/raspberrypi/controller/{controller.hpp => controller.h} (95%)
>  rename src/ipa/raspberrypi/controller/{denoise_algorithm.hpp => denoise_algorithm.h} (86%)
>  rename src/ipa/raspberrypi/controller/{histogram.hpp => histogram.h} (96%)
>  rename src/ipa/raspberrypi/controller/{metadata.hpp => metadata.h} (98%)
>  rename src/ipa/raspberrypi/controller/{pwl.hpp => pwl.h} (98%)
>  rename src/ipa/raspberrypi/controller/rpi/{agc.hpp => agc.h} (97%)
>  rename src/ipa/raspberrypi/controller/rpi/{alsc.hpp => alsc.h} (97%)
>  rename src/ipa/raspberrypi/controller/rpi/{awb.hpp => awb.h} (98%)
>  rename src/ipa/raspberrypi/controller/rpi/{black_level.hpp => black_level.h} (88%)
>  rename src/ipa/raspberrypi/controller/rpi/{ccm.hpp => ccm.h} (93%)
>  rename src/ipa/raspberrypi/controller/rpi/{contrast.hpp => contrast.h} (90%)
>  rename src/ipa/raspberrypi/controller/rpi/{dpc.hpp => dpc.h} (85%)
>  rename src/ipa/raspberrypi/controller/rpi/{focus.hpp => focus.h} (85%)
>  rename src/ipa/raspberrypi/controller/rpi/{geq.hpp => geq.h} (88%)
>  rename src/ipa/raspberrypi/controller/rpi/{lux.hpp => lux.h} (94%)
>  rename src/ipa/raspberrypi/controller/rpi/{noise.hpp => noise.h} (91%)
>  rename src/ipa/raspberrypi/controller/rpi/{sdn.hpp => sdn.h} (84%)
>  rename src/ipa/raspberrypi/controller/rpi/{sharpen.hpp => sharpen.h} (90%)
>  rename src/ipa/raspberrypi/controller/{sharpen_algorithm.hpp => sharpen_algorithm.h} (82%)
>  rename src/ipa/raspberrypi/{md_parser.hpp => md_parser.h} (98%)

[snip]

Patch
diff mbox series

diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp
index 45db39506937..7d1369335e1d 100644
--- a/src/ipa/raspberrypi/cam_helper.cpp
+++ b/src/ipa/raspberrypi/cam_helper.cpp
@@ -13,8 +13,8 @@ 
 
 #include "libcamera/internal/v4l2_videodevice.h"
 
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.h
similarity index 96%
rename from src/ipa/raspberrypi/cam_helper.hpp
rename to src/ipa/raspberrypi/cam_helper.h
index 2408fa154d3d..6c52bb521b2a 100644
--- a/src/ipa/raspberrypi/cam_helper.hpp
+++ b/src/ipa/raspberrypi/cam_helper.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * cam_helper.hpp - helper class providing camera information
+ * cam_helper.h - helper class providing camera information
  */
 #pragma once
 
@@ -13,9 +13,9 @@ 
 #include <libcamera/base/utils.h>
 
 #include "camera_mode.h"
-#include "controller/controller.hpp"
-#include "controller/metadata.hpp"
-#include "md_parser.hpp"
+#include "controller/controller.h"
+#include "controller/metadata.h"
+#include "md_parser.h"
 
 #include "libcamera/internal/v4l2_videodevice.h"
 
diff --git a/src/ipa/raspberrypi/cam_helper_imx219.cpp b/src/ipa/raspberrypi/cam_helper_imx219.cpp
index 17c35143923a..47af2c35fdbc 100644
--- a/src/ipa/raspberrypi/cam_helper_imx219.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx219.cpp
@@ -16,9 +16,9 @@ 
  */
 #define ENABLE_EMBEDDED_DATA 0
 
-#include "cam_helper.hpp"
+#include "cam_helper.h"
 #if ENABLE_EMBEDDED_DATA
-#include "md_parser.hpp"
+#include "md_parser.h"
 #endif
 
 using namespace RPiController;
diff --git a/src/ipa/raspberrypi/cam_helper_imx290.cpp b/src/ipa/raspberrypi/cam_helper_imx290.cpp
index 0d9a94d8d3f6..94f07b86029e 100644
--- a/src/ipa/raspberrypi/cam_helper_imx290.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx290.cpp
@@ -7,7 +7,7 @@ 
 
 #include <math.h>
 
-#include "cam_helper.hpp"
+#include "cam_helper.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/cam_helper_imx296.cpp b/src/ipa/raspberrypi/cam_helper_imx296.cpp
index 15674335fa75..3c762536f53f 100644
--- a/src/ipa/raspberrypi/cam_helper_imx296.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx296.cpp
@@ -9,7 +9,7 @@ 
 #include <cmath>
 #include <stddef.h>
 
-#include "cam_helper.hpp"
+#include "cam_helper.h"
 
 using namespace RPiController;
 using libcamera::utils::Duration;
diff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp
index 0767a5e1dcc5..2f267c04dfba 100644
--- a/src/ipa/raspberrypi/cam_helper_imx477.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp
@@ -14,8 +14,8 @@ 
 
 #include <libcamera/base/log.h>
 
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/cam_helper_imx519.cpp b/src/ipa/raspberrypi/cam_helper_imx519.cpp
index 1752760e64a2..ab09baab2224 100644
--- a/src/ipa/raspberrypi/cam_helper_imx519.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx519.cpp
@@ -15,8 +15,8 @@ 
 
 #include <libcamera/base/log.h>
 
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/cam_helper_ov5647.cpp b/src/ipa/raspberrypi/cam_helper_ov5647.cpp
index 9dc3fc44e5e8..70c88484667e 100644
--- a/src/ipa/raspberrypi/cam_helper_ov5647.cpp
+++ b/src/ipa/raspberrypi/cam_helper_ov5647.cpp
@@ -7,7 +7,7 @@ 
 
 #include <assert.h>
 
-#include "cam_helper.hpp"
+#include "cam_helper.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/cam_helper_ov9281.cpp b/src/ipa/raspberrypi/cam_helper_ov9281.cpp
index 130450afefc7..a63a391ba017 100644
--- a/src/ipa/raspberrypi/cam_helper_ov9281.cpp
+++ b/src/ipa/raspberrypi/cam_helper_ov9281.cpp
@@ -7,7 +7,7 @@ 
 
 #include <assert.h>
 
-#include "cam_helper.hpp"
+#include "cam_helper.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/controller/agc_algorithm.hpp b/src/ipa/raspberrypi/controller/agc_algorithm.h
similarity index 92%
rename from src/ipa/raspberrypi/controller/agc_algorithm.hpp
rename to src/ipa/raspberrypi/controller/agc_algorithm.h
index b718e595193b..610cf7d8454d 100644
--- a/src/ipa/raspberrypi/controller/agc_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/agc_algorithm.h
@@ -2,13 +2,13 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * agc_algorithm.hpp - AGC/AEC control algorithm interface
+ * agc_algorithm.h - AGC/AEC control algorithm interface
  */
 #pragma once
 
 #include <libcamera/base/utils.h>
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/algorithm.cpp b/src/ipa/raspberrypi/controller/algorithm.cpp
index e3afa647bdd2..a28a02adeb0d 100644
--- a/src/ipa/raspberrypi/controller/algorithm.cpp
+++ b/src/ipa/raspberrypi/controller/algorithm.cpp
@@ -5,7 +5,7 @@ 
  * algorithm.cpp - ISP control algorithms
  */
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/controller/algorithm.hpp b/src/ipa/raspberrypi/controller/algorithm.h
similarity index 95%
rename from src/ipa/raspberrypi/controller/algorithm.hpp
rename to src/ipa/raspberrypi/controller/algorithm.h
index cad7c15ba5c8..ce3ca95f65f6 100644
--- a/src/ipa/raspberrypi/controller/algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/algorithm.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * algorithm.hpp - ISP control algorithm interface
+ * algorithm.h - ISP control algorithm interface
  */
 #pragma once
 
@@ -15,7 +15,7 @@ 
 #include <memory>
 #include <map>
 
-#include "controller.hpp"
+#include "controller.h"
 
 #include <boost/property_tree/ptree.hpp>
 
diff --git a/src/ipa/raspberrypi/controller/awb_algorithm.hpp b/src/ipa/raspberrypi/controller/awb_algorithm.h
similarity index 86%
rename from src/ipa/raspberrypi/controller/awb_algorithm.hpp
rename to src/ipa/raspberrypi/controller/awb_algorithm.h
index 0de74fce4269..712c1aa173bd 100644
--- a/src/ipa/raspberrypi/controller/awb_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/awb_algorithm.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * awb_algorithm.hpp - AWB control algorithm interface
+ * awb_algorithm.h - AWB control algorithm interface
  */
 #pragma once
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp b/src/ipa/raspberrypi/controller/ccm_algorithm.h
similarity index 78%
rename from src/ipa/raspberrypi/controller/ccm_algorithm.hpp
rename to src/ipa/raspberrypi/controller/ccm_algorithm.h
index 9c7172f5782d..324eae14e17a 100644
--- a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/ccm_algorithm.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * ccm_algorithm.hpp - CCM (colour correction matrix) control algorithm interface
+ * ccm_algorithm.h - CCM (colour correction matrix) control algorithm interface
  */
 #pragma once
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp b/src/ipa/raspberrypi/controller/contrast_algorithm.h
similarity index 82%
rename from src/ipa/raspberrypi/controller/contrast_algorithm.hpp
rename to src/ipa/raspberrypi/controller/contrast_algorithm.h
index 1c0562e1c4a2..eaba62150730 100644
--- a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/contrast_algorithm.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * contrast_algorithm.hpp - contrast (gamma) control algorithm interface
+ * contrast_algorithm.h - contrast (gamma) control algorithm interface
  */
 #pragma once
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp
index 6d95fa55d1e4..46229d683a3b 100644
--- a/src/ipa/raspberrypi/controller/controller.cpp
+++ b/src/ipa/raspberrypi/controller/controller.cpp
@@ -7,8 +7,8 @@ 
 
 #include <libcamera/base/log.h>
 
-#include "algorithm.hpp"
-#include "controller.hpp"
+#include "algorithm.h"
+#include "controller.h"
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
diff --git a/src/ipa/raspberrypi/controller/controller.hpp b/src/ipa/raspberrypi/controller/controller.h
similarity index 95%
rename from src/ipa/raspberrypi/controller/controller.hpp
rename to src/ipa/raspberrypi/controller/controller.h
index 29b2e8f34826..be8ae8f96288 100644
--- a/src/ipa/raspberrypi/controller/controller.hpp
+++ b/src/ipa/raspberrypi/controller/controller.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * controller.hpp - ISP controller interface
+ * controller.h - ISP controller interface
  */
 #pragma once
 
@@ -19,7 +19,7 @@ 
 
 #include "camera_mode.h"
 #include "device_status.h"
-#include "metadata.hpp"
+#include "metadata.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/denoise_algorithm.hpp b/src/ipa/raspberrypi/controller/denoise_algorithm.h
similarity index 86%
rename from src/ipa/raspberrypi/controller/denoise_algorithm.hpp
rename to src/ipa/raspberrypi/controller/denoise_algorithm.h
index 7004fe55b41f..15a45a417b0c 100644
--- a/src/ipa/raspberrypi/controller/denoise_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/denoise_algorithm.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2021, Raspberry Pi (Trading) Limited
  *
- * denoise.hpp - Denoise control algorithm interface
+ * denoise.h - Denoise control algorithm interface
  */
 #pragma once
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/histogram.cpp b/src/ipa/raspberrypi/controller/histogram.cpp
index 91a759b53d34..f0c4adaf1f44 100644
--- a/src/ipa/raspberrypi/controller/histogram.cpp
+++ b/src/ipa/raspberrypi/controller/histogram.cpp
@@ -7,7 +7,7 @@ 
 #include <math.h>
 #include <stdio.h>
 
-#include "histogram.hpp"
+#include "histogram.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/controller/histogram.hpp b/src/ipa/raspberrypi/controller/histogram.h
similarity index 96%
rename from src/ipa/raspberrypi/controller/histogram.hpp
rename to src/ipa/raspberrypi/controller/histogram.h
index 2ed8d9713764..33ba76c1f081 100644
--- a/src/ipa/raspberrypi/controller/histogram.hpp
+++ b/src/ipa/raspberrypi/controller/histogram.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * histogram.hpp - histogram calculation interface
+ * histogram.h - histogram calculation interface
  */
 #pragma once
 
diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.h
similarity index 98%
rename from src/ipa/raspberrypi/controller/metadata.hpp
rename to src/ipa/raspberrypi/controller/metadata.h
index 9f73e61ef91f..e46d0f9fabbf 100644
--- a/src/ipa/raspberrypi/controller/metadata.hpp
+++ b/src/ipa/raspberrypi/controller/metadata.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019-2021, Raspberry Pi (Trading) Limited
  *
- * metadata.hpp - general metadata class
+ * metadata.h - general metadata class
  */
 #pragma once
 
diff --git a/src/ipa/raspberrypi/controller/pwl.cpp b/src/ipa/raspberrypi/controller/pwl.cpp
index d93cd2016dcf..b02979f060f0 100644
--- a/src/ipa/raspberrypi/controller/pwl.cpp
+++ b/src/ipa/raspberrypi/controller/pwl.cpp
@@ -8,7 +8,7 @@ 
 #include <cassert>
 #include <stdexcept>
 
-#include "pwl.hpp"
+#include "pwl.h"
 
 using namespace RPiController;
 
diff --git a/src/ipa/raspberrypi/controller/pwl.hpp b/src/ipa/raspberrypi/controller/pwl.h
similarity index 98%
rename from src/ipa/raspberrypi/controller/pwl.hpp
rename to src/ipa/raspberrypi/controller/pwl.h
index e409c966baa0..128990c5ca6c 100644
--- a/src/ipa/raspberrypi/controller/pwl.hpp
+++ b/src/ipa/raspberrypi/controller/pwl.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * pwl.hpp - piecewise linear functions interface
+ * pwl.h - piecewise linear functions interface
  */
 #pragma once
 
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp
index ec737ea13332..f2446c423e39 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp
@@ -13,11 +13,11 @@ 
 
 #include "../awb_status.h"
 #include "../device_status.h"
-#include "../histogram.hpp"
+#include "../histogram.h"
 #include "../lux_status.h"
-#include "../metadata.hpp"
+#include "../metadata.h"
 
-#include "agc.hpp"
+#include "agc.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.h
similarity index 97%
rename from src/ipa/raspberrypi/controller/rpi/agc.hpp
rename to src/ipa/raspberrypi/controller/rpi/agc.h
index c2d68b60f15e..d6b19d6f4112 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * agc.hpp - AGC/AEC control algorithm
+ * agc.h - AGC/AEC control algorithm
  */
 #pragma once
 
@@ -11,9 +11,9 @@ 
 
 #include <libcamera/base/utils.h>
 
-#include "../agc_algorithm.hpp"
+#include "../agc_algorithm.h"
 #include "../agc_status.h"
-#include "../pwl.hpp"
+#include "../pwl.h"
 
 /* This is our implementation of AGC. */
 
diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp
index c9e1b9dc9f7d..961d5b63db1e 100644
--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp
@@ -12,7 +12,7 @@ 
 #include <libcamera/base/span.h>
 
 #include "../awb_status.h"
-#include "alsc.hpp"
+#include "alsc.h"
 
 /* Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm. */
 
diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.hpp b/src/ipa/raspberrypi/controller/rpi/alsc.h
similarity index 97%
rename from src/ipa/raspberrypi/controller/rpi/alsc.hpp
rename to src/ipa/raspberrypi/controller/rpi/alsc.h
index 3ffc175d78b6..1ee88a663d31 100644
--- a/src/ipa/raspberrypi/controller/rpi/alsc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/alsc.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * alsc.hpp - ALSC (auto lens shading correction) control algorithm
+ * alsc.h - ALSC (auto lens shading correction) control algorithm
  */
 #pragma once
 
@@ -10,7 +10,7 @@ 
 #include <condition_variable>
 #include <thread>
 
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 #include "../alsc_status.h"
 
 namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp
index d6f79f3a8e14..f8e52d7c4e66 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp
@@ -9,7 +9,7 @@ 
 
 #include "../lux_status.h"
 
-#include "awb.hpp"
+#include "awb.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/awb.hpp b/src/ipa/raspberrypi/controller/rpi/awb.h
similarity index 98%
rename from src/ipa/raspberrypi/controller/rpi/awb.hpp
rename to src/ipa/raspberrypi/controller/rpi/awb.h
index 597f3182da44..2f7a88acebcb 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/awb.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * awb.hpp - AWB control algorithm
+ * awb.h - AWB control algorithm
  */
 #pragma once
 
@@ -10,8 +10,8 @@ 
 #include <condition_variable>
 #include <thread>
 
-#include "../awb_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../awb_algorithm.h"
+#include "../pwl.h"
 #include "../awb_status.h"
 
 namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
index 88fe4538d18d..02b5b48c1ca0 100644
--- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
@@ -12,7 +12,7 @@ 
 
 #include "../black_level_status.h"
 
-#include "black_level.hpp"
+#include "black_level.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.hpp b/src/ipa/raspberrypi/controller/rpi/black_level.h
similarity index 88%
rename from src/ipa/raspberrypi/controller/rpi/black_level.hpp
rename to src/ipa/raspberrypi/controller/rpi/black_level.h
index f01c55151288..ecb83e35dfdd 100644
--- a/src/ipa/raspberrypi/controller/rpi/black_level.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/black_level.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * black_level.hpp - black level control algorithm
+ * black_level.h - black level control algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 #include "../black_level_status.h"
 
 /* This is our implementation of the "black level algorithm". */
diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp
index 9ad63b6e20d9..a81358d5b6d2 100644
--- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp
@@ -10,9 +10,9 @@ 
 #include "../awb_status.h"
 #include "../ccm_status.h"
 #include "../lux_status.h"
-#include "../metadata.hpp"
+#include "../metadata.h"
 
-#include "ccm.hpp"
+#include "ccm.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.hpp b/src/ipa/raspberrypi/controller/rpi/ccm.h
similarity index 93%
rename from src/ipa/raspberrypi/controller/rpi/ccm.hpp
rename to src/ipa/raspberrypi/controller/rpi/ccm.h
index 7622044ce49c..57c3518e7490 100644
--- a/src/ipa/raspberrypi/controller/rpi/ccm.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/ccm.h
@@ -2,14 +2,14 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * ccm.hpp - CCM (colour correction matrix) control algorithm
+ * ccm.h - CCM (colour correction matrix) control algorithm
  */
 #pragma once
 
 #include <vector>
 
-#include "../ccm_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../ccm_algorithm.h"
+#include "../pwl.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp
index f11c834a0192..3e0177345119 100644
--- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp
@@ -9,9 +9,9 @@ 
 #include <libcamera/base/log.h>
 
 #include "../contrast_status.h"
-#include "../histogram.hpp"
+#include "../histogram.h"
 
-#include "contrast.hpp"
+#include "contrast.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.hpp b/src/ipa/raspberrypi/controller/rpi/contrast.h
similarity index 90%
rename from src/ipa/raspberrypi/controller/rpi/contrast.hpp
rename to src/ipa/raspberrypi/controller/rpi/contrast.h
index 4793dedc10ff..4568e087008f 100644
--- a/src/ipa/raspberrypi/controller/rpi/contrast.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/contrast.h
@@ -2,14 +2,14 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * contrast.hpp - contrast (gamma) control algorithm
+ * contrast.h - contrast (gamma) control algorithm
  */
 #pragma once
 
 #include <mutex>
 
-#include "../contrast_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../contrast_algorithm.h"
+#include "../pwl.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp
index 68ba5e3e37bb..af3c88d7ac3a 100644
--- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp
@@ -7,7 +7,7 @@ 
 
 #include <libcamera/base/log.h>
 
-#include "dpc.hpp"
+#include "dpc.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.hpp b/src/ipa/raspberrypi/controller/rpi/dpc.h
similarity index 85%
rename from src/ipa/raspberrypi/controller/rpi/dpc.hpp
rename to src/ipa/raspberrypi/controller/rpi/dpc.h
index 048fa2b8405e..d3fce5e37dd2 100644
--- a/src/ipa/raspberrypi/controller/rpi/dpc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/dpc.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * dpc.hpp - DPC (defective pixel correction) control algorithm
+ * dpc.h - DPC (defective pixel correction) control algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 #include "../dpc_status.h"
 
 namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp
index 90f36e58f28c..22f376b74fbf 100644
--- a/src/ipa/raspberrypi/controller/rpi/focus.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp
@@ -9,7 +9,7 @@ 
 #include <libcamera/base/log.h>
 
 #include "../focus_status.h"
-#include "focus.hpp"
+#include "focus.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/focus.hpp b/src/ipa/raspberrypi/controller/rpi/focus.h
similarity index 85%
rename from src/ipa/raspberrypi/controller/rpi/focus.hpp
rename to src/ipa/raspberrypi/controller/rpi/focus.h
index a9207eb3cc23..3b71d686bfb8 100644
--- a/src/ipa/raspberrypi/controller/rpi/focus.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/focus.h
@@ -2,12 +2,12 @@ 
 /*
  * Copyright (C) 2020, Raspberry Pi (Trading) Limited
  *
- * focus.hpp - focus algorithm
+ * focus.h - focus algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
-#include "../metadata.hpp"
+#include "../algorithm.h"
+#include "../metadata.h"
 
 /*
  * The "focus" algorithm. All it does it print out a version of the
diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp
index 14f226cf989c..1a94c45e16fa 100644
--- a/src/ipa/raspberrypi/controller/rpi/geq.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp
@@ -9,9 +9,9 @@ 
 
 #include "../device_status.h"
 #include "../lux_status.h"
-#include "../pwl.hpp"
+#include "../pwl.h"
 
-#include "geq.hpp"
+#include "geq.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/geq.hpp b/src/ipa/raspberrypi/controller/rpi/geq.h
similarity index 88%
rename from src/ipa/raspberrypi/controller/rpi/geq.hpp
rename to src/ipa/raspberrypi/controller/rpi/geq.h
index 5ea424fc768d..54f72cce0721 100644
--- a/src/ipa/raspberrypi/controller/rpi/geq.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/geq.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * geq.hpp - GEQ (green equalisation) control algorithm
+ * geq.h - GEQ (green equalisation) control algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 #include "../geq_status.h"
 
 namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp
index 7f86f17470d8..cc7fd97f2691 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp
@@ -12,7 +12,7 @@ 
 
 #include "../device_status.h"
 
-#include "lux.hpp"
+#include "lux.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.h
similarity index 94%
rename from src/ipa/raspberrypi/controller/rpi/lux.hpp
rename to src/ipa/raspberrypi/controller/rpi/lux.h
index 7cf189363c06..c8a478e5885d 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * lux.hpp - Lux control algorithm
+ * lux.h - Lux control algorithm
  */
 #pragma once
 
@@ -11,7 +11,7 @@ 
 #include <libcamera/base/utils.h>
 
 #include "../lux_status.h"
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 
 /* This is our implementation of the "lux control algorithm". */
 
diff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp
index 8117ce3608ed..5a4a2bb58e9e 100644
--- a/src/ipa/raspberrypi/controller/rpi/noise.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp
@@ -12,7 +12,7 @@ 
 #include "../device_status.h"
 #include "../noise_status.h"
 
-#include "noise.hpp"
+#include "noise.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/noise.hpp b/src/ipa/raspberrypi/controller/rpi/noise.h
similarity index 91%
rename from src/ipa/raspberrypi/controller/rpi/noise.hpp
rename to src/ipa/raspberrypi/controller/rpi/noise.h
index 56a4707b5ef2..cf56fafef405 100644
--- a/src/ipa/raspberrypi/controller/rpi/noise.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/noise.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * noise.hpp - Noise control algorithm
+ * noise.h - Noise control algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
+#include "../algorithm.h"
 #include "../noise_status.h"
 
 /* This is our implementation of the "noise algorithm". */
diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp
index 6459b90fb9d4..c1258ff4f106 100644
--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp
@@ -10,7 +10,7 @@ 
 #include "../denoise_status.h"
 #include "../noise_status.h"
 
-#include "sdn.hpp"
+#include "sdn.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.hpp b/src/ipa/raspberrypi/controller/rpi/sdn.h
similarity index 84%
rename from src/ipa/raspberrypi/controller/rpi/sdn.hpp
rename to src/ipa/raspberrypi/controller/rpi/sdn.h
index 8b6e3db1a548..72d9d3fff917 100644
--- a/src/ipa/raspberrypi/controller/rpi/sdn.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/sdn.h
@@ -2,12 +2,12 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * sdn.hpp - SDN (spatial denoise) control algorithm
+ * sdn.h - SDN (spatial denoise) control algorithm
  */
 #pragma once
 
-#include "../algorithm.hpp"
-#include "../denoise_algorithm.hpp"
+#include "../algorithm.h"
+#include "../denoise_algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
index b8f5b1005ac6..8a9fabcbdccb 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
@@ -11,7 +11,7 @@ 
 
 #include "../sharpen_status.h"
 
-#include "sharpen.hpp"
+#include "sharpen.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.h
similarity index 90%
rename from src/ipa/raspberrypi/controller/rpi/sharpen.hpp
rename to src/ipa/raspberrypi/controller/rpi/sharpen.h
index 18c45fd4e2a7..643fb94e8b9a 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * sharpen.hpp - sharpening control algorithm
+ * sharpen.h - sharpening control algorithm
  */
 #pragma once
 
-#include "../sharpen_algorithm.hpp"
+#include "../sharpen_algorithm.h"
 #include "../sharpen_status.h"
 
 /* This is our implementation of the "sharpen algorithm". */
diff --git a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp b/src/ipa/raspberrypi/controller/sharpen_algorithm.h
similarity index 82%
rename from src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
rename to src/ipa/raspberrypi/controller/sharpen_algorithm.h
index 22cc6090f8fc..3f585f64edcb 100644
--- a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/sharpen_algorithm.h
@@ -2,11 +2,11 @@ 
 /*
  * Copyright (C) 2020, Raspberry Pi (Trading) Limited
  *
- * sharpen_algorithm.hpp - sharpness control algorithm interface
+ * sharpen_algorithm.h - sharpness control algorithm interface
  */
 #pragma once
 
-#include "algorithm.hpp"
+#include "algorithm.h"
 
 namespace RPiController {
 
diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.h
similarity index 98%
rename from src/ipa/raspberrypi/md_parser.hpp
rename to src/ipa/raspberrypi/md_parser.h
index a05ab800b9ae..3b10801f63d0 100644
--- a/src/ipa/raspberrypi/md_parser.hpp
+++ b/src/ipa/raspberrypi/md_parser.h
@@ -2,7 +2,7 @@ 
 /*
  * Copyright (C) 2019, Raspberry Pi (Trading) Limited
  *
- * md_parser.hpp - image sensor metadata parser interface
+ * md_parser.h - image sensor metadata parser interface
  */
 #pragma once
 
diff --git a/src/ipa/raspberrypi/md_parser_smia.cpp b/src/ipa/raspberrypi/md_parser_smia.cpp
index f2b37cab4e97..e910f0b42477 100644
--- a/src/ipa/raspberrypi/md_parser_smia.cpp
+++ b/src/ipa/raspberrypi/md_parser_smia.cpp
@@ -6,7 +6,7 @@ 
  */
 
 #include <libcamera/base/log.h>
-#include "md_parser.hpp"
+#include "md_parser.h"
 
 using namespace RPiController;
 using namespace libcamera;
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 5cd8af3f0305..c2912d2e6dcd 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -29,27 +29,27 @@ 
 
 #include "libcamera/internal/mapped_framebuffer.h"
 
-#include "agc_algorithm.hpp"
+#include "agc_algorithm.h"
 #include "agc_status.h"
 #include "alsc_status.h"
-#include "awb_algorithm.hpp"
+#include "awb_algorithm.h"
 #include "awb_status.h"
 #include "black_level_status.h"
-#include "cam_helper.hpp"
-#include "ccm_algorithm.hpp"
+#include "cam_helper.h"
+#include "ccm_algorithm.h"
 #include "ccm_status.h"
-#include "contrast_algorithm.hpp"
+#include "contrast_algorithm.h"
 #include "contrast_status.h"
-#include "controller.hpp"
-#include "denoise_algorithm.hpp"
+#include "controller.h"
+#include "denoise_algorithm.h"
 #include "denoise_status.h"
 #include "dpc_status.h"
 #include "focus_status.h"
 #include "geq_status.h"
 #include "lux_status.h"
-#include "metadata.hpp"
+#include "metadata.h"
 #include "noise_status.h"
-#include "sharpen_algorithm.hpp"
+#include "sharpen_algorithm.h"
 #include "sharpen_status.h"
 
 namespace libcamera {