Minor fixes for includes.