Remove useless forward decl + incl missing include