Add ifdef to command.h too