Now that you mention it I realize the issues with the includes would not have happened with the chain of #if's.