Tidy up include directories on the client
Minimal server