Moving includes to right file