add missing header files and clean up project