Added missing includes and default directories.