Removed ifdefs in favor of 'using' statements