Minor include file cleanup