From f4643379c5f210d552ee3e8395f831ff5c168de7 Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <michalis.spyrou@arm.com>
Date: Fri, 29 Nov 2019 16:17:13 +0000
Subject: COMPMID-2826 Comply with DCL51-CPP

Rename all header guards to be compliant with DCL51-CPP

Change-Id: I47b09375bb1b8d39d80c275ce69a3f25fb385d75
Signed-off-by: Michalis Spyrou <micspy01@e123758.cambridge.arm.com>
Reviewed-on: https://review.mlplatform.org/c/2393
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h         | 8 ++++----
 arm_compute/runtime/NEON/functions/NEAccumulate.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEActivationLayer.h            | 6 +++---
 arm_compute/runtime/NEON/functions/NEArgMinMaxLayer.h             | 6 +++---
 arm_compute/runtime/NEON/functions/NEArithmeticAddition.h         | 6 +++---
 arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h      | 6 +++---
 arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h    | 8 ++++----
 arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NEBitwiseAnd.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEBitwiseNot.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEBitwiseOr.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NEBitwiseXor.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NEBox3x3.h                     | 8 ++++----
 arm_compute/runtime/NEON/functions/NECannyEdge.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NECast.h                       | 6 +++---
 arm_compute/runtime/NEON/functions/NEChannelCombine.h             | 8 ++++----
 arm_compute/runtime/NEON/functions/NEChannelExtract.h             | 8 ++++----
 arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h        | 8 ++++----
 arm_compute/runtime/NEON/functions/NECol2Im.h                     | 6 +++---
 arm_compute/runtime/NEON/functions/NEColorConvert.h               | 8 ++++----
 arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NEConcatenateLayer.h           | 6 +++---
 .../runtime/NEON/functions/NEConvertFullyConnectedWeights.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NEConvolution.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEConvolutionLayer.h           | 8 ++++----
 arm_compute/runtime/NEON/functions/NECopy.h                       | 8 ++++----
 arm_compute/runtime/NEON/functions/NECropResize.h                 | 6 +++---
 arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h         | 6 +++---
 arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h          | 8 ++++----
 arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h  | 6 +++---
 arm_compute/runtime/NEON/functions/NEDequantizationLayer.h        | 6 +++---
 arm_compute/runtime/NEON/functions/NEDerivative.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h  | 6 +++---
 arm_compute/runtime/NEON/functions/NEDilate.h                     | 8 ++++----
 arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h     | 8 ++++----
 arm_compute/runtime/NEON/functions/NEElementwiseOperations.h      | 6 +++---
 arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h      | 6 +++---
 arm_compute/runtime/NEON/functions/NEEqualizeHistogram.h          | 8 ++++----
 arm_compute/runtime/NEON/functions/NEErode.h                      | 8 ++++----
 arm_compute/runtime/NEON/functions/NEFFT1D.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NEFFT2D.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h        | 6 +++---
 arm_compute/runtime/NEON/functions/NEFastCorners.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEFillBorder.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEFlattenLayer.h               | 8 ++++----
 arm_compute/runtime/NEON/functions/NEFloor.h                      | 8 ++++----
 arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h        | 6 +++---
 arm_compute/runtime/NEON/functions/NEFuseBatchNormalization.h     | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMM.h                       | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h          | 6 +++---
 .../runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h        | 6 +++---
 arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h           | 6 +++---
 arm_compute/runtime/NEON/functions/NEGather.h                     | 6 +++---
 arm_compute/runtime/NEON/functions/NEGaussian3x3.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEGaussian5x5.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEGaussianPyramid.h            | 6 +++---
 arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h     | 6 +++---
 arm_compute/runtime/NEON/functions/NEHOGDescriptor.h              | 8 ++++----
 arm_compute/runtime/NEON/functions/NEHOGDetector.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEHOGGradient.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NEHarrisCorners.h              | 6 +++---
 arm_compute/runtime/NEON/functions/NEHistogram.h                  | 6 +++---
 arm_compute/runtime/NEON/functions/NEIm2Col.h                     | 8 ++++----
 arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h | 6 +++---
 arm_compute/runtime/NEON/functions/NEIntegralImage.h              | 8 ++++----
 arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h           | 6 +++---
 arm_compute/runtime/NEON/functions/NELSTMLayer.h                  | 6 +++---
 arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h         | 6 +++---
 arm_compute/runtime/NEON/functions/NELaplacianPyramid.h           | 6 +++---
 arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h      | 8 ++++----
 arm_compute/runtime/NEON/functions/NEMagnitude.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NEMeanStdDev.h                 | 8 ++++----
 .../runtime/NEON/functions/NEMeanStdDevNormalizationLayer.h       | 6 +++---
 arm_compute/runtime/NEON/functions/NEMedian3x3.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NEMinMaxLocation.h             | 8 ++++----
 arm_compute/runtime/NEON/functions/NENonLinearFilter.h            | 8 ++++----
 arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h    | 8 ++++----
 arm_compute/runtime/NEON/functions/NENormalizationLayer.h         | 8 ++++----
 arm_compute/runtime/NEON/functions/NEOpticalFlow.h                | 6 +++---
 arm_compute/runtime/NEON/functions/NEPReluLayer.h                 | 6 +++---
 arm_compute/runtime/NEON/functions/NEPadLayer.h                   | 6 +++---
 arm_compute/runtime/NEON/functions/NEPermute.h                    | 8 ++++----
 arm_compute/runtime/NEON/functions/NEPhase.h                      | 8 ++++----
 arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h    | 6 +++---
 arm_compute/runtime/NEON/functions/NEPoolingLayer.h               | 8 ++++----
 arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h              | 8 ++++----
 arm_compute/runtime/NEON/functions/NEQuantizationLayer.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NERNNLayer.h                   | 6 +++---
 arm_compute/runtime/NEON/functions/NEROIAlignLayer.h              | 6 +++---
 arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h            | 6 +++---
 arm_compute/runtime/NEON/functions/NERange.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NEReduceMean.h                 | 6 +++---
 arm_compute/runtime/NEON/functions/NEReductionOperation.h         | 6 +++---
 arm_compute/runtime/NEON/functions/NERemap.h                      | 8 ++++----
 arm_compute/runtime/NEON/functions/NEReorgLayer.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEReshapeLayer.h               | 8 ++++----
 arm_compute/runtime/NEON/functions/NEReverse.h                    | 6 +++---
 arm_compute/runtime/NEON/functions/NEScale.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NEScharr3x3.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NESelect.h                     | 8 ++++----
 arm_compute/runtime/NEON/functions/NESimpleAssemblyFunction.h     | 8 ++++----
 arm_compute/runtime/NEON/functions/NESlice.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NESobel3x3.h                   | 8 ++++----
 arm_compute/runtime/NEON/functions/NESobel5x5.h                   | 8 ++++----
 arm_compute/runtime/NEON/functions/NESobel7x7.h                   | 8 ++++----
 arm_compute/runtime/NEON/functions/NESoftmaxLayer.h               | 6 +++---
 arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h          | 6 +++---
 arm_compute/runtime/NEON/functions/NESplit.h                      | 6 +++---
 arm_compute/runtime/NEON/functions/NEStackLayer.h                 | 6 +++---
 arm_compute/runtime/NEON/functions/NEStridedSlice.h               | 6 +++---
 arm_compute/runtime/NEON/functions/NETableLookup.h                | 8 ++++----
 arm_compute/runtime/NEON/functions/NEThreshold.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NETile.h                       | 8 ++++----
 arm_compute/runtime/NEON/functions/NETranspose.h                  | 8 ++++----
 arm_compute/runtime/NEON/functions/NEUnstack.h                    | 6 +++---
 arm_compute/runtime/NEON/functions/NEUpsampleLayer.h              | 8 ++++----
 arm_compute/runtime/NEON/functions/NEWarpAffine.h                 | 8 ++++----
 arm_compute/runtime/NEON/functions/NEWarpPerspective.h            | 8 ++++----
 arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h   | 6 +++---
 arm_compute/runtime/NEON/functions/NEYOLOLayer.h                  | 8 ++++----
 .../functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.h   | 6 +++---
 130 files changed, 452 insertions(+), 452 deletions(-)

(limited to 'arm_compute/runtime/NEON/functions')

diff --git a/arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h b/arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h
index 266a27586a..2d6f94cde0 100644
--- a/arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h
+++ b/arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H__
-#define __ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H__
+#ifndef ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H
+#define ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
 
@@ -47,4 +47,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output);
 };
 }
-#endif /* __ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H__ */
+#endif /* ARM_COMPUTE_NEABSOLUTEDIFFERENCE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEAccumulate.h b/arm_compute/runtime/NEON/functions/NEAccumulate.h
index 36b8bec3aa..0426bf94d7 100644
--- a/arm_compute/runtime/NEON/functions/NEAccumulate.h
+++ b/arm_compute/runtime/NEON/functions/NEAccumulate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEACCUMULATE_H__
-#define __ARM_COMPUTE_NEACCUMULATE_H__
+#ifndef ARM_COMPUTE_NEACCUMULATE_H
+#define ARM_COMPUTE_NEACCUMULATE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -71,4 +71,4 @@ public:
     void configure(const ITensor *input, uint32_t shift, ITensor *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEACCUMULATE_H__ */
+#endif /*ARM_COMPUTE_NEACCUMULATE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEActivationLayer.h b/arm_compute/runtime/NEON/functions/NEActivationLayer.h
index a0517ba646..cd9b22d397 100644
--- a/arm_compute/runtime/NEON/functions/NEActivationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEActivationLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEACTIVATIONLAYER_H__
-#define __ARM_COMPUTE_NEACTIVATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEACTIVATIONLAYER_H
+#define ARM_COMPUTE_NEACTIVATIONLAYER_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -77,4 +77,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEACTIVATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEACTIVATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEArgMinMaxLayer.h b/arm_compute/runtime/NEON/functions/NEArgMinMaxLayer.h
index ca6794bf82..e4a7b94a7a 100644
--- a/arm_compute/runtime/NEON/functions/NEArgMinMaxLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEArgMinMaxLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEARGMINMAXLAYER_H__
-#define __ARM_COMPUTE_NEARGMINMAXLAYER_H__
+#ifndef ARM_COMPUTE_NEARGMINMAXLAYER_H
+#define ARM_COMPUTE_NEARGMINMAXLAYER_H
 
 #include "arm_compute/runtime/NEON/functions/NEReductionOperation.h"
 
@@ -78,4 +78,4 @@ private:
     std::unique_ptr<NEReductionOperation> _reduction_function;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEARGMINMAXLAYER_H__ */
+#endif /* ARM_COMPUTE_NEARGMINMAXLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEArithmeticAddition.h b/arm_compute/runtime/NEON/functions/NEArithmeticAddition.h
index 6ec135f0e5..e17c255d2a 100644
--- a/arm_compute/runtime/NEON/functions/NEArithmeticAddition.h
+++ b/arm_compute/runtime/NEON/functions/NEArithmeticAddition.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEARITHMETICADDITION_H__
-#define __ARM_COMPUTE_NEARITHMETICADDITION_H__
+#ifndef ARM_COMPUTE_NEARITHMETICADDITION_H
+#define ARM_COMPUTE_NEARITHMETICADDITION_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -55,4 +55,4 @@ public:
     static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, ConvertPolicy policy);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEARITHMETICADDITION_H__ */
+#endif /*ARM_COMPUTE_NEARITHMETICADDITION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h b/arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h
index e6ff4458f0..671a5dd61c 100644
--- a/arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h
+++ b/arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEARITHMETICSUBTRACTION_H__
-#define __ARM_COMPUTE_NEARITHMETICSUBTRACTION_H__
+#ifndef ARM_COMPUTE_NEARITHMETICSUBTRACTION_H
+#define ARM_COMPUTE_NEARITHMETICSUBTRACTION_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -63,4 +63,4 @@ public:
     static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, ConvertPolicy policy);
 };
 }
