Cleaned up error message and needless includes.