Switched custom systems over to use preprocessor definitions