-#endif /* __ARM_COMPUTE_NEARITHMETICSUBTRACTION_H__ */
+#endif /* ARM_COMPUTE_NEARITHMETICSUBTRACTION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h b/arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h
index 77f06129a3..14416e7323 100644
--- a/arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H__
-#define __ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H
+#define ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEBatchNormalizationLayerKernel.h"
 #include "arm_compute/core/Types.h"
@@ -88,4 +88,4 @@ private:
     NEBatchNormalizationLayerKernel _norm_kernel; /**< Batch normalization layer kernel */
 };
 }
-#endif /* __ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEBATCHNORMALIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h b/arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h
index 3ab3fa112e..f0a33a71f2 100644
--- a/arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEBatchToSpaceLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBATCHTOSPACELAYER_H__
-#define __ARM_COMPUTE_NEBATCHTOSPACELAYER_H__
+#ifndef ARM_COMPUTE_NEBATCHTOSPACELAYER_H
+#define ARM_COMPUTE_NEBATCHTOSPACELAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -74,4 +74,4 @@ public:
     static Status validate(const ITensorInfo *input, int32_t block_shape_x, int32_t block_shape_y, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEBATCHTOSPACELAYER_H__ */
+#endif /* ARM_COMPUTE_NEBATCHTOSPACELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBitwiseAnd.h b/arm_compute/runtime/NEON/functions/NEBitwiseAnd.h
index bdcbaba3fa..c254c30ce5 100644
--- a/arm_compute/runtime/NEON/functions/NEBitwiseAnd.h
+++ b/arm_compute/runtime/NEON/functions/NEBitwiseAnd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBITWISEAND_H__
-#define __ARM_COMPUTE_NEBITWISEAND_H__
+#ifndef ARM_COMPUTE_NEBITWISEAND_H
+#define ARM_COMPUTE_NEBITWISEAND_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -43,4 +43,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEBITWISEAND_H__ */
+#endif /* ARM_COMPUTE_NEBITWISEAND_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBitwiseNot.h b/arm_compute/runtime/NEON/functions/NEBitwiseNot.h
index c2321a89b8..15e12509c8 100644
--- a/arm_compute/runtime/NEON/functions/NEBitwiseNot.h
+++ b/arm_compute/runtime/NEON/functions/NEBitwiseNot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBITWISENOT_H__
-#define __ARM_COMPUTE_NEBITWISENOT_H__
+#ifndef ARM_COMPUTE_NEBITWISENOT_H
+#define ARM_COMPUTE_NEBITWISENOT_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -42,4 +42,4 @@ public:
     void configure(const ITensor *input, ITensor *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEBITWISENOT_H__ */
+#endif /* ARM_COMPUTE_NEBITWISENOT_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBitwiseOr.h b/arm_compute/runtime/NEON/functions/NEBitwiseOr.h
index 689329ff42..0e62620fc0 100644
--- a/arm_compute/runtime/NEON/functions/NEBitwiseOr.h
+++ b/arm_compute/runtime/NEON/functions/NEBitwiseOr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBITWISEOR_H__
-#define __ARM_COMPUTE_NEBITWISEOR_H__
+#ifndef ARM_COMPUTE_NEBITWISEOR_H
+#define ARM_COMPUTE_NEBITWISEOR_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -43,4 +43,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEBITWISEOR_H__ */
+#endif /* ARM_COMPUTE_NEBITWISEOR_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBitwiseXor.h b/arm_compute/runtime/NEON/functions/NEBitwiseXor.h
index cc9f1ed47a..1dcc6e2216 100644
--- a/arm_compute/runtime/NEON/functions/NEBitwiseXor.h
+++ b/arm_compute/runtime/NEON/functions/NEBitwiseXor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBITWISEXOR_H__
-#define __ARM_COMPUTE_NEBITWISEXOR_H__
+#ifndef ARM_COMPUTE_NEBITWISEXOR_H
+#define ARM_COMPUTE_NEBITWISEXOR_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -43,4 +43,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEBITWISEXOR_H__ */
+#endif /* ARM_COMPUTE_NEBITWISEXOR_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h b/arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h
index c73371a530..36a35d3890 100644
--- a/arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h
+++ b/arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBOUNDINGBOXTRANSOFORM_H__
-#define __ARM_COMPUTE_NEBOUNDINGBOXTRANSOFORM_H__
+#ifndef ARM_COMPUTE_NEBOUNDINGBOXTRANSOFORM_H
+#define ARM_COMPUTE_NEBOUNDINGBOXTRANSOFORM_H
 
 #include "arm_compute/core/NEON/kernels/NEBoundingBoxTransformKernel.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -66,4 +66,4 @@ public:
     static Status validate(const ITensorInfo *boxes, const ITensorInfo *pred_boxes, const ITensorInfo *deltas, const BoundingBoxTransformInfo &info);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_CLBOUNDINGBOXTRANSFORM_H__ */
+#endif /* ARM_COMPUTE_CLBOUNDINGBOXTRANSFORM_H */
diff --git a/arm_compute/runtime/NEON/functions/NEBox3x3.h b/arm_compute/runtime/NEON/functions/NEBox3x3.h
index 2b5440a74c..c382ea9114 100644
--- a/arm_compute/runtime/NEON/functions/NEBox3x3.h
+++ b/arm_compute/runtime/NEON/functions/NEBox3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEBOX3x3_H__
-#define __ARM_COMPUTE_NEBOX3x3_H__
+#ifndef ARM_COMPUTE_NEBOX3x3_H
+#define ARM_COMPUTE_NEBOX3x3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -55,4 +55,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value = 0, bool use_fp16 = false);
 };
 }
-#endif /*__ARM_COMPUTE_NEBOX3x3_H__ */
+#endif /*ARM_COMPUTE_NEBOX3x3_H */
diff --git a/arm_compute/runtime/NEON/functions/NECannyEdge.h b/arm_compute/runtime/NEON/functions/NECannyEdge.h
index 0b6e555667..84cc2de6d6 100644
--- a/arm_compute/runtime/NEON/functions/NECannyEdge.h
+++ b/arm_compute/runtime/NEON/functions/NECannyEdge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECANNYEDGE_H__
-#define __ARM_COMPUTE_NECANNYEDGE_H__
+#ifndef ARM_COMPUTE_NECANNYEDGE_H
+#define ARM_COMPUTE_NECANNYEDGE_H
 
 #include "arm_compute/core/NEON/kernels/NECannyEdgeKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
@@ -96,4 +96,4 @@ private:
     ITensor                      *_output;              /**< Output tensor provided by the user. */
 };
 }
-#endif /* __ARM_COMPUTE_NECANNYEDGE_H */
+#endif /* ARM_COMPUTE_NECANNYEDGE_H */
diff --git a/arm_compute/runtime/NEON/functions/NECast.h b/arm_compute/runtime/NEON/functions/NECast.h
index 5d09bf757f..705cddc662 100644
--- a/arm_compute/runtime/NEON/functions/NECast.h
+++ b/arm_compute/runtime/NEON/functions/NECast.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECAST_H__
-#define __ARM_COMPUTE_NECAST_H__
+#ifndef ARM_COMPUTE_NECAST_H
+#define ARM_COMPUTE_NECAST_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -67,4 +67,4 @@ public:
     static Status validate(ITensorInfo *input, ITensorInfo *output, ConvertPolicy policy);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NECAST_H__*/
+#endif /*ARM_COMPUTE_NECAST_H*/
diff --git a/arm_compute/runtime/NEON/functions/NEChannelCombine.h b/arm_compute/runtime/NEON/functions/NEChannelCombine.h
index b5942b2eb7..ba159160e0 100644
--- a/arm_compute/runtime/NEON/functions/NEChannelCombine.h
+++ b/arm_compute/runtime/NEON/functions/NEChannelCombine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECHANNELCOMBINE_H__
-#define __ARM_COMPUTE_NECHANNELCOMBINE_H__
+#ifndef ARM_COMPUTE_NECHANNELCOMBINE_H
+#define ARM_COMPUTE_NECHANNELCOMBINE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -55,4 +55,4 @@ public:
     void configure(const IImage *plane0, const IImage *plane1, const IImage *plane2, IMultiImage *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NECHANNELCOMBINE_H__*/
+#endif /*ARM_COMPUTE_NECHANNELCOMBINE_H*/
diff --git a/arm_compute/runtime/NEON/functions/NEChannelExtract.h b/arm_compute/runtime/NEON/functions/NEChannelExtract.h
index ad2bd535e9..96ba1c8ecc 100644
--- a/arm_compute/runtime/NEON/functions/NEChannelExtract.h
+++ b/arm_compute/runtime/NEON/functions/NEChannelExtract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECHANNELEXTRACT_H__
-#define __ARM_COMPUTE_NECHANNELEXTRACT_H__
+#ifndef ARM_COMPUTE_NECHANNELEXTRACT_H
+#define ARM_COMPUTE_NECHANNELEXTRACT_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -53,4 +53,4 @@ public:
     void configure(const IMultiImage *input, Channel channel, IImage *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NECHANNELEXTRACT_H__*/
+#endif /*ARM_COMPUTE_NECHANNELEXTRACT_H*/
diff --git a/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h b/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h
index 0a140d6791..ecc1822f9d 100644
--- a/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECHANNELSHUFFLELAYER_H__
-#define __ARM_COMPUTE_NECHANNELSHUFFLELAYER_H__
+#ifndef ARM_COMPUTE_NECHANNELSHUFFLELAYER_H
+#define ARM_COMPUTE_NECHANNELSHUFFLELAYER_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -58,4 +58,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, unsigned int num_groups);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECHANNELSHUFFLELAYER_H__ */
+#endif /* ARM_COMPUTE_NECHANNELSHUFFLELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NECol2Im.h b/arm_compute/runtime/NEON/functions/NECol2Im.h
index 613507cf6a..8987c82714 100644
--- a/arm_compute/runtime/NEON/functions/NECol2Im.h
+++ b/arm_compute/runtime/NEON/functions/NECol2Im.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECOL2IM_H__
-#define __ARM_COMPUTE_NECOL2IM_H__
+#ifndef ARM_COMPUTE_NECOL2IM_H
+#define ARM_COMPUTE_NECOL2IM_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -57,4 +57,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &convolved_dims);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECOL2IM_H__ */
+#endif /* ARM_COMPUTE_NECOL2IM_H */
diff --git a/arm_compute/runtime/NEON/functions/NEColorConvert.h b/arm_compute/runtime/NEON/functions/NEColorConvert.h
index a3dd064d06..ee76db2787 100644
--- a/arm_compute/runtime/NEON/functions/NEColorConvert.h
+++ b/arm_compute/runtime/NEON/functions/NEColorConvert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECOLORCONVERT_H__
-#define __ARM_COMPUTE_NECOLORCONVERT_H__
+#ifndef ARM_COMPUTE_NECOLORCONVERT_H
+#define ARM_COMPUTE_NECOLORCONVERT_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -64,4 +64,4 @@ public:
     void configure(const IMultiImage *input, IMultiImage *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NECOLORCONVERT_H__*/
+#endif /*ARM_COMPUTE_NECOLORCONVERT_H*/
diff --git a/arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h b/arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h
index 5f24b3e618..09c0c9d985 100644
--- a/arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h
+++ b/arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECOMPUTEALLANCHORS_H__
-#define __ARM_COMPUTE_NECOMPUTEALLANCHORS_H__
+#ifndef ARM_COMPUTE_NECOMPUTEALLANCHORS_H
+#define ARM_COMPUTE_NECOMPUTEALLANCHORS_H
 
 #include "arm_compute/core/NEON/kernels/NEGenerateProposalsLayerKernel.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -59,4 +59,4 @@ public:
     static Status validate(const ITensorInfo *anchors, const ITensorInfo *all_anchors, const ComputeAnchorsInfo &info);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECOMPUTEALLANCHORS_H__ */
+#endif /* ARM_COMPUTE_NECOMPUTEALLANCHORS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h
index 953e3fa641..3591cfd9da 100644
--- a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECONCATENATELAYER_H__
-#define __ARM_COMPUTE_NECONCATENATELAYER_H__
+#ifndef ARM_COMPUTE_NECONCATENATELAYER_H
+#define ARM_COMPUTE_NECONCATENATELAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -93,4 +93,4 @@ private:
     unsigned int                            _axis;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECONCATENATELAYER_H__ */
+#endif /* ARM_COMPUTE_NECONCATENATELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h b/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h
index 50a86bd7c4..37b6b6c4dd 100644
--- a/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h
+++ b/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H__
-#define __ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H__
+#ifndef ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H
+#define ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H
 
 #include "arm_compute/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -106,4 +106,4 @@ private:
 };
 } // namespace weights_transformations
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H__ */
+#endif /* ARM_COMPUTE_NECONVERTFULLYCONNECTEDWEIGHTS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEConvolution.h b/arm_compute/runtime/NEON/functions/NEConvolution.h
index 9c0a906651..c297589013 100644
--- a/arm_compute/runtime/NEON/functions/NEConvolution.h
+++ b/arm_compute/runtime/NEON/functions/NEConvolution.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECONVOLUTION_H__
-#define __ARM_COMPUTE_NECONVOLUTION_H__
+#ifndef ARM_COMPUTE_NECONVOLUTION_H
+#define ARM_COMPUTE_NECONVOLUTION_H
 
 #include "arm_compute/core/NEON/kernels/NEConvolutionKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
@@ -129,4 +129,4 @@ public:
     void configure(ITensor *input, ITensor *output, const int16_t *conv, uint32_t rows, uint32_t cols, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NECONVOLUTION_H__ */
+#endif /*ARM_COMPUTE_NECONVOLUTION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h
index 91fcef5971..b76695b80c 100644
--- a/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NECONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NECONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NECONVOLUTIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -149,5 +149,5 @@ private:
     std::shared_ptr<IMemoryManager> _memory_manager;
     std::unique_ptr<IFunction>      _function; /**< Function to run */
 };
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECONVOLUTIONLAYER_H__ */
+}
+#endif /* ARM_COMPUTE_NECONVOLUTIONLAYER_H */
\ No newline at end of file
diff --git a/arm_compute/runtime/NEON/functions/NECopy.h b/arm_compute/runtime/NEON/functions/NECopy.h
index c476da54eb..7ad89e27d8 100644
--- a/arm_compute/runtime/NEON/functions/NECopy.h
+++ b/arm_compute/runtime/NEON/functions/NECopy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NECOPY_H__
-#define __ARM_COMPUTE_NECOPY_H__
+#ifndef ARM_COMPUTE_NECOPY_H
+#define ARM_COMPUTE_NECOPY_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -52,4 +52,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NECOPY_H__ */
+#endif /*ARM_COMPUTE_NECOPY_H */
diff --git a/arm_compute/runtime/NEON/functions/NECropResize.h b/arm_compute/runtime/NEON/functions/NECropResize.h
index 53e8f7f7a5..9f961a13e6 100644
--- a/arm_compute/runtime/NEON/functions/NECropResize.h
+++ b/arm_compute/runtime/NEON/functions/NECropResize.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEON_CROP_RESIZE_H__
-#define __ARM_COMPUTE_NEON_CROP_RESIZE_H__
+#ifndef ARM_COMPUTE_NEON_CROP_RESIZE_H
+#define ARM_COMPUTE_NEON_CROP_RESIZE_H
 
 #include "arm_compute/core/NEON/kernels/NECropKernel.h"
 #include "arm_compute/runtime/NEON/functions/NEScale.h"
