Added ApolloDeclareVariableExpression
Fixed overriding included class definitions with incomplete type declarations