# include "message.h"
# include "fileloc.h"
# include "globals.h"
+# include "cpp.h"
# include "flag_codes.h"
# include "flags.h"
# include "flagSpec.h"
# include "messageLog.h"
# include "clauseStack.h"
# include "stateCombinationTable.h"
-# include "metaStateInfo.h"
-# include "metaStateTable.h"
-# include "annotationInfo.h"
-# include "annotationTable.h"
+# include "mtincludes.h"
+# include "functionConstraint.h"
# include "context.h"
# include "constants.h"