layers: clean up includes
8 files changed