system/core: bring back defines