diff --git a/reactos/tools/wpp/lex.yy.c b/reactos/tools/wpp/lex.yy.c
index 779d55e2ee9..d5d6a82cc5e 100644
--- a/reactos/tools/wpp/lex.yy.c
+++ b/reactos/tools/wpp/lex.yy.c
@@ -16,7 +16,7 @@
 #define yytext pptext
 #define yywrap ppwrap
 
-#line 20 "wpp/lex.yy.c"
+#line 20 "lex.yy.c"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
@@ -13707,9 +13707,9 @@ static yyconst short int yy_rule_linenum[144] =
 
       470,  471,  472,  483,  484,  488,  489,  501,  505,  514,
       520,  521,  522,  523,  524,  525,  530,  531,  532,  533,
-      538,  546,  547,  548,  549,  572,  573,  587,  588,  594,
-      618,  619,  628,  673,  674,  675,  676,  677,  683,  685,
-      691,  693,  701
+      538,  546,  547,  548,  549,  571,  572,  586,  587,  593,
+      617,  618,  627,  672,  673,  674,  675,  676,  682,  684,
+      690,  692,  700
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -13720,7 +13720,7 @@ static yyconst short int yy_rule_linenum[144] =
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "wpp/ppl.l"
+#line 1 "ppl.l"
 #define INITIAL 0
 /*
  * Wrc preprocessor lexical analysis
@@ -13893,7 +13893,7 @@ char *yytext;
 
 #define RCINCL 21
 
-#line 159 "wpp/ppl.l"
+#line 159 "ppl.l"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14031,7 +14031,7 @@ includelogicentry_t *pp_includelogiclist = NULL;
  * The scanner starts here
  **************************************************************************
  */
-#line 14035 "wpp/lex.yy.c"
+#line 14035 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -14196,7 +14196,7 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 299 "wpp/ppl.l"
+#line 299 "ppl.l"
 
 	/*
 	 * Catch line-continuations.
@@ -14210,7 +14210,7 @@ YY_DECL
 	/*
 	 * Detect the leading # of a preprocessor directive.
 	 */
-#line 14214 "wpp/lex.yy.c"
+#line 14214 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -14299,7 +14299,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 312 "wpp/ppl.l"
+#line 312 "ppl.l"
 pp_incl_state.seen_junk++; yy_push_state(pp_pp);
 	YY_BREAK
 /*
@@ -14307,107 +14307,107 @@ pp_incl_state.seen_junk++; yy_push_state(pp_pp);
 	 */
 case 2:
 YY_RULE_SETUP
-#line 317 "wpp/ppl.l"
+#line 317 "ppl.l"
 if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE;} else {yy_pp_state(pp_eol);}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 318 "wpp/ppl.l"
+#line 318 "ppl.l"
 if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE_NEXT;} else {yy_pp_state(pp_eol);}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 319 "wpp/ppl.l"
+#line 319 "ppl.l"
 yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol);
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 320 "wpp/ppl.l"
+#line 320 "ppl.l"
 yy_pp_state(pp_eol);	if(yy_top_state() != pp_ignore) return tERROR;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 321 "wpp/ppl.l"
+#line 321 "ppl.l"
 yy_pp_state(pp_eol);	if(yy_top_state() != pp_ignore) return tWARNING;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 322 "wpp/ppl.l"
+#line 322 "ppl.l"
 yy_pp_state(pp_eol);	if(yy_top_state() != pp_ignore) return tPRAGMA;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 323 "wpp/ppl.l"
+#line 323 "ppl.l"
 yy_pp_state(pp_eol);	if(yy_top_state() != pp_ignore) return tPPIDENT;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 324 "wpp/ppl.l"
+#line 324 "ppl.l"
 if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 325 "wpp/ppl.l"
+#line 325 "ppl.l"
 yy_pp_state(pp_ifd);	return tIFDEF;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 326 "wpp/ppl.l"
+#line 326 "ppl.l"
 pp_incl_state.seen_junk--; yy_pp_state(pp_ifd);	return tIFNDEF;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 327 "wpp/ppl.l"
