Remove dependency on commandline/ from oenv.cpp