Fix dependencies and include dirs