+#line 327 "ppl.l"
 yy_pp_state(pp_if);	return tIF;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 328 "wpp/ppl.l"
+#line 328 "ppl.l"
 yy_pp_state(pp_if);	return tELIF;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 329 "wpp/ppl.l"
+#line 329 "ppl.l"
 yy_pp_state(pp_endif);  return tELSE;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 330 "wpp/ppl.l"
+#line 330 "ppl.l"
 yy_pp_state(pp_endif);  return tENDIF;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 331 "wpp/ppl.l"
+#line 331 "ppl.l"
 if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);}
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 332 "wpp/ppl.l"
+#line 332 "ppl.l"
 if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);}
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 333 "wpp/ppl.l"
+#line 333 "ppl.l"
 pperror("Invalid preprocessor token '%s'", pptext);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 334 "wpp/ppl.l"
+#line 334 "ppl.l"
 newline(1); yy_pop_state(); return tNL;	/* This could be the null-token */
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 335 "wpp/ppl.l"
+#line 335 "ppl.l"
 newline(0);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 336 "wpp/ppl.l"
+#line 336 "ppl.l"
 pperror("Preprocessor junk '%s'", pptext);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 337 "wpp/ppl.l"
+#line 337 "ppl.l"
 return *pptext;
 	YY_BREAK
 /*
@@ -14415,37 +14415,37 @@ return *pptext;
 	 */
 case 23:
 YY_RULE_SETUP
-#line 342 "wpp/ppl.l"
+#line 342 "ppl.l"
 return make_number(10, &pplval, pptext, ppleng);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 343 "wpp/ppl.l"
+#line 343 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_iqs);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 344 "wpp/ppl.l"
+#line 344 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 345 "wpp/ppl.l"
+#line 345 "ppl.l"
 ;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 346 "wpp/ppl.l"
+#line 346 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 347 "wpp/ppl.l"
+#line 347 "ppl.l"
 newline(0);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 348 "wpp/ppl.l"
