Use includes and fix path