@@ -104,4 +104,4 @@ public:
     std::vector<std::unique_ptr<Tensor>>       _scaled_results;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEON_CROP_RESIZE_H__ */
+#endif /* ARM_COMPUTE_NEON_CROP_RESIZE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
index 6880bbba6b..d031076ee7 100644
--- a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NEDECONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NEDECONVOLUTIONLAYER_H
 
 #include "arm_compute/runtime/CPP/functions/CPPUpsample.h"
 #include "arm_compute/runtime/NEON/functions/NEConvolutionLayer.h"
@@ -133,4 +133,4 @@ private:
     bool                 _is_prepared;
 };
 } // arm_compute
-#endif /* __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEDECONVOLUTIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h b/arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h
index 8ee5a123ae..43a256ebe2 100644
--- a/arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDEPTHCONVERT_H__
-#define __ARM_COMPUTE_NEDEPTHCONVERT_H__
+#ifndef ARM_COMPUTE_NEDEPTHCONVERT_H
+#define ARM_COMPUTE_NEDEPTHCONVERT_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -72,4 +72,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, ConvertPolicy policy, uint32_t shift = 0);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEDEPTHCONVERT_H__*/
+#endif /*ARM_COMPUTE_NEDEPTHCONVERT_H*/
diff --git a/arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h b/arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h
index 54a6ddaefc..56c237420b 100644
--- a/arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDEPTHTOSPACELAYER_H__
-#define __ARM_COMPUTE_NEDEPTHTOSPACELAYER_H__
+#ifndef ARM_COMPUTE_NEDEPTHTOSPACELAYER_H
+#define ARM_COMPUTE_NEDEPTHTOSPACELAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -56,4 +56,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, int32_t block_shape);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEDEPTHTOSPACELAYER_H__ */
+#endif /* ARM_COMPUTE_NEDEPTHTOSPACELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h
index efe9cdfbf0..750dab284c 100644
--- a/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H__
-#define __ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H__
+#ifndef ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H
+#define ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H
 
 #include "arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h"
 #include "arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.h"
@@ -369,4 +369,4 @@ private:
     NEDepthwiseConvolutionLayer _func;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H */
\ No newline at end of file
diff --git a/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h b/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h
index 4031ae01ed..f8d0ce8b2d 100644
--- a/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDequantizationLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H__
-#define __ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H
+#define ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -53,4 +53,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEDEQUANTIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDerivative.h b/arm_compute/runtime/NEON/functions/NEDerivative.h
index 57b7409b39..65d0654612 100644
--- a/arm_compute/runtime/NEON/functions/NEDerivative.h
+++ b/arm_compute/runtime/NEON/functions/NEDerivative.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDERIVATIVE_H__
-#define __ARM_COMPUTE_NEDERIVATIVE_H__
+#ifndef ARM_COMPUTE_NEDERIVATIVE_H
+#define ARM_COMPUTE_NEDERIVATIVE_H
 
 #include "arm_compute/core/NEON/kernels/NEDerivativeKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
@@ -67,4 +67,4 @@ private:
     NEFillBorderKernel _border_handler; /**< Kernel to handle tensor borders */
 };
 }
-#endif /* __ARM_COMPUTE_NEDERIVATIVE_H__ */
+#endif /* ARM_COMPUTE_NEDERIVATIVE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h b/arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h
index 58ba98a376..d616762a5a 100644
--- a/arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDetectionPostProcessLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H__
-#define __ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H__
+#ifndef ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H
+#define ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
 
@@ -97,4 +97,4 @@ private:
     bool   _run_dequantize;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H__ */
+#endif /* ARM_COMPUTE_NE_DETECTION_POSTPROCESS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDilate.h b/arm_compute/runtime/NEON/functions/NEDilate.h
index 3b795f57ee..39a37af74c 100644
--- a/arm_compute/runtime/NEON/functions/NEDilate.h
+++ b/arm_compute/runtime/NEON/functions/NEDilate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDILATE_H__
-#define __ARM_COMPUTE_NEDILATE_H__
+#ifndef ARM_COMPUTE_NEDILATE_H
+#define ARM_COMPUTE_NEDILATE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -52,4 +52,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEDILATE_H__ */
+#endif /*ARM_COMPUTE_NEDILATE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h
index a4a55d10f8..68454be88f 100644
--- a/arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEDirectConvolutionLayerKernel.h"
 #include "arm_compute/core/NEON/kernels/NEDirectConvolutionLayerOutputStageKernel.h"
@@ -108,4 +108,4 @@ private:
     unsigned int                              _dim_split;
 };
 }
-#endif /* __ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEDIRECTCONVOLUTIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEElementwiseOperations.h b/arm_compute/runtime/NEON/functions/NEElementwiseOperations.h
index 586546c8bc..983a9a5d4e 100644
--- a/arm_compute/runtime/NEON/functions/NEElementwiseOperations.h
+++ b/arm_compute/runtime/NEON/functions/NEElementwiseOperations.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H__
-#define __ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H__
+#ifndef ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H
+#define ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -230,4 +230,4 @@ using NELess = NEElementwiseComparisonStatic<ComparisonOperation::Less>;
 /** Basic function to run less-equal comparison. */
 using NELessEqual = NEElementwiseComparisonStatic<ComparisonOperation::LessEqual>;
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H__ */
+#endif /* ARM_COMPUTE_NEELEMENTWISEOPERATIONS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h b/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h
index 22b3bbeeba..094f875b35 100644
--- a/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H__
-#define __ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H__
+#ifndef ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H
+#define ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
 
@@ -170,4 +170,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H__ */
+#endif /* ARM_COMPUTE_NEELEMENTWISEUNARYLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEEqualizeHistogram.h b/arm_compute/runtime/NEON/functions/NEEqualizeHistogram.h
index 6cf8008480..e9d58f3e0c 100644
--- a/arm_compute/runtime/NEON/functions/NEEqualizeHistogram.h
+++ b/arm_compute/runtime/NEON/functions/NEEqualizeHistogram.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H__
-#define __ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H__
+#ifndef ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H
+#define ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H
 
 #include "arm_compute/core/NEON/kernels/NECumulativeDistributionKernel.h"
 #include "arm_compute/core/NEON/kernels/NEHistogramKernel.h"
@@ -74,4 +74,4 @@ private:
     static constexpr uint32_t      max_range{ nr_bins - 1 }; /**< Histogram range of the internal histograms. */
 };
 }
-#endif /*__ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H__ */
+#endif /*ARM_COMPUTE_NEEQUALIZEHISTOGRAM_H */
diff --git a/arm_compute/runtime/NEON/functions/NEErode.h b/arm_compute/runtime/NEON/functions/NEErode.h
index 739e981a9e..1d6ea42e16 100644
--- a/arm_compute/runtime/NEON/functions/NEErode.h
+++ b/arm_compute/runtime/NEON/functions/NEErode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEERODE_H__
-#define __ARM_COMPUTE_NEERODE_H__
+#ifndef ARM_COMPUTE_NEERODE_H
+#define ARM_COMPUTE_NEERODE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -52,4 +52,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEERODE_H__ */
+#endif /*ARM_COMPUTE_NEERODE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFFT1D.h b/arm_compute/runtime/NEON/functions/NEFFT1D.h
index ca3ef16d8f..c710b937b4 100644
--- a/arm_compute/runtime/NEON/functions/NEFFT1D.h
+++ b/arm_compute/runtime/NEON/functions/NEFFT1D.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFFT1D_H__
-#define __ARM_COMPUTE_NEFFT1D_H__
+#ifndef ARM_COMPUTE_NEFFT1D_H
+#define ARM_COMPUTE_NEFFT1D_H
 
 #include "arm_compute/core/NEON/kernels/NEFFTDigitReverseKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFFTRadixStageKernel.h"
@@ -82,4 +82,4 @@ protected:
     bool                               _run_scale;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEFFT1D_H__ */
