Cleaned up header onces to use #pragma
Reordered headers.