add missing includes and object files