+#endif /*ARM_COMPUTE_NEFFT1D_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFFT2D.h b/arm_compute/runtime/NEON/functions/NEFFT2D.h
index 9911cea290..e25ebb9e80 100644
--- a/arm_compute/runtime/NEON/functions/NEFFT2D.h
+++ b/arm_compute/runtime/NEON/functions/NEFFT2D.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFFT2D_H__
-#define __ARM_COMPUTE_NEFFT2D_H__
+#ifndef ARM_COMPUTE_NEFFT2D_H
+#define ARM_COMPUTE_NEFFT2D_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -73,4 +73,4 @@ protected:
     Tensor      _first_pass_tensor;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEFFT2D_H__ */
+#endif /*ARM_COMPUTE_NEFFT2D_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
index 32c6eaa569..23df459e04 100644
--- a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -151,4 +151,4 @@ private:
     bool           _is_prepared;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEFFTCONVOLUTIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFastCorners.h b/arm_compute/runtime/NEON/functions/NEFastCorners.h
index 5ecf0c2b19..e2decb177b 100644
--- a/arm_compute/runtime/NEON/functions/NEFastCorners.h
+++ b/arm_compute/runtime/NEON/functions/NEFastCorners.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFASTCORNERS_H__
-#define __ARM_COMPUTE_NEFASTCORNERS_H__
+#ifndef ARM_COMPUTE_NEFASTCORNERS_H
+#define ARM_COMPUTE_NEFASTCORNERS_H
 
 #include "arm_compute/core/NEON/kernels/NEFastCornersKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillArrayKernel.h"
@@ -81,4 +81,4 @@ private:
     bool                            _non_max;
 };
 }
-#endif /*__ARM_COMPUTE_NEFASTCORNERS_H__ */
+#endif /*ARM_COMPUTE_NEFASTCORNERS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFillBorder.h b/arm_compute/runtime/NEON/functions/NEFillBorder.h
index 27a9eea9af..b8266d9d67 100644
--- a/arm_compute/runtime/NEON/functions/NEFillBorder.h
+++ b/arm_compute/runtime/NEON/functions/NEFillBorder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFILLBORDER_H__
-#define __ARM_COMPUTE_NEFILLBORDER_H__
+#ifndef ARM_COMPUTE_NEFILLBORDER_H
+#define ARM_COMPUTE_NEFILLBORDER_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/PixelValue.h"
@@ -55,4 +55,4 @@ private:
     NEFillBorderKernel _border_handler; /**< Kernel to handle image borders */
 };
 }
-#endif /*__ARM_COMPUTE_NEFILLBORDER_H__ */
+#endif /*ARM_COMPUTE_NEFILLBORDER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFlattenLayer.h b/arm_compute/runtime/NEON/functions/NEFlattenLayer.h
index 3365b3570b..db73f52f4a 100644
--- a/arm_compute/runtime/NEON/functions/NEFlattenLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEFlattenLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFLATTENLAYER_H__
-#define __ARM_COMPUTE_NEFLATTENLAYER_H__
+#ifndef ARM_COMPUTE_NEFLATTENLAYER_H
+#define ARM_COMPUTE_NEFLATTENLAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -56,4 +56,4 @@ public:
 };
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_NEFLATTENLAYER_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_NEFLATTENLAYER_H */
\ No newline at end of file
diff --git a/arm_compute/runtime/NEON/functions/NEFloor.h b/arm_compute/runtime/NEON/functions/NEFloor.h
index 630a7fcd0a..a11907ba6c 100644
--- a/arm_compute/runtime/NEON/functions/NEFloor.h
+++ b/arm_compute/runtime/NEON/functions/NEFloor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFLOOR_H__
-#define __ARM_COMPUTE_NEFLOOR_H__
+#ifndef ARM_COMPUTE_NEFLOOR_H
+#define ARM_COMPUTE_NEFLOOR_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -52,4 +52,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEFLOOR_H__ */
+#endif /* ARM_COMPUTE_NEFLOOR_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
index b80e0e49e0..5eabdcdb6b 100644
--- a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H__
-#define __ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H__
+#ifndef ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H
+#define ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -192,4 +192,4 @@ private:
     bool                                                                _is_prepared;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H__ */
+#endif /* ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEFuseBatchNormalization.h b/arm_compute/runtime/NEON/functions/NEFuseBatchNormalization.h
index 3a2f6ccb6d..b3b41c5445 100644
--- a/arm_compute/runtime/NEON/functions/NEFuseBatchNormalization.h
+++ b/arm_compute/runtime/NEON/functions/NEFuseBatchNormalization.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H__
-#define __ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H__
+#ifndef ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H
+#define ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H
 
 #include "arm_compute/core/ITensor.h"
 #include "arm_compute/core/NEON/kernels/NEFuseBatchNormalizationKernel.h"
@@ -97,4 +97,4 @@ private:
     NEFuseBatchNormalizationKernel _fuse_bn_kernel;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H__ */
+#endif /*ARM_COMPUTE_NEFUSEBATCHNORMALIZATION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMM.h b/arm_compute/runtime/NEON/functions/NEGEMM.h
index e4d69eb93d..f08bd9fac5 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMM.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMM.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMM_H__
-#define __ARM_COMPUTE_NEGEMM_H__
+#ifndef ARM_COMPUTE_NEGEMM_H
+#define ARM_COMPUTE_NEGEMM_H
 
 #include "arm_compute/core/NEON/kernels/NEArithmeticAdditionKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
@@ -128,4 +128,4 @@ private:
     bool           _is_prepared;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMM_H__ */
+#endif /*ARM_COMPUTE_NEGEMM_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h b/arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h
index 20d189e76b..ae0ae440d8 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H__
-#define __ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H__
+#ifndef ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H
+#define ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H
 
 #include "arm_compute/core/NEON/kernels/assembly/NEGEMMAssemblyWrapperKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -103,4 +103,4 @@ public:
     void run() override;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H__ */
+#endif /* ARM_COMPUTE_NEGEMMASSEMBLYDISPATCH_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
index c513afa790..665d4f1bae 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMCONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NEGEMMCONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NEGEMMCONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NEGEMMCONVOLUTIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -266,4 +266,4 @@ private:
     bool _is_prepared;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NECONVOLUTIONGEMMLAYER_H__ */
+#endif /* ARM_COMPUTE_NECONVOLUTIONGEMMLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h b/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h
index ec56d752b5..10d9c378ae 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H__
-#define __ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H__
+#ifndef ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H
+#define ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -46,4 +46,4 @@ public:
     void configure(const ITensor *input, ITensor *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H__ */
+#endif /*ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h b/arm_compute/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h
index dd23f1ce22..a8ce1e511b 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H__
-#define __ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H__
+#ifndef ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H
+#define ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H
 
 #include "arm_compute/core/NEON/INEKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -66,4 +66,4 @@ private:
     Tensor                     _tmp_b;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H__ */
+#endif /*ARM_COMPUTE_NEGEMMLOWPASSEMBLYMATRIXMULTIPLYCORE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h b/arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h
index aa2c23c97c..508159eb77 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H__
-#define __ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H__
+#ifndef ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H
+#define ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H
 
 #include "NEActivationLayer.h"
 #include "arm_compute/core/NEON/INEKernel.h"
@@ -142,4 +142,4 @@ private:
     bool _flip_signedness;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H__ */
+#endif /*ARM_COMPUTE_NEGEMMLOWPMATRIXMULTIPLYCORE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h b/arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h
index 1a65f3b6ce..b483d03c85 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H__
-#define __ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H__
+#ifndef ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H
+#define ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -265,4 +265,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *bias, const ITensorInfo *output, int min = 0, int max = 0);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H__ */
+#endif /*ARM_COMPUTE_NEGEMMLOWPOUTPUTSTAGE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h b/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h
index f5ba08bdd1..8b66eb23b9 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H__
-#define __ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H__
+#ifndef ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H
+#define ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -54,4 +54,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H__ */
+#endif /*ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGather.h b/arm_compute/runtime/NEON/functions/NEGather.h
index f6de961d2a..6b6072cd53 100644
--- a/arm_compute/runtime/NEON/functions/NEGather.h
+++ b/arm_compute/runtime/NEON/functions/NEGather.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_NEGATHER_H__
-#define __ARM_COMPUTE_NEGATHER_H__
+#ifndef ARM_COMPUTE_NEGATHER_H
+#define ARM_COMPUTE_NEGATHER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_NEGATHER_H__ */
+#endif /* ARM_COMPUTE_NEGATHER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGaussian3x3.h b/arm_compute/runtime/NEON/functions/NEGaussian3x3.h
index a237e6f0e5..45736664ea 100644
--- a/arm_compute/runtime/NEON/functions/NEGaussian3x3.h
+++ b/arm_compute/runtime/NEON/functions/NEGaussian3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGAUSSIAN3x3_H__
-#define __ARM_COMPUTE_NEGAUSSIAN3x3_H__
+#ifndef ARM_COMPUTE_NEGAUSSIAN3x3_H
+#define ARM_COMPUTE_NEGAUSSIAN3x3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -52,4 +52,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEGAUSSIAN3x3_H__ */
+#endif /*ARM_COMPUTE_NEGAUSSIAN3x3_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGaussian5x5.h b/arm_compute/runtime/NEON/functions/NEGaussian5x5.h
index 2aae3cb513..847530169a 100644
--- a/arm_compute/runtime/NEON/functions/NEGaussian5x5.h
+++ b/arm_compute/runtime/NEON/functions/NEGaussian5x5.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGAUSSIAN5x5_H__
-#define __ARM_COMPUTE_NEGAUSSIAN5x5_H__
+#ifndef ARM_COMPUTE_NEGAUSSIAN5x5_H
+#define ARM_COMPUTE_NEGAUSSIAN5x5_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NEGaussian5x5Kernel.h"
@@ -72,4 +72,4 @@ protected:
     NEFillBorderKernel      _border_handler; /**< kernel to handle tensor borders */
 };
 }
-#endif /*__ARM_COMPUTE_NEGAUSSIAN5x5_H__ */
+#endif /*ARM_COMPUTE_NEGAUSSIAN5x5_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
index f675d7299d..a6b21278ba 100644
--- a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
+++ b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGAUSSIANPYRAMID_H__
-#define __ARM_COMPUTE_NEGAUSSIANPYRAMID_H__
+#ifndef ARM_COMPUTE_NEGAUSSIANPYRAMID_H
+#define ARM_COMPUTE_NEGAUSSIANPYRAMID_H
 
 #include "arm_compute/core/IPyramid.h"
 #include "arm_compute/core/NEON/kernels/NEGaussianPyramidKernel.h"
@@ -119,4 +119,4 @@ private:
     std::vector<NEScale>       _scale_nearest;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEGAUSSIANPYRAMID_H__ */
+#endif /*ARM_COMPUTE_NEGAUSSIANPYRAMID_H */
diff --git a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h
index cd370a03dd..0e236891d1 100644
--- a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H__
-#define __ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H__
+#ifndef ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H
+#define ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H
 #include "arm_compute/core/NEON/kernels/NEBoundingBoxTransformKernel.h"
 #include "arm_compute/core/NEON/kernels/NEDequantizationLayerKernel.h"
 #include "arm_compute/core/NEON/kernels/NEGenerateProposalsLayerKernel.h"
@@ -154,4 +154,4 @@ private:
     ITensor *_scores_out;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H__ */
+#endif /* ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHOGDescriptor.h b/arm_compute/runtime/NEON/functions/NEHOGDescriptor.h
index 30989568e1..f0f46ce3ee 100644
--- a/arm_compute/runtime/NEON/functions/NEHOGDescriptor.h
+++ b/arm_compute/runtime/NEON/functions/NEHOGDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHOGDESCRIPTOR_H__
-#define __ARM_COMPUTE_NEHOGDESCRIPTOR_H__
+#ifndef ARM_COMPUTE_NEHOGDESCRIPTOR_H
+#define ARM_COMPUTE_NEHOGDESCRIPTOR_H
 
 #include "arm_compute/core/NEON/kernels/NEHOGDescriptorKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -73,4 +73,4 @@ private:
 };
 }
 
