Because a definition is also a declaration, it might make sense to change uses of "declaration or definition" to simply "declaration".