Extra files and fixed include bug