+#line 348 "ppl.l"
 pperror(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line");
 	YY_BREAK
 /*
@@ -14453,22 +14453,22 @@ pperror(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing j
 	 */
 case 30:
 YY_RULE_SETUP
-#line 353 "wpp/ppl.l"
+#line 353 "ppl.l"
 ;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 354 "wpp/ppl.l"
+#line 354 "ppl.l"
 newline(1);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 355 "wpp/ppl.l"
+#line 355 "ppl.l"
 newline(0);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 356 "wpp/ppl.l"
+#line 356 "ppl.l"
 ;
 	YY_BREAK
 /*
@@ -14479,107 +14479,107 @@ YY_RULE_SETUP
 	 */
 case 34:
 YY_RULE_SETUP
-#line 365 "wpp/ppl.l"
+#line 365 "ppl.l"
 return make_number(8, &pplval, pptext, ppleng);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 366 "wpp/ppl.l"
+#line 366 "ppl.l"
 pperror("Invalid octal digit");
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 367 "wpp/ppl.l"
+#line 367 "ppl.l"
 return make_number(10, &pplval, pptext, ppleng);
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 368 "wpp/ppl.l"
+#line 368 "ppl.l"
 return make_number(16, &pplval, pptext, ppleng);
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 369 "wpp/ppl.l"
+#line 369 "ppl.l"
 pperror("Invalid hex number");
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 370 "wpp/ppl.l"
+#line 370 "ppl.l"
 yy_push_state(pp_defined); return tDEFINED;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 371 "wpp/ppl.l"
+#line 371 "ppl.l"
 return tLSHIFT;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 372 "wpp/ppl.l"
+#line 372 "ppl.l"
 return tRSHIFT;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 373 "wpp/ppl.l"
+#line 373 "ppl.l"
 return tLOGAND;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 374 "wpp/ppl.l"
+#line 374 "ppl.l"
 return tLOGOR;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 375 "wpp/ppl.l"
+#line 375 "ppl.l"
 return tEQ;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 376 "wpp/ppl.l"
+#line 376 "ppl.l"
 return tNE;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 377 "wpp/ppl.l"
+#line 377 "ppl.l"
 return tLTE;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 378 "wpp/ppl.l"
+#line 378 "ppl.l"
 return tGTE;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 379 "wpp/ppl.l"
+#line 379 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 380 "wpp/ppl.l"
+#line 380 "ppl.l"
 newline(0);
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 381 "wpp/ppl.l"
+#line 381 "ppl.l"
 pperror("Junk in conditional expression");
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 382 "wpp/ppl.l"
+#line 382 "ppl.l"
 ;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 383 "wpp/ppl.l"
+#line 383 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs);
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 384 "wpp/ppl.l"
+#line 384 "ppl.l"
 pperror("String constants not allowed in conditionals");
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 385 "wpp/ppl.l"
+#line 385 "ppl.l"
 return *pptext;
 	YY_BREAK
 /*
@@ -14588,27 +14588,27 @@ return *pptext;
 	 */
 case 55:
 YY_RULE_SETUP
-#line 391 "wpp/ppl.l"
+#line 391 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tIDENT;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 392 "wpp/ppl.l"
+#line 392 "ppl.l"
 ;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 393 "wpp/ppl.l"
+#line 393 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 394 "wpp/ppl.l"
+#line 394 "ppl.l"
 newline(0);
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 395 "wpp/ppl.l"
+#line 395 "ppl.l"
 pperror("Identifier expected");
 	YY_BREAK
 /*
@@ -14616,22 +14616,22 @@ pperror("Identifier expected");
 	 */
 case 60:
 YY_RULE_SETUP
-#line 400 "wpp/ppl.l"
+#line 400 "ppl.l"
 ;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 401 "wpp/ppl.l"
+#line 401 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 402 "wpp/ppl.l"
+#line 402 "ppl.l"
 newline(0);
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 403 "wpp/ppl.l"
+#line 403 "ppl.l"
 pperror("Garbage after #else or #endif.");
 	YY_BREAK
 /*
@@ -14641,27 +14641,27 @@ pperror("Garbage after #else or #endif.");
 	 */
 case 64:
 YY_RULE_SETUP
-#line 410 "wpp/ppl.l"
+#line 410 "ppl.l"
 yy_pop_state(); pplval.cptr = pp_xstrdup(pptext); return tIDENT;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 411 "wpp/ppl.l"
+#line 411 "ppl.l"
 ;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 412 "wpp/ppl.l"
+#line 412 "ppl.l"
 return *pptext;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 413 "wpp/ppl.l"
+#line 413 "ppl.l"
 newline(0);
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 414 "wpp/ppl.l"
+#line 414 "ppl.l"
 pperror("Identifier expected");
 	YY_BREAK
 /*
@@ -14672,27 +14672,27 @@ pperror("Identifier expected");
 	 */
 case 69:
 YY_RULE_SETUP
-#line 422 "wpp/ppl.l"
+#line 422 "ppl.l"
 if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 423 "wpp/ppl.l"
+#line 423 "ppl.l"
 if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 424 "wpp/ppl.l"
+#line 424 "ppl.l"
 if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 425 "wpp/ppl.l"
+#line 425 "ppl.l"
 newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 426 "wpp/ppl.l"
+#line 426 "ppl.l"
 newline(0);
 	YY_BREAK
 /*
@@ -14700,27 +14700,27 @@ newline(0);
 	 */
 case 74:
 YY_RULE_SETUP
-#line 431 "wpp/ppl.l"
+#line 431 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); pplval.cptr[ppleng-1] = '\0'; yy_pp_state(pp_macro);  return tMACRO;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 432 "wpp/ppl.l"
+#line 432 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); yy_pp_state(pp_define); return tDEFINE;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 433 "wpp/ppl.l"
+#line 433 "ppl.l"
 ;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 434 "wpp/ppl.l"
+#line 434 "ppl.l"
 newline(0);
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 435 "wpp/ppl.l"
+#line 435 "ppl.l"
 perror("Identifier expected");
 	YY_BREAK
 /*
@@ -14728,37 +14728,37 @@ perror("Identifier expected");
 	 */
 case 79:
 YY_RULE_SETUP
-#line 440 "wpp/ppl.l"
+#line 440 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 441 "wpp/ppl.l"
+#line 441 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 442 "wpp/ppl.l"
+#line 442 "ppl.l"
 newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 443 "wpp/ppl.l"
+#line 443 "ppl.l"
 newline(0);
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 444 "wpp/ppl.l"
+#line 444 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 445 "wpp/ppl.l"
+#line 445 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs);
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 446 "wpp/ppl.l"
+#line 446 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	YY_BREAK
 /*
@@ -14766,37 +14766,37 @@ new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	 */
 case 86:
 YY_RULE_SETUP
-#line 451 "wpp/ppl.l"
+#line 451 "ppl.l"
 yy_pp_state(pp_mbody); return tMACROEND;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 452 "wpp/ppl.l"
+#line 452 "ppl.l"
 ;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 453 "wpp/ppl.l"
+#line 453 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tIDENT;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 454 "wpp/ppl.l"
+#line 454 "ppl.l"
 return ',';
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 455 "wpp/ppl.l"
+#line 455 "ppl.l"
 return tELIPSIS;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 456 "wpp/ppl.l"
+#line 456 "ppl.l"
 pperror("Argument identifier expected");
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 457 "wpp/ppl.l"
+#line 457 "ppl.l"
 newline(0);
 	YY_BREAK
 /*
@@ -14804,57 +14804,57 @@ newline(0);
 	 */
 case 93:
 YY_RULE_SETUP
-#line 462 "wpp/ppl.l"
+#line 462 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 463 "wpp/ppl.l"
+#line 463 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tIDENT;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 464 "wpp/ppl.l"
+#line 464 "ppl.l"
 return tCONCAT;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 465 "wpp/ppl.l"
+#line 465 "ppl.l"
 return tSTRINGIZE;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 466 "wpp/ppl.l"
+#line 466 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 467 "wpp/ppl.l"
+#line 467 "ppl.l"
 pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 468 "wpp/ppl.l"
+#line 468 "ppl.l"
 newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 469 "wpp/ppl.l"
+#line 469 "ppl.l"
 newline(0);
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 470 "wpp/ppl.l"
+#line 470 "ppl.l"
 newline(1); yy_pop_state(); return tNL;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 471 "wpp/ppl.l"
+#line 471 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs);
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 472 "wpp/ppl.l"
+#line 472 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	YY_BREAK
 /*
@@ -14871,12 +14871,12 @@ case 104:
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 483 "wpp/ppl.l"
+#line 483 "ppl.l"
 yy_pp_state(pp_macscan);
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 484 "wpp/ppl.l"
+#line 484 "ppl.l"
 {
 		if(yy_top_state() != pp_macscan)
 			newline(0);
@@ -14884,12 +14884,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 488 "wpp/ppl.l"
+#line 488 "ppl.l"
 newline(0);
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 489 "wpp/ppl.l"
+#line 489 "ppl.l"
 {
 		macexpstackentry_t *mac = pop_macro();
 		yy_pop_state();
@@ -14904,7 +14904,7 @@ YY_RULE_SETUP
 	 */
 case 108:
 YY_RULE_SETUP
-#line 501 "wpp/ppl.l"
+#line 501 "ppl.l"
 {
 		if(++MACROPARENTHESES() > 1)
 			add_text_to_macro(pptext, ppleng);
@@ -14912,7 +14912,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 505 "wpp/ppl.l"
+#line 505 "ppl.l"
 {
 		if(--MACROPARENTHESES() == 0)
 		{
@@ -14925,7 +14925,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 514 "wpp/ppl.l"
+#line 514 "ppl.l"
 {
 		if(MACROPARENTHESES() > 1)
 			add_text_to_macro(pptext, ppleng);
@@ -14935,32 +14935,32 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 520 "wpp/ppl.l"
+#line 520 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 521 "wpp/ppl.l"
+#line 521 "ppl.l"
 new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs);
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 522 "wpp/ppl.l"
+#line 522 "ppl.l"
 yy_push_state(pp_comment); add_text_to_macro(" ", 1);
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 523 "wpp/ppl.l"
+#line 523 "ppl.l"
 pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(pptext, ppleng);
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 524 "wpp/ppl.l"
+#line 524 "ppl.l"
 add_text_to_macro(pptext, ppleng);
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 525 "wpp/ppl.l"
+#line 525 "ppl.l"
 newline(0);
 	YY_BREAK
 /*
@@ -14968,22 +14968,22 @@ newline(0);
 	 */
 case 117:
 YY_RULE_SETUP
-#line 530 "wpp/ppl.l"
+#line 530 "ppl.l"
 yy_push_state(pp_comment);
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 531 "wpp/ppl.l"
+#line 531 "ppl.l"
 ;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 532 "wpp/ppl.l"
+#line 532 "ppl.l"
 newline(0);
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 533 "wpp/ppl.l"
+#line 533 "ppl.l"
 yy_pop_state();
 	YY_BREAK
 /*
@@ -14991,7 +14991,7 @@ yy_pop_state();
 	 */
 case 121:
 YY_RULE_SETUP
-#line 538 "wpp/ppl.l"
+#line 538 "ppl.l"
 {
 		if(pptext[ppleng-1] == '\\')
 			ppwarning("C++ style comment ends with an escaped newline (escape ignored)");
@@ -15002,22 +15002,22 @@ YY_RULE_SETUP
 	 */
 case 122:
 YY_RULE_SETUP
-#line 546 "wpp/ppl.l"
+#line 546 "ppl.l"
 pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs);
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 547 "wpp/ppl.l"
+#line 547 "ppl.l"
 pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs);
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 548 "wpp/ppl.l"
+#line 548 "ppl.l"
 add_string(pptext, ppleng);
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 549 "wpp/ppl.l"
+#line 549 "ppl.l"
 {
 		add_string(pptext, ppleng);
 		yy_pop_state();
@@ -15035,7 +15035,6 @@ YY_RULE_SETUP
 			pplval.cptr = get_string();
 			if (is_c_h_include(pplval.cptr, 1)) pass_data=0;
 			else pass_data=1;
-//fprintf(stderr, "%s pass_data %d\n", pplval.cptr, pass_data);
 			return tDQSTRING;
 		default:
 			put_string();
@@ -15044,12 +15043,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 572 "wpp/ppl.l"
+#line 571 "ppl.l"
 add_string(pptext, ppleng);
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 573 "wpp/ppl.l"
+#line 572 "ppl.l"
 {
 		add_string(pptext, ppleng);
 		yy_pop_state();
@@ -15067,12 +15066,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 587 "wpp/ppl.l"
+#line 586 "ppl.l"
 add_string(pptext, ppleng);
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 588 "wpp/ppl.l"
+#line 587 "ppl.l"
 {
 		add_string(pptext, ppleng);
 		yy_pop_state();
@@ -15082,7 +15081,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 594 "wpp/ppl.l"
+#line 593 "ppl.l"
 {
 		/*
 		 * This is tricky; we need to remove the line-continuation
@@ -15110,12 +15109,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 618 "wpp/ppl.l"
+#line 617 "ppl.l"
 add_string(pptext, ppleng);
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 619 "wpp/ppl.l"
+#line 618 "ppl.l"
 {
 		newline(1);
 		add_string(pptext, ppleng);
@@ -15127,7 +15126,7 @@ YY_RULE_SETUP
 	 */
 case 133:
 YY_RULE_SETUP
-#line 628 "wpp/ppl.l"
+#line 627 "ppl.l"
 {
 		pp_entry_t *ppp;
 		pp_incl_state.seen_junk++;
@@ -15175,27 +15174,27 @@ YY_RULE_SETUP
 	 */
 case 134:
 YY_RULE_SETUP
-#line 673 "wpp/ppl.l"
+#line 672 "ppl.l"
 pp_incl_state.seen_junk++; put_buffer(pptext, ppleng);
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 674 "wpp/ppl.l"
+#line 673 "ppl.l"
 put_buffer(pptext, ppleng);
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 675 "wpp/ppl.l"
+#line 674 "ppl.l"
 newline(1);
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 676 "wpp/ppl.l"
+#line 675 "ppl.l"
 newline(0);
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 677 "wpp/ppl.l"
+#line 676 "ppl.l"
 pp_incl_state.seen_junk++; put_buffer(pptext, ppleng);
 	YY_BREAK
 /*
@@ -15204,12 +15203,12 @@ pp_incl_state.seen_junk++; put_buffer(pptext, ppleng);
 	 */
 case 139:
 YY_RULE_SETUP
-#line 683 "wpp/ppl.l"
+#line 682 "ppl.l"
 put_buffer(pptext, ppleng);
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 685 "wpp/ppl.l"
+#line 684 "ppl.l"
 {
 		pplval.cptr=pp_xstrdup(pptext);
         	yy_pop_state();
@@ -15218,12 +15217,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 691 "wpp/ppl.l"
+#line 690 "ppl.l"
 ;
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 693 "wpp/ppl.l"
+#line 692 "ppl.l"
 {
 		new_string(); add_string(pptext,ppleng);yy_push_state(pp_dqs);
 	}
@@ -15234,7 +15233,7 @@ YY_RULE_SETUP
 	 */
 case 143:
 YY_RULE_SETUP
-#line 701 "wpp/ppl.l"
+#line 700 "ppl.l"
 pp_incl_state.seen_junk++; ppwarning("Unmatched text '%c' (0x%02x); please report\n", isprint(*pptext & 0xff) ? *pptext : ' ', *pptext);
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -15259,7 +15258,7 @@ case YY_STATE_EOF(pp_line):
 case YY_STATE_EOF(pp_defined):
 case YY_STATE_EOF(pp_ignore):
 case YY_STATE_EOF(RCINCL):
-#line 703 "wpp/ppl.l"
+#line 702 "ppl.l"
 {
 		YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 		bufferstackentry_t *bep = pop_buffer();
@@ -15284,10 +15283,10 @@ case YY_STATE_EOF(RCINCL):
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 725 "wpp/ppl.l"
+#line 724 "ppl.l"
 ECHO;
 	YY_BREAK
-#line 15291 "wpp/lex.yy.c"
+#line 15290 "lex.yy.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -16172,7 +16171,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 725 "wpp/ppl.l"
+#line 724 "ppl.l"
 
 /*
  **************************************************************************
@@ -16869,7 +16868,7 @@ static int is_c_h_include(char *fname, int quoted)
 	int sl=strlen(fname);
 	if (sl < 2 + 2 * quoted) return 0;
 	if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0;
-        if (fname[sl-2-quoted]!='.') return 0;
+	if (fname[sl-2-quoted]!='.') return 0;
 	return 1;
 }
 
diff --git a/reactos/tools/wpp/ppl.l b/reactos/tools/wpp/ppl.l
index 6a021ee5084..f4f8bc1bbe2 100644
--- a/reactos/tools/wpp/ppl.l
+++ b/reactos/tools/wpp/ppl.l
@@ -563,7 +563,6 @@ includelogicentry_t *pp_includelogiclist = NULL;
 			pplval.cptr = get_string();
 			if (is_c_h_include(pplval.cptr, 1)) pass_data=0;
 			else pass_data=1;
-//fprintf(stderr, "%s pass_data %d\n", pplval.cptr, pass_data);
 			return tDQSTRING;
 		default:
 			put_string();
@@ -1418,7 +1417,7 @@ static int is_c_h_include(char *fname, int quoted)
 	int sl=strlen(fname);
 	if (sl < 2 + 2 * quoted) return 0;
 	if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0;
-        if (fname[sl-2-quoted]!='.') return 0;
+	if (fname[sl-2-quoted]!='.') return 0;
 	return 1;
 }