Removed some ifdefs by making function signatures similar