run clang-format to order includes, fix include ordering errors

targets/java/include/java/Arrays.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cassert>
 #include <cstdint>
+#include <vector>
 
 class Biome;
 

targets/java/include/java/Exceptions.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <exception>
+#include <string>
 
 class EOFException : public std::exception {};
 

targets/java/include/java/File.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <cstdint>
+#include <string>
 #include <vector>
 
 // 4J Stu - Represents java standard library class

targets/java/include/java/InputOutputStream/BufferedOutputStream.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
+
 #include <cstdint>
 #include <vector>
 

targets/java/include/java/InputOutputStream/BufferedReader.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Reader.h"
-
 #include <string>
 
+#include "Reader.h"
+
 class BufferedReader : public Reader {
 private:
     Reader* reader;

targets/java/include/java/InputOutputStream/ByteArrayInputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 #include "InputStream.h"
 

targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "OutputStream.h"
-
-#include <vector>
 #include <cstdint>
+#include <vector>
+
+#include "OutputStream.h"
 
 class ByteArrayOutputStream : public OutputStream {
     // Note - when actually implementing, std::vector<uint8_t> will need to grow

targets/java/include/java/InputOutputStream/DataInput.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataInput {
 public:

targets/java/include/java/InputOutputStream/DataInputStream.h

@@ -2,11 +2,11 @@
 // 4J Stu - Represents Java standard library class (although we miss out an
 // intermediate inheritance class that we don't care about)
 
-#include <string>
 #include <cstdint>
+#include <string>
 
-#include "InputStream.h"
 #include "DataInput.h"
+#include "InputStream.h"
 
 class DataInputStream : public InputStream, public DataInput {
 private:

targets/java/include/java/InputOutputStream/DataOutput.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataOutput {
 public:

targets/java/include/java/InputOutputStream/DataOutputStream.h

@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "OutputStream.h"
 #include "DataOutput.h"
+#include "OutputStream.h"
 
 class DataOutputStream : public OutputStream, public DataOutput {
 private:

targets/java/include/java/InputOutputStream/FileInputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
 
 #include "InputStream.h"
 

targets/java/include/java/InputOutputStream/InputOutputStream.h

@@ -1,20 +1,18 @@
 #pragma once
 
-#include "InputStream.h"
+#include "BufferedOutputStream.h"
+#include "BufferedReader.h"
 #include "ByteArrayInputStream.h"
+#include "ByteArrayOutputStream.h"
 #include "DataInput.h"
 #include "DataInputStream.h"
-#include "FileInputStream.h"
-#include "GZIPInputStream.h"
-
-#include "OutputStream.h"
-#include "ByteArrayOutputStream.h"
 #include "DataOutput.h"
-#include "BufferedOutputStream.h"
 #include "DataOutputStream.h"
+#include "FileInputStream.h"
 #include "FileOutputStream.h"
+#include "GZIPInputStream.h"
 #include "GZIPOutputStream.h"
-
-#include "Reader.h"
-#include "BufferedReader.h"
-#include "InputStreamReader.h"
+#include "InputStream.h"
+#include "InputStreamReader.h"
+#include "OutputStream.h"
+#include "Reader.h"

targets/java/include/java/InputOutputStream/InputStream.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
 #include <string>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 

targets/java/include/java/InputOutputStream/InputStreamReader.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Reader.h"
 #include "DataInputStream.h"
+#include "Reader.h"
 
 class InputStream;
 

targets/java/include/java/InputOutputStream/OutputStream.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 

targets/java/include/java/JavaIntHash.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "java/Class.h"
-
 #include <cstdint>
 
+#include "java/Class.h"
+
 // Java doesn't have a default hash value for ints, however, the hashmap itself
 // does some "supplemental" hashing, so our ints actually get hashed by code as
 // implemented below. std templates *do* have a standard hash for ints, but it

targets/java/include/java/System.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <cstdint>
-#include <vector>
 #include <algorithm>
-#include <cstring>
 #include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <vector>
 
 class Biome;
 class Node;