replace wildcards with 'find' program
Fix missing includes