fixed include path and added missing files