Moved files, fixed missing #include in startup.h