Added missing files and fixed the include statements.