EVaura: indentation fix
EVaura: start headers cleanup
EVaura: linking and header files cleanup