Cleaned up the includes in an internal file to help resolve some compile issues.