[GENERAL] clean includes
[GENERAL] update version number