-#endif /* __ARM_COMPUTE_NEHOGDESCRIPTOR_H__ */
+#endif /* ARM_COMPUTE_NEHOGDESCRIPTOR_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHOGDetector.h b/arm_compute/runtime/NEON/functions/NEHOGDetector.h
index f41e49b1ab..c0bd3da468 100644
--- a/arm_compute/runtime/NEON/functions/NEHOGDetector.h
+++ b/arm_compute/runtime/NEON/functions/NEHOGDetector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHOGDETECTOR_H__
-#define __ARM_COMPUTE_NEHOGDETECTOR_H__
+#ifndef ARM_COMPUTE_NEHOGDETECTOR_H
+#define ARM_COMPUTE_NEHOGDETECTOR_H
 
 #include "arm_compute/core/IHOG.h"
 #include "arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h"
@@ -54,4 +54,4 @@ public:
 };
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_NEHOGDETECTOR_H__ */
+#endif /* ARM_COMPUTE_NEHOGDETECTOR_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHOGGradient.h b/arm_compute/runtime/NEON/functions/NEHOGGradient.h
index 7e268411e1..f8c3827049 100644
--- a/arm_compute/runtime/NEON/functions/NEHOGGradient.h
+++ b/arm_compute/runtime/NEON/functions/NEHOGGradient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHOGGRADIENT_H__
-#define __ARM_COMPUTE_NEHOGGRADIENT_H__
+#ifndef ARM_COMPUTE_NEHOGGRADIENT_H
+#define ARM_COMPUTE_NEHOGGRADIENT_H
 
 #include "arm_compute/core/NEON/INEKernel.h"
 #include "arm_compute/core/Types.h"
@@ -72,4 +72,4 @@ private:
     Tensor                     _gy;
 };
 }
-#endif /*__ARM_COMPUTE_NEHOGGRADIENT_H__ */
+#endif /*ARM_COMPUTE_NEHOGGRADIENT_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
index a1907fc762..3840b9c0ad 100644
--- a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
+++ b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHOGMULTIDETECTION_H__
-#define __ARM_COMPUTE_NEHOGMULTIDETECTION_H__
+#ifndef ARM_COMPUTE_NEHOGMULTIDETECTION_H
+#define ARM_COMPUTE_NEHOGMULTIDETECTION_H
 
 #include "arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h"
 #include "arm_compute/core/IArray.h"
@@ -106,4 +106,4 @@ private:
     size_t                                       _num_hog_detect_kernel;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEHOGMULTIDETECTION_H__ */
+#endif /* ARM_COMPUTE_NEHOGMULTIDETECTION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHarrisCorners.h b/arm_compute/runtime/NEON/functions/NEHarrisCorners.h
index 03ab1d0c23..caf887d492 100644
--- a/arm_compute/runtime/NEON/functions/NEHarrisCorners.h
+++ b/arm_compute/runtime/NEON/functions/NEHarrisCorners.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHARRISCORNERS_H__
-#define __ARM_COMPUTE_NEHARRISCORNERS_H__
+#ifndef ARM_COMPUTE_NEHARRISCORNERS_H
+#define ARM_COMPUTE_NEHARRISCORNERS_H
 
 #include "arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h"
 #include "arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h"
@@ -104,4 +104,4 @@ private:
     int32_t                               _num_corner_candidates; /**< Number of potential corner candidates */
 };
 }
-#endif /*__ARM_COMPUTE_NEHARRISCORNERS_H__ */
+#endif /*ARM_COMPUTE_NEHARRISCORNERS_H */
diff --git a/arm_compute/runtime/NEON/functions/NEHistogram.h b/arm_compute/runtime/NEON/functions/NEHistogram.h
index dbed4a0653..e1a5e42de9 100644
--- a/arm_compute/runtime/NEON/functions/NEHistogram.h
+++ b/arm_compute/runtime/NEON/functions/NEHistogram.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEHISTOGRAM_H__
-#define __ARM_COMPUTE_NEHISTOGRAM_H__
+#ifndef ARM_COMPUTE_NEHISTOGRAM_H
+#define ARM_COMPUTE_NEHISTOGRAM_H
 
 #include "arm_compute/core/NEON/kernels/NEHistogramKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -60,4 +60,4 @@ private:
     static constexpr unsigned int window_lut_default_size = 256;
 };
 }
-#endif /*__ARM_COMPUTE_NEHISTOGRAM_H__ */
+#endif /*ARM_COMPUTE_NEHISTOGRAM_H */
diff --git a/arm_compute/runtime/NEON/functions/NEIm2Col.h b/arm_compute/runtime/NEON/functions/NEIm2Col.h
index e281dce0b1..475e1d6160 100644
--- a/arm_compute/runtime/NEON/functions/NEIm2Col.h
+++ b/arm_compute/runtime/NEON/functions/NEIm2Col.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEIM2COL_H__
-#define __ARM_COMPUTE_NEIM2COL_H__
+#ifndef ARM_COMPUTE_NEIM2COL_H
+#define ARM_COMPUTE_NEIM2COL_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -79,4 +79,4 @@ private:
     unsigned int   _y_dim;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEIM2COL_H__ */
+#endif /* ARM_COMPUTE_NEIM2COL_H */
diff --git a/arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h b/arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h
index 8e2ee37635..e128ec5835 100644
--- a/arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H__
-#define __ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H
+#define ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEInstanceNormalizationLayerKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -84,4 +84,4 @@ private:
     Tensor                             _permuted_output;
 };
 }
-#endif /* __ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEINSTANCENORMALIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEIntegralImage.h b/arm_compute/runtime/NEON/functions/NEIntegralImage.h
index 1ac501c994..2d7669d3ef 100644
--- a/arm_compute/runtime/NEON/functions/NEIntegralImage.h
+++ b/arm_compute/runtime/NEON/functions/NEIntegralImage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEINTEGRALIMAGE_H__
-#define __ARM_COMPUTE_NEINTEGRALIMAGE_H__
+#ifndef ARM_COMPUTE_NEINTEGRALIMAGE_H
+#define ARM_COMPUTE_NEINTEGRALIMAGE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
 
@@ -42,4 +42,4 @@ public:
     void configure(const ITensor *input, ITensor *output);
 };
 }
-#endif /*__ARM_COMPUTE_NEINTEGRALIMAGE_H__ */
+#endif /*ARM_COMPUTE_NEINTEGRALIMAGE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h b/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h
index e778f96e22..a581600dbb 100644
--- a/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEL2NORMALIZELAYER_H__
-#define __ARM_COMPUTE_NEL2NORMALIZELAYER_H__
+#ifndef ARM_COMPUTE_NEL2NORMALIZELAYER_H
+#define ARM_COMPUTE_NEL2NORMALIZELAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -78,4 +78,4 @@ private:
     Tensor                   _sumsq;
 };
 }
-#endif /* __ARM_COMPUTE_NEL2NORMALIZELAYER_H__ */
+#endif /* ARM_COMPUTE_NEL2NORMALIZELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NELSTMLayer.h b/arm_compute/runtime/NEON/functions/NELSTMLayer.h
index 183745c185..ae13d0c36f 100644
--- a/arm_compute/runtime/NEON/functions/NELSTMLayer.h
+++ b/arm_compute/runtime/NEON/functions/NELSTMLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NELSTMLAYER_H__
-#define __ARM_COMPUTE_NELSTMLAYER_H__
+#ifndef ARM_COMPUTE_NELSTMLAYER_H
+#define ARM_COMPUTE_NELSTMLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEActivationLayerKernel.h"
 #include "arm_compute/core/NEON/kernels/NEArithmeticAdditionKernel.h"
@@ -229,4 +229,4 @@ private:
     bool                            _is_layer_norm_lstm;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NELSTMLAYER_H__ */
+#endif /* ARM_COMPUTE_NELSTMLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
index 7f02988c19..2f3b8fd336 100644
--- a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
+++ b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NELSTMLAYERQUANTIZED_H__
-#define __ARM_COMPUTE_NELSTMLAYERQUANTIZED_H__
+#ifndef ARM_COMPUTE_NELSTMLAYERQUANTIZED_H
+#define ARM_COMPUTE_NELSTMLAYERQUANTIZED_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h"
@@ -202,4 +202,4 @@ private:
     bool _is_prepared;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NELSTMLAYERQUANTIZED_H__ */
+#endif /* ARM_COMPUTE_NELSTMLAYERQUANTIZED_H */
diff --git a/arm_compute/runtime/NEON/functions/NELaplacianPyramid.h b/arm_compute/runtime/NEON/functions/NELaplacianPyramid.h
index decd91863a..5389f67bad 100644
--- a/arm_compute/runtime/NEON/functions/NELaplacianPyramid.h
+++ b/arm_compute/runtime/NEON/functions/NELaplacianPyramid.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NELAPLACIANPYRAMID_H__
-#define __ARM_COMPUTE_NELAPLACIANPYRAMID_H__
+#ifndef ARM_COMPUTE_NELAPLACIANPYRAMID_H
+#define ARM_COMPUTE_NELAPLACIANPYRAMID_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -82,4 +82,4 @@ private:
     NEDepthConvertLayer                  _depth_function;
 };
 }
-#endif /*__ARM_COMPUTE_NELAPLACIANPYRAMID_H__ */
+#endif /*ARM_COMPUTE_NELAPLACIANPYRAMID_H */
diff --git a/arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h b/arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h
index 533903a726..f939725d51 100644
--- a/arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h
+++ b/arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H__
-#define __ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H__
+#ifndef ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H
+#define ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -88,4 +88,4 @@ private:
     NEDepthConvertLayer               _depthf;
 };
 }
-#endif /*__ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H__ */
+#endif /*ARM_COMPUTE_NELAPLACIANRECONSTRUCT_H */
diff --git a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
index 7d1f124bb3..b2f2b88fce 100644
--- a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
+++ b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H__
-#define __ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H__
+#ifndef ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H
+#define ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -105,4 +105,4 @@ private:
     const ITensor                         *_original_weights;
 };
 }
-#endif /* __ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H__ */
+#endif /* ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEMagnitude.h b/arm_compute/runtime/NEON/functions/NEMagnitude.h
index 9fe043b38f..168500050e 100644
--- a/arm_compute/runtime/NEON/functions/NEMagnitude.h
+++ b/arm_compute/runtime/NEON/functions/NEMagnitude.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEMAGNITUDE_H__
-#define __ARM_COMPUTE_NEMAGNITUDE_H__
+#ifndef ARM_COMPUTE_NEMAGNITUDE_H
+#define ARM_COMPUTE_NEMAGNITUDE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -44,4 +44,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output, MagnitudeType mag_type = MagnitudeType::L2NORM);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEMAGNITUDE_H__ */
+#endif /*ARM_COMPUTE_NEMAGNITUDE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEMeanStdDev.h b/arm_compute/runtime/NEON/functions/NEMeanStdDev.h
index e8bf8dfa3d..954b2228dd 100644
--- a/arm_compute/runtime/NEON/functions/NEMeanStdDev.h
+++ b/arm_compute/runtime/NEON/functions/NEMeanStdDev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEMEANSTDDEV_H__
-#define __ARM_COMPUTE_NEMEANSTDDEV_H__
+#ifndef ARM_COMPUTE_NEMEANSTDDEV_H
+#define ARM_COMPUTE_NEMEANSTDDEV_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h"
@@ -61,4 +61,4 @@ private:
     uint64_t           _global_sum_squared; /**< Variable that holds the global sum of squared values among calls in order to ease reduction */
 };
 }
