Cleaned includes in all files