Updated files that use the old op.h