Bug 540373: Cleanup: Organize Imports

This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Organize Imports
and completing the wizard

Change-Id: Ia7b305a4c967d0e6f4e8fb8c1041e7028b24006c

6 files changed, 534 insertions, 35 deletions

diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
index fae72b3c1a2..c0a5992a9a9 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
@@ -13,8 +13,266 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.lrparser.xlc;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tPOUND;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t__Complex;
+import static org.eclipse.cdt.core.parser.IToken.t__Imaginary;
+import static org.eclipse.cdt.core.parser.IToken.t_asm;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_bool;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_catch;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_class;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_const_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_delete;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_explicit;
+import static org.eclipse.cdt.core.parser.IToken.t_export;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_false;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_friend;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_mutable;
+import static org.eclipse.cdt.core.parser.IToken.t_namespace;
+import static org.eclipse.cdt.core.parser.IToken.t_new;
+import static org.eclipse.cdt.core.parser.IToken.t_operator;
+import static org.eclipse.cdt.core.parser.IToken.t_private;
+import static org.eclipse.cdt.core.parser.IToken.t_protected;
+import static org.eclipse.cdt.core.parser.IToken.t_public;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_restrict;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_static_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_template;
+import static org.eclipse.cdt.core.parser.IToken.t_this;
+import static org.eclipse.cdt.core.parser.IToken.t_throw;
+import static org.eclipse.cdt.core.parser.IToken.t_true;
+import static org.eclipse.cdt.core.parser.IToken.t_try;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_typeid;
+import static org.eclipse.cdt.core.parser.IToken.t_typename;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_using;
+import static org.eclipse.cdt.core.parser.IToken.t_virtual;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_wchar_t;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_And;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_ArrowStar;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_ColonColon;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_DotStar;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MAX;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MIN;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK__Imaginary;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___alignof__;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___attribute__;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___declspec;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_asm;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_bool;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_break;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_case;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_catch;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_class;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_const_cast;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_default;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_delete;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_do;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_dynamic_cast;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_else;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_explicit;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_export;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_false;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_friend;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_if;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_mutable;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_namespace;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_new;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_operator;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_private;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_protected;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_public;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_reinterpret_cast;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_return;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_static_cast;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_template;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_this;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_throw;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_true;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_try;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typeid;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typename;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typeof;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_using;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_virtual;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_wchar_t;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IGCCToken;
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
index 9179ee616ee..c7d026c46d5 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
@@ -13,8 +13,204 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.lrparser.xlc;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t__Bool;
+import static org.eclipse.cdt.core.parser.IToken.t__Complex;
+import static org.eclipse.cdt.core.parser.IToken.t__Imaginary;
+import static org.eclipse.cdt.core.parser.IToken.t_asm;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_restrict;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_And;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MAX;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MIN;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Bool;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Complex;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Imaginary;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___alignof__;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___attribute__;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___declspec;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_asm;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_break;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_case;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_default;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_do;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_else;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_if;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_return;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_typeof;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IGCCToken;
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java
index 19304d79492..f04c9f70cd1 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java
@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.lrparser.xlc.action;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.lrparser.action.ISecondaryParserFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
@@ -23,6 +21,8 @@ import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCASTVectorTypeSpecifier;
 import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCNodeFactory;
 import org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym;
 
+import lpg.lpgjavaruntime.IToken;
+
 public class XlcCBuildASTParserAction extends GCCBuildASTParserAction {
 
 	private IXlcCNodeFactory nodeFactory;
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java
index 195ad3abf62..936ad10bc5e 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java
@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.lrparser.xlc.action;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTStaticAssertDeclaration;
@@ -29,6 +27,8 @@ import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCPPASTVectorTypeSpecifier;
 import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCPPNodeFactory;
 import org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym;
 
+import lpg.lpgjavaruntime.IToken;
+
 public class XlcCPPBuildASTParserAction extends GPPBuildASTParserAction {
 
 	private IXlcCPPNodeFactory nodeFactory;
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
index 5676192e0cd..cc4230a4305 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
@@ -16,28 +16,51 @@
 
 package org.eclipse.cdt.internal.core.lrparser.xlc.c;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
-
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
-
 import org.eclipse.cdt.core.lrparser.xlc.action.XlcCBuildASTParserAction;
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.lrparser.xlc.ast.XlcCNodeFactory;
 
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.TokenStream;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
+
 public class XlcCParser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>
 
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
index 6c0a202894c..4841efa0c9c 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
@@ -16,31 +16,53 @@
 
 package org.eclipse.cdt.internal.core.lrparser.xlc.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-
 import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
-
 import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.*;
-
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
 import org.eclipse.cdt.core.lrparser.xlc.action.XlcCPPBuildASTParserAction;
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.lrparser.xlc.ast.XlcCPPNodeFactory;
 
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.TokenStream;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
+
 public class XlcCPPParser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>