Swapped the include order
Fixed type errors