Reorganise headers a bit, include everything in the private header