This should hopefully fix compile errors on some ubuntu systems.

Also, reorders the includes according to clang-format
Signed-off-by: Brenden Blanco <bblanco@gmail.com>