Fix add_definitions
Include more locally
Answer domme.