Updates to ogetoptv, oversion
Update public/private inheritance on most classes.
Remove redundant include statements