diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c
index 1cb5aa8..75399f6 100644
--- a/arm/filter_neon_intrinsics.c
+++ b/arm/filter_neon_intrinsics.c
@@ -20,9 +20,9 @@
 #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
 
 #if defined(_MSC_VER) && defined(_M_ARM64)
-#include <arm64_neon.h>
+#  include <arm64_neon.h>
 #else
-#include <arm_neon.h>
+#  include <arm_neon.h>
 #endif
 
 /* libpng row pointers are not necessarily aligned to any particular boundary,
diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c
index c01db11..fa02d6a 100644
--- a/arm/palette_neon_intrinsics.c
+++ b/arm/palette_neon_intrinsics.c
@@ -1,5 +1,7 @@
+
 /* palette_neon_intrinsics.c - NEON optimised palette expansion functions
  *
+ * Copyright (c) 2018 Cosmin Truta
  * Copyright (c) 2017-2018 Arm Holdings. All rights reserved.
  * Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017.
  *
@@ -12,7 +14,11 @@
 
 #if PNG_ARM_NEON_IMPLEMENTATION == 1
 
-#include <arm_neon.h>
+#if defined(_MSC_VER) && defined(_M_ARM64)
+#  include <arm64_neon.h>
+#else
+#  include <arm_neon.h>
+#endif
 
 /* Build an RGBA palette from the RGB and separate alpha palettes. */
 void
diff --git a/pngrtran.c b/pngrtran.c
index 8b48f79..ccc58ce 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -19,10 +19,14 @@
 #include "pngpriv.h"
 
 #ifdef PNG_ARM_NEON_IMPLEMENTATION
-#if PNG_ARM_NEON_IMPLEMENTATION == 1
-#define PNG_ARM_NEON_INTRINSICS_AVAILABLE
-#include <arm_neon.h>
-#endif
+#  if PNG_ARM_NEON_IMPLEMENTATION == 1
+#    define PNG_ARM_NEON_INTRINSICS_AVAILABLE
+#    if defined(_MSC_VER) && defined(_M_ARM64)
+#      include <arm64_neon.h>
+#    else
+#      include <arm_neon.h>
+#    endif
+#  endif
 #endif
 
 #ifdef PNG_READ_SUPPORTED