remove include and using

Change-Id: I329e02d1e91b8c566d147cd753dca48bf2abf23a