This paper proposes a control strategy based on incremental nonlinear dynamic inversion (INDI), meant for trajectory tracking purposes. The controller extends the conven- tional capabilities of INDI by including actuator dynamics in the inversion law and introducing a state dependent compensation term to reduce the effort of the error controller. A complementary filter is employed to reduce the degrading effect introduced by the filtering-induced delay in the feedback loop. Both simulated and real flight tests are conducted on a quadrotor configuration with artificially slowed down actuators and a drag plate mounted on top, to better observe the effect of actuator dynamics and state dependent dynamics in trajectory tracking accuracy. Simulations show that the combination of the two additional features increases tracking accuracy both in the short and long term response. It is also found that an overestimation of the state compensation term leads to instability, which makes the strategy not robust to model mismatch. Real flight tests, involving the tracking of a series of doublets on the pitch attitude and a lemniscate of Bernoulli, show that, as the complexity of the maneuver increases, the less the state compensation term effectively contributes to an improved tracking when the model is incomplete. On the other hand, trajectory tracking accuracy due to the consideration of actuator dynamics shows consistency and improvement respect to conventional INDI solutions.