Impact: cleanup

 - fix header file issues
Signed-off-by: NJaswinder Singh Rajput <jaswinderrajput@gmail.com>