Removed tons of includes from main