Sort and fix `#include` directives.

Includes are sorted into groups, each sorted alphabetically and separated by a
blank line. The groups are, in order, C headers, C++ headers, VIXL (non-backend)
headers, and VIXL backend headers.

Change-Id: I9a71430bffeaf77389a089487ce264db8d1d9ddc

40 files changed, 89 insertions, 54 deletions

diff --git a/benchmarks/bench-branch-link-masm.cc b/benchmarks/bench-branch-link-masm.cc
index 2e25960c..7c1d3ad0 100644
--- a/benchmarks/bench-branch-link-masm.cc
+++ b/benchmarks/bench-branch-link-masm.cc
@@ -24,10 +24,11 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/macro-assembler-a64.h"
-#include "a64/instructions-a64.h"
 #include "globals-vixl.h"
 
+#include "a64/instructions-a64.h"
+#include "a64/macro-assembler-a64.h"
+
 using namespace vixl;
 
 static const int kDefaultIterationsCount = 100000;
diff --git a/benchmarks/bench-branch-link.cc b/benchmarks/bench-branch-link.cc
index 000fd362..3249849c 100644
--- a/benchmarks/bench-branch-link.cc
+++ b/benchmarks/bench-branch-link.cc
@@ -24,10 +24,11 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/macro-assembler-a64.h"
-#include "a64/instructions-a64.h"
 #include "globals-vixl.h"
 
+#include "a64/instructions-a64.h"
+#include "a64/macro-assembler-a64.h"
+
 using namespace vixl;
 
 static const int kDefaultInstructionCount = 100000;
diff --git a/benchmarks/bench-branch-masm.cc b/benchmarks/bench-branch-masm.cc
index 31c904a9..cc9bfdaf 100644
--- a/benchmarks/bench-branch-masm.cc
+++ b/benchmarks/bench-branch-masm.cc
@@ -26,8 +26,8 @@
 
 #include "globals-vixl.h"
 
-#include "a64/macro-assembler-a64.h"
 #include "a64/instructions-a64.h"
+#include "a64/macro-assembler-a64.h"
 
 using namespace vixl;
 
diff --git a/benchmarks/bench-branch.cc b/benchmarks/bench-branch.cc
index 5929e8bc..a5a36d32 100644
--- a/benchmarks/bench-branch.cc
+++ b/benchmarks/bench-branch.cc
@@ -24,10 +24,11 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/macro-assembler-a64.h"
-#include "a64/instructions-a64.h"
 #include "globals-vixl.h"
 
+#include "a64/instructions-a64.h"
+#include "a64/macro-assembler-a64.h"
+
 using namespace vixl;
 
 static const int kDefaultInstructionCount = 100000;
diff --git a/benchmarks/bench-dataop.cc b/benchmarks/bench-dataop.cc
index 3fe10708..82114e3c 100644
--- a/benchmarks/bench-dataop.cc
+++ b/benchmarks/bench-dataop.cc
@@ -24,10 +24,11 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/macro-assembler-a64.h"
-#include "a64/instructions-a64.h"
 #include "globals-vixl.h"
 
+#include "a64/instructions-a64.h"
+#include "a64/macro-assembler-a64.h"
+
 using namespace vixl;
 
 static const unsigned kDefaultInstructionCount = 100000;
diff --git a/examples/custom-disassembler.cc b/examples/custom-disassembler.cc
index 2187750d..7b3de9de 100644
--- a/examples/custom-disassembler.cc
+++ b/examples/custom-disassembler.cc
@@ -24,8 +24,8 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "examples.h"
 #include "custom-disassembler.h"
+#include "examples.h"
 
 
 #define BUF_SIZE (4096)
diff --git a/examples/examples.h b/examples/examples.h
index 3dbfef4c..ff25c04d 100644
--- a/examples/examples.h
+++ b/examples/examples.h
@@ -27,7 +27,6 @@
 #ifndef VIXL_EXAMPLE_EXAMPLES_H_
 #define VIXL_EXAMPLE_EXAMPLES_H_
 
-#include "a64/simulator-a64.h"
 #include "a64/debugger-a64.h"
 #include "a64/macro-assembler-a64.h"
 
