From 444ebbf7ef8c897a30e87335d71bf15d603a832b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 6 Feb 2017 18:15:37 -0800
Subject: [PATCH] Cleanup.

---
 include/bx/bx.h           | 2 ++
 include/bx/debug.h        | 1 -
 include/bx/os.h           | 1 -
 include/bx/pixelformat.h  | 4 ++--
 include/bx/readerwriter.h | 3 ---
 include/bx/string.h       | 6 ++----
 src/os.cpp                | 1 +
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/include/bx/bx.h b/include/bx/bx.h
index 43ccba3..161270a 100644
--- a/include/bx/bx.h
+++ b/include/bx/bx.h
@@ -6,6 +6,8 @@
 #ifndef BX_H_HEADER_GUARD
 #define BX_H_HEADER_GUARD
 
+#include <alloca.h> // alloca
+#include <stdarg.h> // va_list
 #include <stdint.h> // uint32_t
 #include <stdlib.h> // size_t
 #include <stddef.h> // ptrdiff_t
diff --git a/include/bx/debug.h b/include/bx/debug.h
index 641a0ed..7c2ca86 100644
--- a/include/bx/debug.h
+++ b/include/bx/debug.h
@@ -7,7 +7,6 @@
 #define BX_DEBUG_H_HEADER_GUARD
 
 #include "bx.h"
-#include <stdarg.h> // va_list
 
 namespace bx
 {
diff --git a/include/bx/os.h b/include/bx/os.h
index d263975..afda15f 100644
--- a/include/bx/os.h
+++ b/include/bx/os.h
@@ -8,7 +8,6 @@
 
 #include "bx.h"
 #include "debug.h"
-#include <sys/stat.h>
 
 #if BX_PLATFORM_OSX
 #	define BX_DL_EXT "dylib"
diff --git a/include/bx/pixelformat.h b/include/bx/pixelformat.h
index 5b2bf56..b8f9586 100644
--- a/include/bx/pixelformat.h
+++ b/include/bx/pixelformat.h
@@ -6,8 +6,8 @@
 #ifndef BX_PIXEL_FORMAT_H_HEADER_GUARD
 #define BX_PIXEL_FORMAT_H_HEADER_GUARD
 
-#include <bx/fpumath.h>
-#include <bx/uint32_t.h>
+#include "fpumath.h"
+#include "uint32_t.h"
 
 namespace bx
 {
diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h
index b7443c6..e29afc7 100644
--- a/include/bx/readerwriter.h
+++ b/include/bx/readerwriter.h
@@ -6,9 +6,6 @@
 #ifndef BX_READERWRITER_H_HEADER_GUARD
 #define BX_READERWRITER_H_HEADER_GUARD
 
-#include <alloca.h>
-#include <stdarg.h> // va_list
-
 #include "bx.h"
 #include "allocator.h"
 #include "error.h"
diff --git a/include/bx/string.h b/include/bx/string.h
index eaf27bc..9236c7e 100644
--- a/include/bx/string.h
+++ b/include/bx/string.h
@@ -7,12 +7,10 @@
 #define BX_STRING_H_HEADER_GUARD
 
 #include "bx.h"
-#include <alloca.h>
-#include <stdarg.h> // va_list
 #include <wchar.h>  // wchar_t
 
-#include <bx/allocator.h>
-#include <bx/hash.h>
+#include "allocator.h"
+#include "hash.h"
 
 namespace bx
 {
diff --git a/src/os.cpp b/src/os.cpp
index 4970337..8aba304 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -8,6 +8,7 @@
 #include <bx/string.h>
 
 #include <stdio.h>
+#include <sys/stat.h>
 
 #if BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT
 #	include <windows.h>