From 1587315a7f15b4122bc61e367c2704c9cb835035 Mon Sep 17 00:00:00 2001
From: chunseoklee <chunseok.lee@samsung.com>
Date: Thu, 26 Dec 2024 09:22:57 +0900
Subject: [PATCH] [onert-micro] fix wrong namespace use in import ns (#14495)

Fix strange namespace use in onert_micro::import ns

ONE-DCO-1.0-Signed-off-by: Chunseok Lee <chunseok.lee@samsung.com>
---
 onert-micro/onert-micro/src/import/kernels/Abs.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Add.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/AddN.cpp  | 10 +++++++++-
 .../onert-micro/src/import/kernels/ArgMax.cpp        | 10 +++++++++-
 .../onert-micro/src/import/kernels/ArgMin.cpp        | 10 +++++++++-
 .../onert-micro/src/import/kernels/AveragePool2D.cpp | 11 +++++++++--
 .../src/import/kernels/BatchToSpaceND.cpp            | 12 ++++++++++--
 onert-micro/onert-micro/src/import/kernels/Cast.cpp  | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Ceil.cpp  | 10 +++++++++-
 .../onert-micro/src/import/kernels/Concatenation.cpp | 11 +++++++++--
 .../onert-micro/src/import/kernels/Conv2D.cpp        | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Cos.cpp   | 10 +++++++++-
 .../src/import/kernels/DepthwiseConv2D.cpp           | 11 +++++++++--
 .../onert-micro/src/import/kernels/Dequantize.cpp    | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Div.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Elu.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Equal.cpp | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Exp.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/ExpandDims.cpp    | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Fill.cpp  | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Floor.cpp | 10 +++++++++-
 .../onert-micro/src/import/kernels/FloorDiv.cpp      | 10 +++++++++-
 .../onert-micro/src/import/kernels/FloorMod.cpp      | 10 +++++++++-
 .../src/import/kernels/FullyConnected.cpp            | 11 +++++++++--
 onert-micro/onert-micro/src/import/kernels/GRU.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/Gather.cpp        | 10 +++++++++-
 .../onert-micro/src/import/kernels/GatherND.cpp      | 10 +++++++++-
 .../onert-micro/src/import/kernels/Greater.cpp       | 10 +++++++++-
 .../onert-micro/src/import/kernels/GreaterEqual.cpp  | 11 +++++++++--
 .../onert-micro/src/import/kernels/L2Normalize.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/L2Pool2D.cpp      | 10 +++++++++-
 .../onert-micro/src/import/kernels/LeakyRelu.cpp     | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Less.cpp  | 10 +++++++++-
 .../onert-micro/src/import/kernels/LessEqual.cpp     | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Log.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/LogSoftmax.cpp    | 10 +++++++++-
 .../onert-micro/src/import/kernels/Logistic.cpp      | 10 +++++++++-
 .../onert-micro/src/import/kernels/MaxPool2D.cpp     | 10 +++++++++-
 .../onert-micro/src/import/kernels/Maximum.cpp       | 10 +++++++++-
 .../onert-micro/src/import/kernels/Minimum.cpp       | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Mul.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Neg.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/NotEqual.cpp      | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Pack.cpp  | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Pad.cpp   | 10 +++++++++-
 .../onert-micro/src/import/kernels/Quantize.cpp      | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Relu.cpp  | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Relu6.cpp | 10 +++++++++-
 .../onert-micro/src/import/kernels/Reshape.cpp       | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Round.cpp | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Rsqrt.cpp | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/SVDF.cpp  | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Shape.cpp | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Sin.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Slice.cpp | 10 +++++++++-
 .../onert-micro/src/import/kernels/Softmax.cpp       | 10 +++++++++-
 .../src/import/kernels/SpaceToBatchND.cpp            | 12 ++++++++++--
 .../onert-micro/src/import/kernels/SpaceToDepth.cpp  | 12 ++++++++++--
 onert-micro/onert-micro/src/import/kernels/Split.cpp | 10 +++++++++-
 .../onert-micro/src/import/kernels/SplitV.cpp        | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Sqrt.cpp  | 10 +++++++++-
 .../onert-micro/src/import/kernels/Square.cpp        | 10 +++++++++-
 .../src/import/kernels/SquaredDifference.cpp         | 11 +++++++++--
 .../onert-micro/src/import/kernels/StridedSlice.cpp  | 11 +++++++++--
 onert-micro/onert-micro/src/import/kernels/Sub.cpp   | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/Tanh.cpp  | 10 +++++++++-
 .../onert-micro/src/import/kernels/Transpose.cpp     | 10 +++++++++-
 .../onert-micro/src/import/kernels/TransposeConv.cpp | 11 +++++++++--
 .../onert-micro/src/import/kernels/Unpack.cpp        | 10 +++++++++-
 onert-micro/onert-micro/src/import/kernels/While.cpp | 11 +++++++++--
 70 files changed, 633 insertions(+), 82 deletions(-)

diff --git a/onert-micro/onert-micro/src/import/kernels/Abs.cpp b/onert-micro/onert-micro/src/import/kernels/Abs.cpp
index f614e69c696..7361f9d862a 100644
--- a/onert-micro/onert-micro/src/import/kernels/Abs.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Abs.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleAbs(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleAbs(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Add.cpp b/onert-micro/onert-micro/src/import/kernels/Add.cpp
index 90bd876d193..420ff1a1a1e 100644
--- a/onert-micro/onert-micro/src/import/kernels/Add.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Add.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleAdd(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleAdd(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_TISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/AddN.cpp b/onert-micro/onert-micro/src/import/kernels/AddN.cpp
index c0095767f8e..104d18548f9 100644
--- a/onert-micro/onert-micro/src/import/kernels/AddN.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/AddN.cpp
@@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleAddN(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleAddN(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -79,3 +84,6 @@ OMStatus onert_micro::import::configure_kernel_CircleAddN(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/ArgMax.cpp b/onert-micro/onert-micro/src/import/kernels/ArgMax.cpp
index b38beaf31df..030ca90f38f 100644
--- a/onert-micro/onert-micro/src/import/kernels/ArgMax.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/ArgMax.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleArgMax(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleArgMax(const OMConfigureArgs &config_args)
 {
   return helpers::configure_arg_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/ArgMin.cpp b/onert-micro/onert-micro/src/import/kernels/ArgMin.cpp
index 1f9b9c5e4b1..0f900748d3c 100644
--- a/onert-micro/onert-micro/src/import/kernels/ArgMin.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/ArgMin.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleArgMin(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleArgMin(const OMConfigureArgs &config_args)
 {
   return helpers::configure_arg_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/AveragePool2D.cpp b/onert-micro/onert-micro/src/import/kernels/AveragePool2D.cpp
index ea55814675a..4794dd6eb7c 100644
--- a/onert-micro/onert-micro/src/import/kernels/AveragePool2D.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/AveragePool2D.cpp
@@ -19,8 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus
-onert_micro::import::configure_kernel_CircleAveragePool2D(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleAveragePool2D(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_pooling_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/BatchToSpaceND.cpp b/onert-micro/onert-micro/src/import/kernels/BatchToSpaceND.cpp
index 64791713508..3be0eec163d 100644
--- a/onert-micro/onert-micro/src/import/kernels/BatchToSpaceND.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/BatchToSpaceND.cpp
@@ -19,8 +19,16 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleBatchToSpaceND(
-  const onert_micro::import::OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus
+configure_kernel_CircleBatchToSpaceND(const onert_micro::import::OMConfigureArgs &config_args)
 {
   return helpers::configure_spaces_batches_nd_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Cast.cpp b/onert-micro/onert-micro/src/import/kernels/Cast.cpp
index 294b234b7b7..45deaf1a227 100644
--- a/onert-micro/onert-micro/src/import/kernels/Cast.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Cast.cpp
@@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleCast(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleCast(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -57,3 +62,6 @@ OMStatus onert_micro::import::configure_kernel_CircleCast(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Ceil.cpp b/onert-micro/onert-micro/src/import/kernels/Ceil.cpp
index 1969d88fccc..8533fa577cf 100644
--- a/onert-micro/onert-micro/src/import/kernels/Ceil.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Ceil.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleCeil(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleCeil(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Concatenation.cpp b/onert-micro/onert-micro/src/import/kernels/Concatenation.cpp
index fb632ad5cb1..b6b673730d9 100644
--- a/onert-micro/onert-micro/src/import/kernels/Concatenation.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Concatenation.cpp
@@ -24,8 +24,12 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus
-onert_micro::import::configure_kernel_CircleConcatenation(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleConcatenation(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -92,3 +96,6 @@ onert_micro::import::configure_kernel_CircleConcatenation(const OMConfigureArgs
 
   return Ok;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Conv2D.cpp b/onert-micro/onert-micro/src/import/kernels/Conv2D.cpp
index a74713b1e40..80dd2491dfd 100644
--- a/onert-micro/onert-micro/src/import/kernels/Conv2D.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Conv2D.cpp
@@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleConv2D(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleConv2D(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -114,3 +119,6 @@ OMStatus onert_micro::import::configure_kernel_CircleConv2D(const OMConfigureArg
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Cos.cpp b/onert-micro/onert-micro/src/import/kernels/Cos.cpp
index 5dcaf78c587..1d1a9e04905 100644
--- a/onert-micro/onert-micro/src/import/kernels/Cos.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Cos.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleCos(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleCos(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/DepthwiseConv2D.cpp b/onert-micro/onert-micro/src/import/kernels/DepthwiseConv2D.cpp
index b39896da5ee..9361710b12a 100644
--- a/onert-micro/onert-micro/src/import/kernels/DepthwiseConv2D.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/DepthwiseConv2D.cpp
@@ -38,8 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus
-onert_micro::import::configure_kernel_CircleDepthwiseConv2D(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleDepthwiseConv2D(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -135,3 +139,6 @@ onert_micro::import::configure_kernel_CircleDepthwiseConv2D(const OMConfigureArg
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Dequantize.cpp b/onert-micro/onert-micro/src/import/kernels/Dequantize.cpp
index 78bfc41f79a..32563144a16 100644
--- a/onert-micro/onert-micro/src/import/kernels/Dequantize.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Dequantize.cpp
@@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleDequantize(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleDequantize(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -71,3 +76,6 @@ OMStatus onert_micro::import::configure_kernel_CircleDequantize(const OMConfigur
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Div.cpp b/onert-micro/onert-micro/src/import/kernels/Div.cpp
index 0ce01663200..8e06c2ac180 100644
--- a/onert-micro/onert-micro/src/import/kernels/Div.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Div.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleDiv(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleDiv(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_TISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Elu.cpp b/onert-micro/onert-micro/src/import/kernels/Elu.cpp
index ff62f2e0930..af5bc0ecdcd 100644
--- a/onert-micro/onert-micro/src/import/kernels/Elu.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Elu.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleElu(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleElu(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Equal.cpp b/onert-micro/onert-micro/src/import/kernels/Equal.cpp
index 29fc6369d52..9e5b6b6b1ad 100644
--- a/onert-micro/onert-micro/src/import/kernels/Equal.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Equal.cpp
@@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleEqual(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleEqual(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -54,3 +59,6 @@ OMStatus onert_micro::import::configure_kernel_CircleEqual(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Exp.cpp b/onert-micro/onert-micro/src/import/kernels/Exp.cpp
index fa819b1ea2a..485a80dcdc8 100644
--- a/onert-micro/onert-micro/src/import/kernels/Exp.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Exp.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleExp(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleExp(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/ExpandDims.cpp b/onert-micro/onert-micro/src/import/kernels/ExpandDims.cpp
index b90ef481ea2..deef33d33ed 100644
--- a/onert-micro/onert-micro/src/import/kernels/ExpandDims.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/ExpandDims.cpp
@@ -32,7 +32,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleExpandDims(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleExpandDims(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -97,3 +102,6 @@ OMStatus onert_micro::import::configure_kernel_CircleExpandDims(const OMConfigur
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Fill.cpp b/onert-micro/onert-micro/src/import/kernels/Fill.cpp
index 16ca93c5344..c76cf7c1238 100644
--- a/onert-micro/onert-micro/src/import/kernels/Fill.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Fill.cpp
@@ -32,7 +32,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleFill(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleFill(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -65,3 +70,6 @@ OMStatus onert_micro::import::configure_kernel_CircleFill(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Floor.cpp b/onert-micro/onert-micro/src/import/kernels/Floor.cpp
index 12a896f9ca6..1c01723a474 100644
--- a/onert-micro/onert-micro/src/import/kernels/Floor.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Floor.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleFloor(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleFloor(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/FloorDiv.cpp b/onert-micro/onert-micro/src/import/kernels/FloorDiv.cpp
index 67b7e074b0e..aae04caf9f1 100644
--- a/onert-micro/onert-micro/src/import/kernels/FloorDiv.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/FloorDiv.cpp
@@ -28,7 +28,15 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleFloorDiv(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleFloorDiv(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_floor_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/FloorMod.cpp b/onert-micro/onert-micro/src/import/kernels/FloorMod.cpp
index 42bc54c1e83..1be1b84f31c 100644
--- a/onert-micro/onert-micro/src/import/kernels/FloorMod.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/FloorMod.cpp
@@ -28,7 +28,15 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleFloorMod(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleFloorMod(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_floor_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/FullyConnected.cpp b/onert-micro/onert-micro/src/import/kernels/FullyConnected.cpp
index f9e401e9dbd..037d85ff6da 100644
--- a/onert-micro/onert-micro/src/import/kernels/FullyConnected.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/FullyConnected.cpp
@@ -37,8 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus
-onert_micro::import::configure_kernel_CircleFullyConnected(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleFullyConnected(const OMConfigureArgs &config_args)
 {
 
   OMRuntimeContext &runtime_context = config_args.runtime_context;
@@ -171,3 +175,6 @@ onert_micro::import::configure_kernel_CircleFullyConnected(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/GRU.cpp b/onert-micro/onert-micro/src/import/kernels/GRU.cpp
index 2c1167c98b5..51f7086b6f9 100644
--- a/onert-micro/onert-micro/src/import/kernels/GRU.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/GRU.cpp
@@ -40,7 +40,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleGRU(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleGRU(const OMConfigureArgs &config_args)
 {
   core::OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -102,3 +107,6 @@ OMStatus onert_micro::import::configure_kernel_CircleGRU(const OMConfigureArgs &
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Gather.cpp b/onert-micro/onert-micro/src/import/kernels/Gather.cpp
index 709b59b38f8..f648bdbf19e 100644
--- a/onert-micro/onert-micro/src/import/kernels/Gather.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Gather.cpp
@@ -32,7 +32,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleGather(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleGather(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -122,3 +127,6 @@ OMStatus onert_micro::import::configure_kernel_CircleGather(const OMConfigureArg
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/GatherND.cpp b/onert-micro/onert-micro/src/import/kernels/GatherND.cpp
index 0d90389673c..bf8060370c5 100644
--- a/onert-micro/onert-micro/src/import/kernels/GatherND.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/GatherND.cpp
@@ -35,7 +35,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleGatherND(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleGatherND(const OMConfigureArgs &config_args)
 {
 
   OMRuntimeContext &runtime_context = config_args.runtime_context;
@@ -95,3 +100,6 @@ OMStatus onert_micro::import::configure_kernel_CircleGatherND(const OMConfigureA
 
   return Ok;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Greater.cpp b/onert-micro/onert-micro/src/import/kernels/Greater.cpp
index 8dda286aa2c..70a7788f898 100644
--- a/onert-micro/onert-micro/src/import/kernels/Greater.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Greater.cpp
@@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleGreater(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleGreater(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -53,3 +58,6 @@ OMStatus onert_micro::import::configure_kernel_CircleGreater(const OMConfigureAr
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/GreaterEqual.cpp b/onert-micro/onert-micro/src/import/kernels/GreaterEqual.cpp
index e898f2cfbea..cbe96805f0e 100644
--- a/onert-micro/onert-micro/src/import/kernels/GreaterEqual.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/GreaterEqual.cpp
@@ -33,8 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus
-onert_micro::import::configure_kernel_CircleGreaterEqual(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleGreaterEqual(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -54,3 +58,6 @@ onert_micro::import::configure_kernel_CircleGreaterEqual(const OMConfigureArgs &
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/L2Normalize.cpp b/onert-micro/onert-micro/src/import/kernels/L2Normalize.cpp
index fb56beedb09..ed7774a3229 100644
--- a/onert-micro/onert-micro/src/import/kernels/L2Normalize.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/L2Normalize.cpp
@@ -31,9 +31,17 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleL2Normalize(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleL2Normalize(const OMConfigureArgs &config_args)
 {
   OMStatus status = onert_micro::import::helpers::configure_SISO_kernel(config_args);
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/L2Pool2D.cpp b/onert-micro/onert-micro/src/import/kernels/L2Pool2D.cpp
index 40b9dc427cb..ca362c63f0a 100644
--- a/onert-micro/onert-micro/src/import/kernels/L2Pool2D.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/L2Pool2D.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleL2Pool2D(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleL2Pool2D(const OMConfigureArgs &config_args)
 {
   return helpers::configure_pooling_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/LeakyRelu.cpp b/onert-micro/onert-micro/src/import/kernels/LeakyRelu.cpp
index 7472fa94d8c..7d9b8948cc8 100644
--- a/onert-micro/onert-micro/src/import/kernels/LeakyRelu.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/LeakyRelu.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleLeakyRelu(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLeakyRelu(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Less.cpp b/onert-micro/onert-micro/src/import/kernels/Less.cpp
index ae3cfdb5b65..30f9eee9b85 100644
--- a/onert-micro/onert-micro/src/import/kernels/Less.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Less.cpp
@@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleLess(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLess(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -53,3 +58,6 @@ OMStatus onert_micro::import::configure_kernel_CircleLess(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/LessEqual.cpp b/onert-micro/onert-micro/src/import/kernels/LessEqual.cpp
index 72b8bb26fea..47b4062f83d 100644
--- a/onert-micro/onert-micro/src/import/kernels/LessEqual.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/LessEqual.cpp
@@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleLessEqual(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLessEqual(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -53,3 +58,6 @@ OMStatus onert_micro::import::configure_kernel_CircleLessEqual(const OMConfigure
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Log.cpp b/onert-micro/onert-micro/src/import/kernels/Log.cpp
index 79532b35393..04200ef31cf 100644
--- a/onert-micro/onert-micro/src/import/kernels/Log.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Log.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleLog(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLog(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/LogSoftmax.cpp b/onert-micro/onert-micro/src/import/kernels/LogSoftmax.cpp
index dbd55f8fa4c..4762201cccc 100644
--- a/onert-micro/onert-micro/src/import/kernels/LogSoftmax.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/LogSoftmax.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleLogSoftmax(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLogSoftmax(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Logistic.cpp b/onert-micro/onert-micro/src/import/kernels/Logistic.cpp
index 256a26a2af3..acc7bc3bd46 100644
--- a/onert-micro/onert-micro/src/import/kernels/Logistic.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Logistic.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleLogistic(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleLogistic(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/MaxPool2D.cpp b/onert-micro/onert-micro/src/import/kernels/MaxPool2D.cpp
index 68d4ee7828e..d537883bd8e 100644
--- a/onert-micro/onert-micro/src/import/kernels/MaxPool2D.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/MaxPool2D.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleMaxPool2D(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleMaxPool2D(const OMConfigureArgs &config_args)
 {
   return helpers::configure_pooling_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Maximum.cpp b/onert-micro/onert-micro/src/import/kernels/Maximum.cpp
index 6548b9c31df..458a79dd553 100644
--- a/onert-micro/onert-micro/src/import/kernels/Maximum.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Maximum.cpp
@@ -31,7 +31,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleMaximum(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleMaximum(const OMConfigureArgs &config_args)
 {
 
   OMRuntimeContext &runtime_context = config_args.runtime_context;
@@ -61,3 +66,6 @@ OMStatus onert_micro::import::configure_kernel_CircleMaximum(const OMConfigureAr
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Minimum.cpp b/onert-micro/onert-micro/src/import/kernels/Minimum.cpp
index 3aa3d07584a..a9756a84fb9 100644
--- a/onert-micro/onert-micro/src/import/kernels/Minimum.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Minimum.cpp
@@ -31,7 +31,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleMinimum(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleMinimum(const OMConfigureArgs &config_args)
 {
 
   OMRuntimeContext &runtime_context = config_args.runtime_context;
@@ -61,3 +66,6 @@ OMStatus onert_micro::import::configure_kernel_CircleMinimum(const OMConfigureAr
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Mul.cpp b/onert-micro/onert-micro/src/import/kernels/Mul.cpp
index 8eb35d01a49..8b7c7853786 100644
--- a/onert-micro/onert-micro/src/import/kernels/Mul.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Mul.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleMul(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleMul(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_TISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Neg.cpp b/onert-micro/onert-micro/src/import/kernels/Neg.cpp
index 9a47661761e..cfa588a37a0 100644
--- a/onert-micro/onert-micro/src/import/kernels/Neg.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Neg.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleNeg(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleNeg(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/NotEqual.cpp b/onert-micro/onert-micro/src/import/kernels/NotEqual.cpp
index a9506a4bcaf..64f975ee073 100644
--- a/onert-micro/onert-micro/src/import/kernels/NotEqual.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/NotEqual.cpp
@@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleNotEqual(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleNotEqual(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input1;
   const circle::Tensor *input2;
@@ -54,3 +59,6 @@ OMStatus onert_micro::import::configure_kernel_CircleNotEqual(const OMConfigureA
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Pack.cpp b/onert-micro/onert-micro/src/import/kernels/Pack.cpp
index 97ec90e6515..ed2de21878a 100644
--- a/onert-micro/onert-micro/src/import/kernels/Pack.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Pack.cpp
@@ -25,7 +25,12 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CirclePack(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CirclePack(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -63,3 +68,6 @@ OMStatus onert_micro::import::configure_kernel_CirclePack(const OMConfigureArgs
 
   return Ok;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Pad.cpp b/onert-micro/onert-micro/src/import/kernels/Pad.cpp
index 2e3e1cb7bf8..4f1ef40b6d4 100644
--- a/onert-micro/onert-micro/src/import/kernels/Pad.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Pad.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CirclePad(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CirclePad(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_pad_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Quantize.cpp b/onert-micro/onert-micro/src/import/kernels/Quantize.cpp
index bf2750c75c6..42d8ba3d6a9 100644
--- a/onert-micro/onert-micro/src/import/kernels/Quantize.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Quantize.cpp
@@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleQuantize(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleQuantize(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -71,3 +76,6 @@ OMStatus onert_micro::import::configure_kernel_CircleQuantize(const OMConfigureA
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Relu.cpp b/onert-micro/onert-micro/src/import/kernels/Relu.cpp
index c027fcf5117..ce7dc2145c2 100644
--- a/onert-micro/onert-micro/src/import/kernels/Relu.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Relu.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleRelu(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleRelu(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Relu6.cpp b/onert-micro/onert-micro/src/import/kernels/Relu6.cpp
index aff10a3353e..84e4b82d417 100644
--- a/onert-micro/onert-micro/src/import/kernels/Relu6.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Relu6.cpp
@@ -19,8 +19,16 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleRelu6(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleRelu6(const OMConfigureArgs &config_args)
 {
 
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Reshape.cpp b/onert-micro/onert-micro/src/import/kernels/Reshape.cpp
index 0b44b7b50b9..39c7e0f4d55 100644
--- a/onert-micro/onert-micro/src/import/kernels/Reshape.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Reshape.cpp
@@ -32,7 +32,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleReshape(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleReshape(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -95,3 +100,6 @@ OMStatus onert_micro::import::configure_kernel_CircleReshape(const OMConfigureAr
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Round.cpp b/onert-micro/onert-micro/src/import/kernels/Round.cpp
index 1c661e98801..442ea43214b 100644
--- a/onert-micro/onert-micro/src/import/kernels/Round.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Round.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleRound(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleRound(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Rsqrt.cpp b/onert-micro/onert-micro/src/import/kernels/Rsqrt.cpp
index 41e608bd524..5a44c0673c6 100644
--- a/onert-micro/onert-micro/src/import/kernels/Rsqrt.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Rsqrt.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleRsqrt(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleRsqrt(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/SVDF.cpp b/onert-micro/onert-micro/src/import/kernels/SVDF.cpp
index 2265f45d068..1f60214efd2 100644
--- a/onert-micro/onert-micro/src/import/kernels/SVDF.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/SVDF.cpp
@@ -40,7 +40,12 @@ constexpr int outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSVDF(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSVDF(const OMConfigureArgs &config_args)
 {
   // Validate Tensor Inputs (dtype depends on quantization):
   // [0] = Input, {2, batch_size, input_size}
@@ -152,3 +157,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSVDF(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Shape.cpp b/onert-micro/onert-micro/src/import/kernels/Shape.cpp
index 4ff50ea9342..a68dcbe6448 100644
--- a/onert-micro/onert-micro/src/import/kernels/Shape.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Shape.cpp
@@ -31,7 +31,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleShape(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleShape(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -50,3 +55,6 @@ OMStatus onert_micro::import::configure_kernel_CircleShape(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Sin.cpp b/onert-micro/onert-micro/src/import/kernels/Sin.cpp
index c09261b7208..2fd3876a2d7 100644
--- a/onert-micro/onert-micro/src/import/kernels/Sin.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Sin.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleSin(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSin(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Slice.cpp b/onert-micro/onert-micro/src/import/kernels/Slice.cpp
index c90168bf147..da3d176fad0 100644
--- a/onert-micro/onert-micro/src/import/kernels/Slice.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Slice.cpp
@@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSlice(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSlice(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -79,3 +84,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSlice(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Softmax.cpp b/onert-micro/onert-micro/src/import/kernels/Softmax.cpp
index 71c3a936da0..b62e832a71d 100644
--- a/onert-micro/onert-micro/src/import/kernels/Softmax.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Softmax.cpp
@@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSoftmax(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSoftmax(const OMConfigureArgs &config_args)
 {
   const circle::Tensor *input;
   const circle::Tensor *output;
@@ -81,3 +86,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSoftmax(const OMConfigureAr
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/SpaceToBatchND.cpp b/onert-micro/onert-micro/src/import/kernels/SpaceToBatchND.cpp
index f3db592fccf..71c0b6f1e1c 100644
--- a/onert-micro/onert-micro/src/import/kernels/SpaceToBatchND.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/SpaceToBatchND.cpp
@@ -19,8 +19,16 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleSpaceToBatchND(
-  const onert_micro::import::OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus
+configure_kernel_CircleSpaceToBatchND(const onert_micro::import::OMConfigureArgs &config_args)
 {
   return helpers::configure_spaces_batches_nd_kernel_common(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/SpaceToDepth.cpp b/onert-micro/onert-micro/src/import/kernels/SpaceToDepth.cpp
index b8843293b9b..48e6e940d2b 100644
--- a/onert-micro/onert-micro/src/import/kernels/SpaceToDepth.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/SpaceToDepth.cpp
@@ -30,8 +30,13 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSpaceToDepth(
-  const onert_micro::import::OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus
+configure_kernel_CircleSpaceToDepth(const onert_micro::import::OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -79,3 +84,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSpaceToDepth(
     return status;
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Split.cpp b/onert-micro/onert-micro/src/import/kernels/Split.cpp
index 5ef38f27a9c..1f01c27bbb6 100644
--- a/onert-micro/onert-micro/src/import/kernels/Split.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Split.cpp
@@ -32,7 +32,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSplit(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSplit(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   OMRuntimeStorage &runtime_storage = config_args.runtime_storage;
@@ -86,3 +91,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSplit(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/SplitV.cpp b/onert-micro/onert-micro/src/import/kernels/SplitV.cpp
index 44854b8c2e8..12f9966a360 100644
--- a/onert-micro/onert-micro/src/import/kernels/SplitV.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/SplitV.cpp
@@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleSplitV(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSplitV(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   OMRuntimeStorage &runtime_storage = config_args.runtime_storage;
@@ -104,3 +109,6 @@ OMStatus onert_micro::import::configure_kernel_CircleSplitV(const OMConfigureArg
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Sqrt.cpp b/onert-micro/onert-micro/src/import/kernels/Sqrt.cpp
index 2dd4fb97dee..943fae50d72 100644
--- a/onert-micro/onert-micro/src/import/kernels/Sqrt.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Sqrt.cpp
@@ -18,7 +18,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleSqrt(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSqrt(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Square.cpp b/onert-micro/onert-micro/src/import/kernels/Square.cpp
index eb9ef7eb617..4969b78d595 100644
--- a/onert-micro/onert-micro/src/import/kernels/Square.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Square.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleSquare(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSquare(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/SquaredDifference.cpp b/onert-micro/onert-micro/src/import/kernels/SquaredDifference.cpp
index dd04fb9b719..e29742a60fa 100644
--- a/onert-micro/onert-micro/src/import/kernels/SquaredDifference.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/SquaredDifference.cpp
@@ -19,8 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus
-onert_micro::import::configure_kernel_CircleSquaredDifference(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSquaredDifference(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_TISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/StridedSlice.cpp b/onert-micro/onert-micro/src/import/kernels/StridedSlice.cpp
index 2879234efbb..71c7b836b7b 100644
--- a/onert-micro/onert-micro/src/import/kernels/StridedSlice.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/StridedSlice.cpp
@@ -38,8 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus
-onert_micro::import::configure_kernel_CircleStridedSlice(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleStridedSlice(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -74,3 +78,6 @@ onert_micro::import::configure_kernel_CircleStridedSlice(const OMConfigureArgs &
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Sub.cpp b/onert-micro/onert-micro/src/import/kernels/Sub.cpp
index a21201f0d1d..830e6674af1 100644
--- a/onert-micro/onert-micro/src/import/kernels/Sub.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Sub.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleSub(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleSub(const OMConfigureArgs &config_args)
 {
   return import::helpers::configure_TISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Tanh.cpp b/onert-micro/onert-micro/src/import/kernels/Tanh.cpp
index c486111afa7..446ac8943d6 100644
--- a/onert-micro/onert-micro/src/import/kernels/Tanh.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Tanh.cpp
@@ -19,7 +19,15 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleTanh(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleTanh(const OMConfigureArgs &config_args)
 {
   return onert_micro::import::helpers::configure_SISO_kernel(config_args);
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Transpose.cpp b/onert-micro/onert-micro/src/import/kernels/Transpose.cpp
index 462ac64356a..a1e0326dc87 100644
--- a/onert-micro/onert-micro/src/import/kernels/Transpose.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Transpose.cpp
@@ -35,7 +35,12 @@ constexpr int kOutputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleTranspose(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleTranspose(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -70,3 +75,6 @@ OMStatus onert_micro::import::configure_kernel_CircleTranspose(const OMConfigure
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/TransposeConv.cpp b/onert-micro/onert-micro/src/import/kernels/TransposeConv.cpp
index 100019ffdad..b17b98e008e 100644
--- a/onert-micro/onert-micro/src/import/kernels/TransposeConv.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/TransposeConv.cpp
@@ -42,8 +42,12 @@ constexpr int kOutputTensorIdx = 0;
 
 } // namespace
 
-OMStatus
-onert_micro::import::configure_kernel_CircleTransposeConv(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleTransposeConv(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   uint16_t op_index = config_args.kernel_index;
@@ -83,3 +87,6 @@ onert_micro::import::configure_kernel_CircleTransposeConv(const OMConfigureArgs
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/Unpack.cpp b/onert-micro/onert-micro/src/import/kernels/Unpack.cpp
index c7536cb2b40..93e315b8666 100644
--- a/onert-micro/onert-micro/src/import/kernels/Unpack.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/Unpack.cpp
@@ -31,7 +31,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::import::configure_kernel_CircleUnpack(const OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleUnpack(const OMConfigureArgs &config_args)
 {
   OMRuntimeContext &runtime_context = config_args.runtime_context;
   OMRuntimeStorage &runtime_storage = config_args.runtime_storage;
@@ -98,3 +103,6 @@ OMStatus onert_micro::import::configure_kernel_CircleUnpack(const OMConfigureArg
 
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/import/kernels/While.cpp b/onert-micro/onert-micro/src/import/kernels/While.cpp
index 65752818b3c..879575fa459 100644
--- a/onert-micro/onert-micro/src/import/kernels/While.cpp
+++ b/onert-micro/onert-micro/src/import/kernels/While.cpp
@@ -22,8 +22,12 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::import::configure_kernel_CircleWhile(
-  const onert_micro::import::OMConfigureArgs &config_args)
+namespace onert_micro
+{
+namespace import
+{
+
+OMStatus configure_kernel_CircleWhile(const onert_micro::import::OMConfigureArgs &config_args)
 {
   OMRuntimeModule &runtime_module = config_args.runtime_module;
   OMRuntimeContext &runtime_context = config_args.runtime_context;
@@ -78,3 +82,6 @@ OMStatus onert_micro::import::configure_kernel_CircleWhile(
                           body_runtime_graph->getNumberOfOutputs() == runtime_kernel.outputs_num);
   return status;
 }
+
+} // namespace import
+} // namespace onert_micro