diff --git a/examples/getting-started.cc b/examples/getting-started.cc
index ed6108f0..b270faae 100644
--- a/examples/getting-started.cc
+++ b/examples/getting-started.cc
@@ -24,8 +24,8 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/simulator-a64.h"
 #include "a64/macro-assembler-a64.h"
+#include "a64/simulator-a64.h"
 
 #define BUF_SIZE (4096)
 #define __ masm->
diff --git a/src/a64/assembler-a64.cc b/src/a64/assembler-a64.cc
index 9b64c60e..fcdd0c76 100644
--- a/src/a64/assembler-a64.cc
+++ b/src/a64/assembler-a64.cc
@@ -26,6 +26,7 @@
 
 
 #include <cmath>
+
 #include "a64/assembler-a64.h"
 #include "a64/macro-assembler-a64.h"
 
diff --git a/src/a64/assembler-a64.h b/src/a64/assembler-a64.h
index b29fcdb7..853ecbce 100644
--- a/src/a64/assembler-a64.h
+++ b/src/a64/assembler-a64.h
@@ -27,11 +27,11 @@
 #ifndef VIXL_A64_ASSEMBLER_A64_H_
 #define VIXL_A64_ASSEMBLER_A64_H_
 
-
+#include "code-buffer-vixl.h"
 #include "globals-vixl.h"
 #include "invalset-vixl.h"
 #include "utils-vixl.h"
