changes in includes and android compatibility