COMPMID-906: Use fused activation in NEON Batch normalization

Change-Id: I5a6413548b2c9b8972c91ddba57395509dffd87e
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/120656
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/arm_compute/core/NEON/wrapper/intrinsics/and.h b/arm_compute/core/NEON/wrapper/intrinsics/and.h
index 9b5cfd6..4910738 100644
--- a/arm_compute/core/NEON/wrapper/intrinsics/and.h
+++ b/arm_compute/core/NEON/wrapper/intrinsics/and.h
@@ -24,8 +24,6 @@
 #ifndef __ARM_COMPUTE_WRAPPER_AND_H__
 #define __ARM_COMPUTE_WRAPPER_AND_H__
 
-#include "arm_compute/core/NEON/wrapper/traits.h"
-
 #include <arm_neon.h>
 
 namespace arm_compute
@@ -55,6 +53,8 @@
 VAND_IMPL(int32_t, int32x4_t, vandq, s32)
 VAND_IMPL(uint64_t, uint64x2_t, vandq, u64)
 VAND_IMPL(int64_t, int64x2_t, vandq, s64)
-}
-}
+
+#undef VAND_IMPL
+} // namespace wrapper
+} // namespace arm_compute
 #endif /* __ARM_COMPUTE_WRAPPER_AND_H__ */