Fixes header include issues when not using as a Pod

It seems that the folders where re-arranged at some point but not all the header imports were updates. Pods glosses over these issues somehow.