Fix simple warnings that did not include the right files.