-#endif /*__ARM_COMPUTE_NEMEANSTDDEV_H__ */
+#endif /*ARM_COMPUTE_NEMEANSTDDEV_H */
diff --git a/arm_compute/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.h b/arm_compute/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.h
index 1a482bbebd..3ce2b2792b 100644
--- a/arm_compute/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H__
-#define __ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H
+#define ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -56,4 +56,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output = nullptr, float epsilon = 1e-8f);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H__ */
+#endif /*ARM_COMPUTE_NEMEANSTDDEVNORMALIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEMedian3x3.h b/arm_compute/runtime/NEON/functions/NEMedian3x3.h
index a3df687a35..55064f8a8c 100644
--- a/arm_compute/runtime/NEON/functions/NEMedian3x3.h
+++ b/arm_compute/runtime/NEON/functions/NEMedian3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEMEDIAN3x3_H__
-#define __ARM_COMPUTE_NEMEDIAN3x3_H__
+#ifndef ARM_COMPUTE_NEMEDIAN3x3_H
+#define ARM_COMPUTE_NEMEDIAN3x3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -53,4 +53,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEMEDIAN3x3_H__ */
+#endif /*ARM_COMPUTE_NEMEDIAN3x3_H */
diff --git a/arm_compute/runtime/NEON/functions/NEMinMaxLocation.h b/arm_compute/runtime/NEON/functions/NEMinMaxLocation.h
index e658d22a66..89b6874320 100644
--- a/arm_compute/runtime/NEON/functions/NEMinMaxLocation.h
+++ b/arm_compute/runtime/NEON/functions/NEMinMaxLocation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEMINMAXLOCATION_H__
-#define __ARM_COMPUTE_NEMINMAXLOCATION_H__
+#ifndef ARM_COMPUTE_NEMINMAXLOCATION_H
+#define ARM_COMPUTE_NEMINMAXLOCATION_H
 
 #include "arm_compute/core/IArray.h"
 #include "arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h"
@@ -68,4 +68,4 @@ private:
     NEMinMaxLocationKernel _min_max_loc; /**< Kernel that extracts min/max locations */
 };
 }
-#endif /*__ARM_COMPUTE_NEMINMAXLOCATION_H__ */
+#endif /*ARM_COMPUTE_NEMINMAXLOCATION_H */
diff --git a/arm_compute/runtime/NEON/functions/NENonLinearFilter.h b/arm_compute/runtime/NEON/functions/NENonLinearFilter.h
index d8a9eaebfb..a758e040c6 100644
--- a/arm_compute/runtime/NEON/functions/NENonLinearFilter.h
+++ b/arm_compute/runtime/NEON/functions/NENonLinearFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NENONLINEARFILTER_H__
-#define __ARM_COMPUTE_NENONLINEARFILTER_H__
+#ifndef ARM_COMPUTE_NENONLINEARFILTER_H
+#define ARM_COMPUTE_NENONLINEARFILTER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -58,4 +58,4 @@ public:
                    uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NENONLINEARFILTER_H__ */
+#endif /*ARM_COMPUTE_NENONLINEARFILTER_H */
diff --git a/arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h b/arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h
index c87d722878..cb8b202811 100644
--- a/arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h
+++ b/arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H__
-#define __ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H__
+#ifndef ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H
+#define ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -53,4 +53,4 @@ public:
     void configure(ITensor *input, ITensor *output, BorderMode border_mode);
 };
 }
-#endif /* __ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H__ */
+#endif /* ARM_COMPUTE_NENONMAXIMASUPPRESSION3X3_H */
diff --git a/arm_compute/runtime/NEON/functions/NENormalizationLayer.h b/arm_compute/runtime/NEON/functions/NENormalizationLayer.h
index d994093e1d..af34147bfe 100644
--- a/arm_compute/runtime/NEON/functions/NENormalizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NENormalizationLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NENORMALIZATIONLAYER_H__
-#define __ARM_COMPUTE_NENORMALIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NENORMALIZATIONLAYER_H
+#define ARM_COMPUTE_NENORMALIZATIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -82,4 +82,4 @@ private:
     Tensor                          _input_squared;   /**< The intermediate buffer which stores results of squaring input */
 };
 }
-#endif /* __ARM_COMPUTE_NENORMALIZATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NENORMALIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEOpticalFlow.h b/arm_compute/runtime/NEON/functions/NEOpticalFlow.h
index 7480b085ae..95068aaee0 100644
--- a/arm_compute/runtime/NEON/functions/NEOpticalFlow.h
+++ b/arm_compute/runtime/NEON/functions/NEOpticalFlow.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEOPTICALFLOW_H__
-#define __ARM_COMPUTE_NEOPTICALFLOW_H__
+#ifndef ARM_COMPUTE_NEOPTICALFLOW_H
+#define ARM_COMPUTE_NEOPTICALFLOW_H
 
 #include "arm_compute/core/IArray.h"
 #include "arm_compute/core/NEON/kernels/NELKTrackerKernel.h"
@@ -99,4 +99,4 @@ private:
     unsigned int                   _num_levels;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEOPTICALFLOW_H__ */
+#endif /*ARM_COMPUTE_NEOPTICALFLOW_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPReluLayer.h b/arm_compute/runtime/NEON/functions/NEPReluLayer.h
index 52db4279cd..c0a1df472f 100644
--- a/arm_compute/runtime/NEON/functions/NEPReluLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEPReluLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPRELULAYER_H__
-#define __ARM_COMPUTE_NEPRELULAYER_H__
+#ifndef ARM_COMPUTE_NEPRELULAYER_H
+#define ARM_COMPUTE_NEPRELULAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -56,4 +56,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *alpha, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEPRELULAYER_H__ */
+#endif /* ARM_COMPUTE_NEPRELULAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPadLayer.h b/arm_compute/runtime/NEON/functions/NEPadLayer.h
index 5ba951a94d..a17739385c 100644
--- a/arm_compute/runtime/NEON/functions/NEPadLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEPadLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPADLAYER_H__
-#define __ARM_COMPUTE_NEPADLAYER_H__
+#ifndef ARM_COMPUTE_NEPADLAYER_H
+#define ARM_COMPUTE_NEPADLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 #include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h"
@@ -108,4 +108,4 @@ private:
     std::vector<Tensor>             _concat_results;
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEPADLAYER_H__ */
+#endif /*ARM_COMPUTE_NEPADLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPermute.h b/arm_compute/runtime/NEON/functions/NEPermute.h
index 43789e6c4a..83e492434d 100644
--- a/arm_compute/runtime/NEON/functions/NEPermute.h
+++ b/arm_compute/runtime/NEON/functions/NEPermute.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPERMUTE_H__
-#define __ARM_COMPUTE_NEPERMUTE_H__
+#ifndef ARM_COMPUTE_NEPERMUTE_H
+#define ARM_COMPUTE_NEPERMUTE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -58,4 +58,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const PermutationVector &perm);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEPERMUTE_H__ */
+#endif /* ARM_COMPUTE_NEPERMUTE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPhase.h b/arm_compute/runtime/NEON/functions/NEPhase.h
index d096cf82e0..220681e9f1 100644
--- a/arm_compute/runtime/NEON/functions/NEPhase.h
+++ b/arm_compute/runtime/NEON/functions/NEPhase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPHASE_H__
-#define __ARM_COMPUTE_NEPHASE_H__
+#ifndef ARM_COMPUTE_NEPHASE_H
+#define ARM_COMPUTE_NEPHASE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -44,4 +44,4 @@ public:
     void configure(const ITensor *input1, const ITensor *input2, ITensor *output, PhaseType phase_type = PhaseType::SIGNED);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEPHASE_H__ */
+#endif /*ARM_COMPUTE_NEPHASE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h b/arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h
index 41137c0135..f2ea77d7e0 100644
--- a/arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h
+++ b/arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H__
-#define __ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H__
+#ifndef ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H
+#define ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -91,4 +91,4 @@ public:
     static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output);
 };
 }
-#endif /*__ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H__ */
+#endif /*ARM_COMPUTE_NEPIXELWISEMULTIPLICATION_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPoolingLayer.h b/arm_compute/runtime/NEON/functions/NEPoolingLayer.h
index 26858d5cde..ae08ce636a 100644
--- a/arm_compute/runtime/NEON/functions/NEPoolingLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEPoolingLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPOOLINGLAYER_H__
-#define __ARM_COMPUTE_NEPOOLINGLAYER_H__
+#ifndef ARM_COMPUTE_NEPOOLINGLAYER_H
+#define ARM_COMPUTE_NEPOOLINGLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -75,4 +75,4 @@ private:
     DataLayout           _data_layout;
 };
 }
-#endif /* __ARM_COMPUTE_NEPOOLINGLAYER_H__ */
+#endif /* ARM_COMPUTE_NEPOOLINGLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h b/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h
index a7a2034777..242460d3a9 100644
--- a/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEPRIORBOXLAYER_H__
-#define __ARM_COMPUTE_NEPRIORBOXLAYER_H__
+#ifndef ARM_COMPUTE_NEPRIORBOXLAYER_H
+#define ARM_COMPUTE_NEPRIORBOXLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h"
 #include "arm_compute/core/Types.h"
@@ -56,4 +56,4 @@ public:
     static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const PriorBoxLayerInfo &info);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEPRIORBOXLAYER_H__ */
+#endif /* ARM_COMPUTE_NEPRIORBOXLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h
index 25609324a0..1cf83e87ad 100644
--- a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEQUANTIZATIONLAYER_H__
-#define __ARM_COMPUTE_NEQUANTIZATIONLAYER_H__
+#ifndef ARM_COMPUTE_NEQUANTIZATIONLAYER_H
+#define ARM_COMPUTE_NEQUANTIZATIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -62,4 +62,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEQUANTIZATIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEQUANTIZATIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NERNNLayer.h b/arm_compute/runtime/NEON/functions/NERNNLayer.h
index 978c445927..0bfb905e19 100644
--- a/arm_compute/runtime/NEON/functions/NERNNLayer.h
+++ b/arm_compute/runtime/NEON/functions/NERNNLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NERNNLAYER_H__
-#define __ARM_COMPUTE_NERNNLAYER_H__
+#ifndef ARM_COMPUTE_NERNNLAYER_H
+#define ARM_COMPUTE_NERNNLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEActivationLayerKernel.h"
 #include "arm_compute/core/NEON/kernels/NEArithmeticAdditionKernel.h"
@@ -94,4 +94,4 @@ private:
     bool                       _is_prepared;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NERNNLAYER_H__ */
+#endif /* ARM_COMPUTE_NERNNLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEROIAlignLayer.h b/arm_compute/runtime/NEON/functions/NEROIAlignLayer.h
index e8171d3817..7a504961d5 100644
--- a/arm_compute/runtime/NEON/functions/NEROIAlignLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEROIAlignLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEROIALIGNLAYER_H__
-#define __ARM_COMPUTE_NEROIALIGNLAYER_H__
+#ifndef ARM_COMPUTE_NEROIALIGNLAYER_H
+#define ARM_COMPUTE_NEROIALIGNLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -73,4 +73,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *rois, ITensorInfo *output, const ROIPoolingLayerInfo &pool_info);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEROIALIGNLAYER_H__ */
+#endif /* ARM_COMPUTE_NEROIALIGNLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h b/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h
index cf41552694..887b5712da 100644
--- a/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEROIPOOLINGLAYER_H__
-#define __ARM_COMPUTE_NEROIPOOLINGLAYER_H__
+#ifndef ARM_COMPUTE_NEROIPOOLINGLAYER_H
+#define ARM_COMPUTE_NEROIPOOLINGLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -66,4 +66,4 @@ private:
     NEROIPoolingLayerKernel _roi_kernel;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEROIPOOLINGLAYER_H__ */
+#endif /* ARM_COMPUTE_NEROIPOOLINGLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NERange.h b/arm_compute/runtime/NEON/functions/NERange.h
index d888c5106d..83ca625aa7 100644
--- a/arm_compute/runtime/NEON/functions/NERange.h
+++ b/arm_compute/runtime/NEON/functions/NERange.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NERANGE_H__
-#define __ARM_COMPUTE_NERANGE_H__
+#ifndef ARM_COMPUTE_NERANGE_H
+#define ARM_COMPUTE_NERANGE_H
 
 #include "arm_compute/core/NEON/kernels/NERangeKernel.h"
 #include "arm_compute/core/Types.h"
