fixed includes for restructured source layout