citadel.h is now citadel_defs.h