-#include "code-buffer-vixl.h"
+
 #include "a64/instructions-a64.h"
 
 namespace vixl {
diff --git a/src/a64/constants-a64.h b/src/a64/constants-a64.h
index eabd65cf..ff636ce7 100644
--- a/src/a64/constants-a64.h
+++ b/src/a64/constants-a64.h
@@ -27,6 +27,8 @@
 #ifndef VIXL_A64_CONSTANTS_A64_H_
 #define VIXL_A64_CONSTANTS_A64_H_
 
+#include "globals-vixl.h"
+
 namespace vixl {
 
 const unsigned kNumberOfRegisters = 32;
diff --git a/src/a64/cpu-a64.cc b/src/a64/cpu-a64.cc
index c3ca6d74..1bbcb632 100644
--- a/src/a64/cpu-a64.cc
+++ b/src/a64/cpu-a64.cc
@@ -25,6 +25,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "utils-vixl.h"
+
 #include "a64/cpu-a64.h"
 
 namespace vixl {
diff --git a/src/a64/cpu-a64.h b/src/a64/cpu-a64.h
index 71cd459c..3f0fc635 100644
--- a/src/a64/cpu-a64.h
+++ b/src/a64/cpu-a64.h
@@ -28,6 +28,7 @@
 #define VIXL_CPU_A64_H
 
 #include "globals-vixl.h"
+
 #include "a64/instructions-a64.h"
 
 namespace vixl {
diff --git a/src/a64/debugger-a64.h b/src/a64/debugger-a64.h
index d4a54f6f..4cd08a4f 100644
--- a/src/a64/debugger-a64.h
+++ b/src/a64/debugger-a64.h
@@ -30,12 +30,14 @@
 #define VIXL_A64_DEBUGGER_A64_H_
 
 #include <ctype.h>
-#include <limits.h>
 #include <errno.h>
+#include <limits.h>
+
 #include <vector>
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
+
 #include "a64/constants-a64.h"
 #include "a64/simulator-a64.h"
 
diff --git a/src/a64/decoder-a64.cc b/src/a64/decoder-a64.cc
index 7dac9e2c..147214da 100644
--- a/src/a64/decoder-a64.cc
+++ b/src/a64/decoder-a64.cc
@@ -26,6 +26,7 @@
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
+
 #include "a64/decoder-a64.h"
 
 namespace vixl {
diff --git a/src/a64/decoder-a64.h b/src/a64/decoder-a64.h
index 0090acf2..c741f061 100644
--- a/src/a64/decoder-a64.h
+++ b/src/a64/decoder-a64.h
@@ -30,6 +30,7 @@
 #include <list>
 
 #include "globals-vixl.h"
+
 #include "a64/instructions-a64.h"
 
 
diff --git a/src/a64/disasm-a64.cc b/src/a64/disasm-a64.cc
index 25c84669..7ae7e471 100644
--- a/src/a64/disasm-a64.cc
+++ b/src/a64/disasm-a64.cc
@@ -25,6 +25,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdlib>
+
 #include "a64/disasm-a64.h"
 
 namespace vixl {
diff --git a/src/a64/disasm-a64.h b/src/a64/disasm-a64.h
index 5e4b7185..000c33d1 100644
--- a/src/a64/disasm-a64.h
+++ b/src/a64/disasm-a64.h
@@ -29,9 +29,10 @@
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
-#include "a64/instructions-a64.h"
-#include "a64/decoder-a64.h"
+
 #include "a64/assembler-a64.h"
+#include "a64/decoder-a64.h"
+#include "a64/instructions-a64.h"
 
 namespace vixl {
 
diff --git a/src/a64/instructions-a64.cc b/src/a64/instructions-a64.cc
index a52e485a..51c9d196 100644
--- a/src/a64/instructions-a64.cc
+++ b/src/a64/instructions-a64.cc
@@ -24,8 +24,8 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/instructions-a64.h"
 #include "a64/assembler-a64.h"
+#include "a64/instructions-a64.h"
 
 namespace vixl {
 
diff --git a/src/a64/instructions-a64.h b/src/a64/instructions-a64.h
index 49fa12f9..5ff1cbeb 100644
--- a/src/a64/instructions-a64.h
+++ b/src/a64/instructions-a64.h
@@ -29,6 +29,7 @@
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
+
 #include "a64/constants-a64.h"
 
 namespace vixl {
diff --git a/src/a64/instrument-a64.h b/src/a64/instrument-a64.h
index 6d62fd9d..5c48c43e 100644
--- a/src/a64/instrument-a64.h
+++ b/src/a64/instrument-a64.h
@@ -29,8 +29,9 @@
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
-#include "a64/decoder-a64.h"
+
 #include "a64/constants-a64.h"
+#include "a64/decoder-a64.h"
 #include "a64/instrument-a64.h"
 
 namespace vixl {
diff --git a/src/a64/logic-a64.cc b/src/a64/logic-a64.cc
index 3e5c2277..0d9e7f5b 100644
--- a/src/a64/logic-a64.cc
+++ b/src/a64/logic-a64.cc
@@ -27,6 +27,7 @@
 #ifdef VIXL_INCLUDE_SIMULATOR
 
 #include <cmath>
+
 #include "a64/simulator-a64.h"
 
 namespace vixl {
diff --git a/src/a64/macro-assembler-a64.h b/src/a64/macro-assembler-a64.h
index 6714f2b6..e6fd2205 100644
--- a/src/a64/macro-assembler-a64.h
+++ b/src/a64/macro-assembler-a64.h
@@ -31,6 +31,7 @@
 #include <limits>
 
 #include "globals-vixl.h"
+
 #include "a64/assembler-a64.h"
 #include "a64/debugger-a64.h"
 #include "a64/instrument-a64.h"
diff --git a/src/a64/simulator-a64.cc b/src/a64/simulator-a64.cc
index be1db5ef..2d2ba730 100644
--- a/src/a64/simulator-a64.cc
+++ b/src/a64/simulator-a64.cc
@@ -27,7 +27,9 @@
 #ifdef VIXL_INCLUDE_SIMULATOR
 
 #include <string.h>
+
 #include <cmath>
+
 #include "a64/simulator-a64.h"
 
 namespace vixl {
diff --git a/src/a64/simulator-a64.h b/src/a64/simulator-a64.h
index e4729ae4..51590d88 100644
--- a/src/a64/simulator-a64.h
+++ b/src/a64/simulator-a64.h
@@ -29,9 +29,10 @@
 
 #include "globals-vixl.h"
 #include "utils-vixl.h"
-#include "a64/instructions-a64.h"
+
 #include "a64/assembler-a64.h"
 #include "a64/disasm-a64.h"
+#include "a64/instructions-a64.h"
 #include "a64/instrument-a64.h"
 #include "a64/simulator-constants-a64.h"
 
diff --git a/src/a64/simulator-constants-a64.h b/src/a64/simulator-constants-a64.h
index a144a928..14a17d96 100644
--- a/src/a64/simulator-constants-a64.h
+++ b/src/a64/simulator-constants-a64.h
@@ -27,6 +27,8 @@
 #ifndef VIXL_A64_SIMULATOR_CONSTANTS_A64_H_
 #define VIXL_A64_SIMULATOR_CONSTANTS_A64_H_
 
+#include "a64/instructions-a64.h"
+
 namespace vixl {
 
 // Debug instructions.
diff --git a/src/code-buffer-vixl.h b/src/code-buffer-vixl.h
index 4223df52..d917f08c 100644
--- a/src/code-buffer-vixl.h
+++ b/src/code-buffer-vixl.h
@@ -28,6 +28,7 @@
 #define VIXL_CODE_BUFFER_H
 
 #include <string.h>
+
 #include "globals-vixl.h"
 
 namespace vixl {
diff --git a/src/globals-vixl.h b/src/globals-vixl.h
index 95cd4120..fa89b712 100644
--- a/src/globals-vixl.h
+++ b/src/globals-vixl.h
@@ -40,15 +40,15 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include <stdint.h>
-#include <inttypes.h>
-
 #include <assert.h>
+#include <inttypes.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
+
 #include "platform-vixl.h"
 
 
diff --git a/src/utils-vixl.cc b/src/utils-vixl.cc
index 824df990..c290dbce 100644
--- a/src/utils-vixl.cc
+++ b/src/utils-vixl.cc
@@ -24,9 +24,10 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "utils-vixl.h"
 #include <stdio.h>
 
+#include "utils-vixl.h"
+
 namespace vixl {
 
 uint32_t float_to_rawbits(float value) {
diff --git a/src/utils-vixl.h b/src/utils-vixl.h
index 0897ce3c..3882fac2 100644
--- a/src/utils-vixl.h
+++ b/src/utils-vixl.h
@@ -28,9 +28,11 @@
 #define VIXL_UTILS_H
 
 #include <string.h>
+
 #include <cmath>
-#include "globals-vixl.h"
+
 #include "compiler-intrinsics-vixl.h"
+#include "globals-vixl.h"
 
 namespace vixl {
 
diff --git a/test/examples/test-examples.cc b/test/examples/test-examples.cc
index 85bf878d..1ba81ffa 100644
--- a/test/examples/test-examples.cc
+++ b/test/examples/test-examples.cc
@@ -24,16 +24,15 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "a64/macro-assembler-a64.h"
-#include "a64/debugger-a64.h"
-#include "a64/simulator-a64.h"
+#include "../test-runner.h"
+#include "../test-utils-a64.h"
+#include "custom-disassembler.h"
 #include "examples.h"
 #include "non-const-visitor.h"
-#include "custom-disassembler.h"
-#include "../test-utils-a64.h"
-
-#include "../test-runner.h"
 
+#include "a64/macro-assembler-a64.h"
+#include "a64/debugger-a64.h"
+#include "a64/simulator-a64.h"
 #define TEST(name) TEST_(EXAMPLE_##name)
 
 using namespace vixl;
diff --git a/test/test-assembler-a64.cc b/test/test-assembler-a64.cc
index 16581113..aaba4f94 100644
--- a/test/test-assembler-a64.cc
+++ b/test/test-assembler-a64.cc
@@ -24,19 +24,21 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <float.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <float.h>
+
 #include <cmath>
 
 #include "test-runner.h"
 #include "test-utils-a64.h"
-#include "a64/macro-assembler-a64.h"
-#include "a64/simulator-a64.h"
+
+#include "a64/cpu-a64.h"
 #include "a64/debugger-a64.h"
 #include "a64/disasm-a64.h"
-#include "a64/cpu-a64.h"
+#include "a64/macro-assembler-a64.h"
+#include "a64/simulator-a64.h"
 
 namespace vixl {
 
diff --git a/test/test-disasm-a64.cc b/test/test-disasm-a64.cc
index 06628e63..215ece83 100644
--- a/test/test-disasm-a64.cc
+++ b/test/test-disasm-a64.cc
@@ -25,12 +25,14 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdio.h>
+
 #include <cstring>
 #include <string>
+
 #include "test-runner.h"
 
-#include "a64/macro-assembler-a64.h"
 #include "a64/disasm-a64.h"
+#include "a64/macro-assembler-a64.h"
 
 #define TEST(name)  TEST_(DISASM_##name)
 
diff --git a/test/test-fuzz-a64.cc b/test/test-fuzz-a64.cc
index aad466bb..c02d7df4 100644
--- a/test/test-fuzz-a64.cc
+++ b/test/test-fuzz-a64.cc
@@ -25,6 +25,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
+
 #include "test-runner.h"
 
 #include "a64/decoder-a64.h"
diff --git a/test/test-invalset.cc b/test/test-invalset.cc
index 749ddcc4..4985fbf6 100644
--- a/test/test-invalset.cc
+++ b/test/test-invalset.cc
@@ -24,9 +24,8 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "test-runner.h"
-
 #include "invalset-vixl.h"
+#include "test-runner.h"
 
 namespace vixl {
 
diff --git a/test/test-runner.cc b/test/test-runner.cc
index b3120051..3382eb10 100644
--- a/test/test-runner.cc
+++ b/test/test-runner.cc
@@ -24,9 +24,10 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "test-runner.h"
 
 // Initialize the list as empty.
diff --git a/test/test-simulator-a64.cc b/test/test-simulator-a64.cc
index 3cfc7a69..024afcd4 100644
--- a/test/test-simulator-a64.cc
+++ b/test/test-simulator-a64.cc
@@ -24,13 +24,14 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdio.h>
 #include <float.h>
+#include <stdio.h>
 
 #include "test-runner.h"
-#include "test-utils-a64.h"
 #include "test-simulator-inputs-a64.h"
 #include "test-simulator-traces-a64.h"
+#include "test-utils-a64.h"
+
 #include "a64/macro-assembler-a64.h"
 #include "a64/simulator-a64.h"
 
diff --git a/test/test-trace-a64.cc b/test/test-trace-a64.cc
index 8ae46282..b03c8314 100644
--- a/test/test-trace-a64.cc
+++ b/test/test-trace-a64.cc
@@ -24,19 +24,21 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <float.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <float.h>
+
 #include <cmath>
 
 #include "test-runner.h"
 #include "test-utils-a64.h"
-#include "a64/macro-assembler-a64.h"
-#include "a64/simulator-a64.h"
+
+#include "a64/cpu-a64.h"
 #include "a64/debugger-a64.h"
 #include "a64/disasm-a64.h"
-#include "a64/cpu-a64.h"
+#include "a64/macro-assembler-a64.h"
+#include "a64/simulator-a64.h"
 
 namespace vixl {
 // Trace tests can only work with the simulator.
diff --git a/test/test-utils-a64.cc b/test/test-utils-a64.cc
index fcbc3889..27147c5b 100644
--- a/test/test-utils-a64.cc
+++ b/test/test-utils-a64.cc
@@ -24,15 +24,15 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "test-utils-a64.h"
-
 #include <cmath>
 
 #include "test-runner.h"
+#include "test-utils-a64.h"
+
+#include "a64/cpu-a64.h"
+#include "a64/disasm-a64.h"
 #include "a64/macro-assembler-a64.h"
 #include "a64/simulator-a64.h"
-#include "a64/disasm-a64.h"
-#include "a64/cpu-a64.h"
 
 #define __ masm->
 
diff --git a/test/test-utils-a64.h b/test/test-utils-a64.h
index 09a86c1b..b70f396e 100644
--- a/test/test-utils-a64.h
+++ b/test/test-utils-a64.h
@@ -28,10 +28,11 @@
 #define VIXL_A64_TEST_UTILS_A64_H_
 
 #include "test-runner.h"
+
+#include "a64/cpu-a64.h"
+#include "a64/disasm-a64.h"
 #include "a64/macro-assembler-a64.h"
 #include "a64/simulator-a64.h"
-#include "a64/disasm-a64.h"
-#include "a64/cpu-a64.h"
 
 namespace vixl {