@@ -68,4 +68,4 @@ private:
     NERangeKernel _kernel;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NERANGE_H__ */
+#endif /* ARM_COMPUTE_NERANGE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEReduceMean.h b/arm_compute/runtime/NEON/functions/NEReduceMean.h
index 6fbd72b955..69804b1fd8 100644
--- a/arm_compute/runtime/NEON/functions/NEReduceMean.h
+++ b/arm_compute/runtime/NEON/functions/NEReduceMean.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEON_REDUCE_MEAN_H__
-#define __ARM_COMPUTE_NEON_REDUCE_MEAN_H__
+#ifndef ARM_COMPUTE_NEON_REDUCE_MEAN_H
+#define ARM_COMPUTE_NEON_REDUCE_MEAN_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -75,4 +75,4 @@ private:
     bool                              _keep_dims;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEON_REDUCE_MEAN_H__ */
+#endif /* ARM_COMPUTE_NEON_REDUCE_MEAN_H */
diff --git a/arm_compute/runtime/NEON/functions/NEReductionOperation.h b/arm_compute/runtime/NEON/functions/NEReductionOperation.h
index 1e72c4f74d..24142315f4 100644
--- a/arm_compute/runtime/NEON/functions/NEReductionOperation.h
+++ b/arm_compute/runtime/NEON/functions/NEReductionOperation.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEREDUCTIONOPERATION_H__
-#define __ARM_COMPUTE_NEREDUCTIONOPERATION_H__
+#ifndef ARM_COMPUTE_NEREDUCTIONOPERATION_H
+#define ARM_COMPUTE_NEREDUCTIONOPERATION_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -83,4 +83,4 @@ private:
     bool                       _is_reshape_required;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEREDUCTIONOPERATION_H__ */
+#endif /* ARM_COMPUTE_NEREDUCTIONOPERATION_H */
diff --git a/arm_compute/runtime/NEON/functions/NERemap.h b/arm_compute/runtime/NEON/functions/NERemap.h
index b1ec559817..05a7a8ffd6 100644
--- a/arm_compute/runtime/NEON/functions/NERemap.h
+++ b/arm_compute/runtime/NEON/functions/NERemap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEREMAP_H__
-#define __ARM_COMPUTE_NEREMAP_H__
+#ifndef ARM_COMPUTE_NEREMAP_H
+#define ARM_COMPUTE_NEREMAP_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -57,4 +57,4 @@ public:
                    InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEREMAP_H__ */
+#endif /*ARM_COMPUTE_NEREMAP_H */
diff --git a/arm_compute/runtime/NEON/functions/NEReorgLayer.h b/arm_compute/runtime/NEON/functions/NEReorgLayer.h
index 716f164cc7..5f28821a6c 100644
--- a/arm_compute/runtime/NEON/functions/NEReorgLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEReorgLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEREORGLAYER_H__
-#define __ARM_COMPUTE_NEREORGLAYER_H__
+#ifndef ARM_COMPUTE_NEREORGLAYER_H
+#define ARM_COMPUTE_NEREORGLAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -57,4 +57,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, int32_t stride);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NEREORGLAYER_H__ */
+#endif /*ARM_COMPUTE_NEREORGLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEReshapeLayer.h b/arm_compute/runtime/NEON/functions/NEReshapeLayer.h
index 8896b4f5c6..c57387a0cd 100644
--- a/arm_compute/runtime/NEON/functions/NEReshapeLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEReshapeLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NERESHAPELAYER_H__
-#define __ARM_COMPUTE_NERESHAPELAYER_H__
+#ifndef ARM_COMPUTE_NERESHAPELAYER_H
+#define ARM_COMPUTE_NERESHAPELAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -52,4 +52,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NERESHAPELAYER_H__ */
+#endif /*ARM_COMPUTE_NERESHAPELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEReverse.h b/arm_compute/runtime/NEON/functions/NEReverse.h
index cf0fdc14bf..6414cbd4d1 100644
--- a/arm_compute/runtime/NEON/functions/NEReverse.h
+++ b/arm_compute/runtime/NEON/functions/NEReverse.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEREVERSE_H__
-#define __ARM_COMPUTE_NEREVERSE_H__
+#ifndef ARM_COMPUTE_NEREVERSE_H
+#define ARM_COMPUTE_NEREVERSE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -54,4 +54,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const ITensorInfo *axis);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEREVERSE_H__ */
+#endif /* ARM_COMPUTE_NEREVERSE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEScale.h b/arm_compute/runtime/NEON/functions/NEScale.h
index d7dfbbfc9f..69698a47a9 100644
--- a/arm_compute/runtime/NEON/functions/NEScale.h
+++ b/arm_compute/runtime/NEON/functions/NEScale.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESCALEIMAGE_H__
-#define __ARM_COMPUTE_NESCALEIMAGE_H__
+#ifndef ARM_COMPUTE_NESCALEIMAGE_H
+#define ARM_COMPUTE_NESCALEIMAGE_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NEScaleKernel.h"
@@ -84,4 +84,4 @@ private:
     bool               _use_padding;    /**< Is padding used on the tensors */
 };
 }
-#endif /*__ARM_COMPUTE_NESCALEIMAGE_H__ */
+#endif /*ARM_COMPUTE_NESCALEIMAGE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEScharr3x3.h b/arm_compute/runtime/NEON/functions/NEScharr3x3.h
index db24723902..6091121e03 100644
--- a/arm_compute/runtime/NEON/functions/NEScharr3x3.h
+++ b/arm_compute/runtime/NEON/functions/NEScharr3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESCHARR3x3_H__
-#define __ARM_COMPUTE_NESCHARR3x3_H__
+#ifndef ARM_COMPUTE_NESCHARR3x3_H
+#define ARM_COMPUTE_NESCHARR3x3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -56,4 +56,4 @@ public:
     void configure(ITensor *input, ITensor *output_x, ITensor *output_y, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NESCHARR3x3_H__ */
+#endif /*ARM_COMPUTE_NESCHARR3x3_H */
diff --git a/arm_compute/runtime/NEON/functions/NESelect.h b/arm_compute/runtime/NEON/functions/NESelect.h
index 1529cd6963..049267a692 100644
--- a/arm_compute/runtime/NEON/functions/NESelect.h
+++ b/arm_compute/runtime/NEON/functions/NESelect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESELECT_H__
-#define __ARM_COMPUTE_NESELECT_H__
+#ifndef ARM_COMPUTE_NESELECT_H
+#define ARM_COMPUTE_NESELECT_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -56,4 +56,4 @@ public:
     static Status validate(const ITensorInfo *c, const ITensorInfo *x, const ITensorInfo *y, const ITensorInfo *output);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESELECT_H__ */
+#endif /* ARM_COMPUTE_NESELECT_H */
diff --git a/arm_compute/runtime/NEON/functions/NESimpleAssemblyFunction.h b/arm_compute/runtime/NEON/functions/NESimpleAssemblyFunction.h
index 5a76c15627..a162b6513b 100644
--- a/arm_compute/runtime/NEON/functions/NESimpleAssemblyFunction.h
+++ b/arm_compute/runtime/NEON/functions/NESimpleAssemblyFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H__
-#define __ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H__
+#ifndef ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H
+#define ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H
 
 #include "arm_compute/core/NEON/kernels/assembly/INEGEMMWrapperKernel.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -53,4 +53,4 @@ protected:
     std::unique_ptr<INEGEMMWrapperKernel> _kernel; /**< Kernel to run */
 };
 } //namespace arm_compute
-#endif /*__ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H__ */
+#endif /*ARM_COMPUTE_NESIMPLEASSEMBLYFUNCTION_H */
diff --git a/arm_compute/runtime/NEON/functions/NESlice.h b/arm_compute/runtime/NEON/functions/NESlice.h
index cc95584048..179c64a420 100644
--- a/arm_compute/runtime/NEON/functions/NESlice.h
+++ b/arm_compute/runtime/NEON/functions/NESlice.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NE_SLICE_H__
-#define __ARM_COMPUTE_NE_SLICE_H__
+#ifndef ARM_COMPUTE_NE_SLICE_H
+#define ARM_COMPUTE_NE_SLICE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -66,4 +66,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Coordinates &starts, const Coordinates &ends);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NE_SLICE_H__ */
+#endif /* ARM_COMPUTE_NE_SLICE_H */
diff --git a/arm_compute/runtime/NEON/functions/NESobel3x3.h b/arm_compute/runtime/NEON/functions/NESobel3x3.h
index e2896ba058..0cd633ec3a 100644
--- a/arm_compute/runtime/NEON/functions/NESobel3x3.h
+++ b/arm_compute/runtime/NEON/functions/NESobel3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESOBEL3x3_H__
-#define __ARM_COMPUTE_NESOBEL3x3_H__
+#ifndef ARM_COMPUTE_NESOBEL3x3_H
+#define ARM_COMPUTE_NESOBEL3x3_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -56,4 +56,4 @@ public:
     void configure(ITensor *input, ITensor *output_x, ITensor *output_y, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NESOBEL3x3_H__ */
+#endif /*ARM_COMPUTE_NESOBEL3x3_H */
diff --git a/arm_compute/runtime/NEON/functions/NESobel5x5.h b/arm_compute/runtime/NEON/functions/NESobel5x5.h
index 2b7cb70f15..af52292359 100644
--- a/arm_compute/runtime/NEON/functions/NESobel5x5.h
+++ b/arm_compute/runtime/NEON/functions/NESobel5x5.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESOBEL5x5_H__
-#define __ARM_COMPUTE_NESOBEL5x5_H__
+#ifndef ARM_COMPUTE_NESOBEL5x5_H
+#define ARM_COMPUTE_NESOBEL5x5_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NESobel5x5Kernel.h"
@@ -76,4 +76,4 @@ protected:
     NEFillBorderKernel   _border_handler; /**< Kernel to handle tensor borders */
 };
 }
-#endif /*__ARM_COMPUTE_NESOBEL5x5_H__ */
+#endif /*ARM_COMPUTE_NESOBEL5x5_H */
diff --git a/arm_compute/runtime/NEON/functions/NESobel7x7.h b/arm_compute/runtime/NEON/functions/NESobel7x7.h
index 5f7bab7cfd..e9098880f5 100644
--- a/arm_compute/runtime/NEON/functions/NESobel7x7.h
+++ b/arm_compute/runtime/NEON/functions/NESobel7x7.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESOBEL7x7_H__
-#define __ARM_COMPUTE_NESOBEL7x7_H__
+#ifndef ARM_COMPUTE_NESOBEL7x7_H
+#define ARM_COMPUTE_NESOBEL7x7_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NESobel7x7Kernel.h"
@@ -76,4 +76,4 @@ protected:
     NEFillBorderKernel   _border_handler; /**< Kernel to handle tensor borders */
 };
 }
