Cleaned Up Include Structure

Cleaned up the LLVM include structure however more work needs to be done
in this area.