try to fix errors

- add more dependencies to makefile targets
- try includes in multiple ways, just in case

Change-Id: Ia1d6aa9bf04a63d0f0f63cda537bd77c969b043e