-#endif /*__ARM_COMPUTE_NESOBEL7x7_H__ */
+#endif /*ARM_COMPUTE_NESOBEL7x7_H */
diff --git a/arm_compute/runtime/NEON/functions/NESoftmaxLayer.h b/arm_compute/runtime/NEON/functions/NESoftmaxLayer.h
index 9cc7088ae2..f89add71ee 100644
--- a/arm_compute/runtime/NEON/functions/NESoftmaxLayer.h
+++ b/arm_compute/runtime/NEON/functions/NESoftmaxLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESOFTMAXLAYER_H__
-#define __ARM_COMPUTE_NESOFTMAXLAYER_H__
+#ifndef ARM_COMPUTE_NESOFTMAXLAYER_H
+#define ARM_COMPUTE_NESOFTMAXLAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFlattenLayerKernel.h"
@@ -124,4 +124,4 @@ using NESoftmaxLayer    = NESoftmaxLayerGeneric<false>;
 using NELogSoftmaxLayer = NESoftmaxLayerGeneric<true>;
 
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESOFTMAXLAYER_H__ */
+#endif /* ARM_COMPUTE_NESOFTMAXLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h b/arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h
index 5b7d793118..c433f183a0 100644
--- a/arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h
+++ b/arm_compute/runtime/NEON/functions/NESpaceToBatchLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESPACETOBATCHLAYER_H__
-#define __ARM_COMPUTE_NESPACETOBATCHLAYER_H__
+#ifndef ARM_COMPUTE_NESPACETOBATCHLAYER_H
+#define ARM_COMPUTE_NESPACETOBATCHLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -104,4 +104,4 @@ private:
     bool                      _has_padding;           /**< Flag to check if the output has padding */
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESPACETOBATCHLAYER_H__ */
+#endif /* ARM_COMPUTE_NESPACETOBATCHLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h b/arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h
index abcfed44b8..ac93b48c0c 100644
--- a/arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h
+++ b/arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESPACETODEPTHLAYER_H__
-#define __ARM_COMPUTE_NESPACETODEPTHLAYER_H__
+#ifndef ARM_COMPUTE_NESPACETODEPTHLAYER_H
+#define ARM_COMPUTE_NESPACETODEPTHLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -77,4 +77,4 @@ private:
     NESpaceToDepthLayerKernel _space_to_depth_kernel; /**< SpaceToDepth kernel to run */
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESPACETODEPTHLAYER_H__ */
+#endif /* ARM_COMPUTE_NESPACETODEPTHLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NESplit.h b/arm_compute/runtime/NEON/functions/NESplit.h
index 06686a6665..26ff4059f1 100644
--- a/arm_compute/runtime/NEON/functions/NESplit.h
+++ b/arm_compute/runtime/NEON/functions/NESplit.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESPLIT_H__
-#define __ARM_COMPUTE_NESPLIT_H__
+#ifndef ARM_COMPUTE_NESPLIT_H
+#define ARM_COMPUTE_NESPLIT_H
 
 #include "arm_compute/core/Types.h"
 
@@ -73,4 +73,4 @@ private:
     unsigned int           _num_outputs;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESPLIT_H__ */
+#endif /* ARM_COMPUTE_NESPLIT_H */
diff --git a/arm_compute/runtime/NEON/functions/NEStackLayer.h b/arm_compute/runtime/NEON/functions/NEStackLayer.h
index ba262371cd..e83995619d 100644
--- a/arm_compute/runtime/NEON/functions/NEStackLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEStackLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NESTACKLAYER_H__
-#define __ARM_COMPUTE_NESTACKLAYER_H__
+#ifndef ARM_COMPUTE_NESTACKLAYER_H
+#define ARM_COMPUTE_NESTACKLAYER_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -78,4 +78,4 @@ private:
     unsigned int                    _num_inputs;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NESTACKLAYER_H__ */
+#endif /* ARM_COMPUTE_NESTACKLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEStridedSlice.h b/arm_compute/runtime/NEON/functions/NEStridedSlice.h
index 209c1ab812..d8c3918385 100644
--- a/arm_compute/runtime/NEON/functions/NEStridedSlice.h
+++ b/arm_compute/runtime/NEON/functions/NEStridedSlice.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NE_STRIDED_SLICE_H__
-#define __ARM_COMPUTE_NE_STRIDED_SLICE_H__
+#ifndef ARM_COMPUTE_NE_STRIDED_SLICE_H
+#define ARM_COMPUTE_NE_STRIDED_SLICE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
 
@@ -72,4 +72,4 @@ public:
                            int32_t begin_mask = 0, int32_t end_mask = 0, int32_t shrink_axis_mask = 0);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NE_STRIDED_SLICE_H__ */
+#endif /* ARM_COMPUTE_NE_STRIDED_SLICE_H */
diff --git a/arm_compute/runtime/NEON/functions/NETableLookup.h b/arm_compute/runtime/NEON/functions/NETableLookup.h
index 2a49aee3e7..b0685afd5b 100644
--- a/arm_compute/runtime/NEON/functions/NETableLookup.h
+++ b/arm_compute/runtime/NEON/functions/NETableLookup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NETABLELOOKUP_H__
-#define __ARM_COMPUTE_NETABLELOOKUP_H__
+#ifndef ARM_COMPUTE_NETABLELOOKUP_H
+#define ARM_COMPUTE_NETABLELOOKUP_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -44,4 +44,4 @@ public:
     void configure(const ITensor *input, const ILut *lut, ITensor *output);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NETABLELOOKUP_H__ */
+#endif /*ARM_COMPUTE_NETABLELOOKUP_H */
diff --git a/arm_compute/runtime/NEON/functions/NEThreshold.h b/arm_compute/runtime/NEON/functions/NEThreshold.h
index 69a437b68c..c955283e9e 100644
--- a/arm_compute/runtime/NEON/functions/NEThreshold.h
+++ b/arm_compute/runtime/NEON/functions/NEThreshold.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NETHRESHOLD_H__
-#define __ARM_COMPUTE_NETHRESHOLD_H__
+#ifndef ARM_COMPUTE_NETHRESHOLD_H
+#define ARM_COMPUTE_NETHRESHOLD_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -51,4 +51,4 @@ public:
                    ThresholdType type = ThresholdType::BINARY, uint8_t upper = 0);
 };
 } // namespace arm_compute
-#endif /*__ARM_COMPUTE_NETHRESHOLD_H__ */
+#endif /*ARM_COMPUTE_NETHRESHOLD_H */
diff --git a/arm_compute/runtime/NEON/functions/NETile.h b/arm_compute/runtime/NEON/functions/NETile.h
index f637d17aee..c7a08961a4 100644
--- a/arm_compute/runtime/NEON/functions/NETile.h
+++ b/arm_compute/runtime/NEON/functions/NETile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NETILE_H__
-#define __ARM_COMPUTE_NETILE_H__
+#ifndef ARM_COMPUTE_NETILE_H
+#define ARM_COMPUTE_NETILE_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -54,4 +54,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Multiples &multiples);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NETILE_H__ */
+#endif /* ARM_COMPUTE_NETILE_H */
diff --git a/arm_compute/runtime/NEON/functions/NETranspose.h b/arm_compute/runtime/NEON/functions/NETranspose.h
index 08ee3a6d8d..6148a67203 100644
--- a/arm_compute/runtime/NEON/functions/NETranspose.h
+++ b/arm_compute/runtime/NEON/functions/NETranspose.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NETRANSPOSE_H__
-#define __ARM_COMPUTE_NETRANSPOSE_H__
+#ifndef ARM_COMPUTE_NETRANSPOSE_H
+#define ARM_COMPUTE_NETRANSPOSE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
@@ -56,4 +56,4 @@ public:
 };
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_NETRANSPOSE_H__ */
+#endif /* ARM_COMPUTE_NETRANSPOSE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEUnstack.h b/arm_compute/runtime/NEON/functions/NEUnstack.h
index 4fd4a35039..dbb04f08e5 100644
--- a/arm_compute/runtime/NEON/functions/NEUnstack.h
+++ b/arm_compute/runtime/NEON/functions/NEUnstack.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEUNSTACK_H__
-#define __ARM_COMPUTE_NEUNSTACK_H__
+#ifndef ARM_COMPUTE_NEUNSTACK_H
+#define ARM_COMPUTE_NEUNSTACK_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -72,4 +72,4 @@ private:
     std::vector<NEStridedSlice> _strided_slice_vector;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEUNSTACK_H__ */
+#endif /* ARM_COMPUTE_NEUNSTACK_H */
diff --git a/arm_compute/runtime/NEON/functions/NEUpsampleLayer.h b/arm_compute/runtime/NEON/functions/NEUpsampleLayer.h
index b88e71c0d7..6cd6ba3e9a 100644
--- a/arm_compute/runtime/NEON/functions/NEUpsampleLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEUpsampleLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEUPSAMPLELAYER_H__
-#define __ARM_COMPUTE_NEUPSAMPLELAYER_H__
+#ifndef ARM_COMPUTE_NEUPSAMPLELAYER_H
+#define ARM_COMPUTE_NEUPSAMPLELAYER_H
 
 #include "arm_compute/core/NEON/kernels/NEUpsampleLayerKernel.h"
 #include "arm_compute/core/Types.h"
@@ -70,4 +70,4 @@ private:
     DataLayout            _data_layout;
 };
 } // arm_compute
-#endif /* __ARM_COMPUTE_NEUPSAMPLELAYER_H__ */
+#endif /* ARM_COMPUTE_NEUPSAMPLELAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEWarpAffine.h b/arm_compute/runtime/NEON/functions/NEWarpAffine.h
index 26237191b3..768ef0c6d3 100644
--- a/arm_compute/runtime/NEON/functions/NEWarpAffine.h
+++ b/arm_compute/runtime/NEON/functions/NEWarpAffine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEWARPAFFINE_H__
-#define __ARM_COMPUTE_NEWARPAFFINE_H__
+#ifndef ARM_COMPUTE_NEWARPAFFINE_H
+#define ARM_COMPUTE_NEWARPAFFINE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -50,4 +50,4 @@ public:
     void configure(ITensor *input, ITensor *output, const std::array<float, 9> &matrix, InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEWARPAFFINE_H__ */
+#endif /*ARM_COMPUTE_NEWARPAFFINE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEWarpPerspective.h b/arm_compute/runtime/NEON/functions/NEWarpPerspective.h
index 09bc5837be..66fb9acc3f 100644
--- a/arm_compute/runtime/NEON/functions/NEWarpPerspective.h
+++ b/arm_compute/runtime/NEON/functions/NEWarpPerspective.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEWARPPERSPECTIVE_H__
-#define __ARM_COMPUTE_NEWARPPERSPECTIVE_H__
+#ifndef ARM_COMPUTE_NEWARPPERSPECTIVE_H
+#define ARM_COMPUTE_NEWARPPERSPECTIVE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/INESimpleFunction.h"
@@ -49,4 +49,4 @@ public:
     void configure(ITensor *input, ITensor *output, const std::array<float, 9> &matrix, InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
 };
 }
-#endif /*__ARM_COMPUTE_NEWARPPERSPECTIVE_H__ */
+#endif /*ARM_COMPUTE_NEWARPPERSPECTIVE_H */
diff --git a/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h
index 1ddbacf327..31047e8994 100644
--- a/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H__
-#define __ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H__
+#ifndef ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H
+#define ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -128,4 +128,4 @@ private:
     bool           _is_activationlayer_enabled;
 };
 }
-#endif /* __ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H__ */
+#endif /* ARM_COMPUTE_NEWINOGRADCONVOLUTIONLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/NEYOLOLayer.h b/arm_compute/runtime/NEON/functions/NEYOLOLayer.h
index 0adc0f1d9a..5e0c34b9b1 100644
--- a/arm_compute/runtime/NEON/functions/NEYOLOLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEYOLOLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEYOLOLAYER_H__
-#define __ARM_COMPUTE_NEYOLOLAYER_H__
+#ifndef ARM_COMPUTE_NEYOLOLAYER_H
+#define ARM_COMPUTE_NEYOLOLAYER_H
 
 #include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h"
 
@@ -61,4 +61,4 @@ public:
     static Status validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info, int32_t num_classes);
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEYOLOLAYER_H__ */
+#endif /* ARM_COMPUTE_NEYOLOLAYER_H */
diff --git a/arm_compute/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.h b/arm_compute/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.h
index b88e750fa9..f16bb46d35 100644
--- a/arm_compute/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.h
+++ b/arm_compute/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H__
-#define __ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H__
+#ifndef ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H
+#define ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -120,4 +120,4 @@ private:
     std::unique_ptr<LocalImpl> _pImpl;
 };
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H__ */
+#endif /* ARM_COMPUTE_NEDEPTHWISECONVOLUTIONASSEMBLYDISPATCH_H */
-- 
cgit v1.2.1