Major include dependency overhaul to reduce compile times