--- /dev/null
+--- a/libs/parser/yconf.y 2012-01-12 22:37:17.582339777 +0100
++++ b/libs/parser/yconf.y 2012-03-03 23:55:29.889737630 +0100
+@@ -96,7 +96,7 @@
+
+ %{
+ /* Include zconf.hash.c here so it can see the token constants. */
+-#include "zconf.hash.c"
++#include "hconf.c"
+ %}
+
+ %%
+@@ -732,7 +732,7 @@
+ }
+ }
+
+-#include "zconf.lex.c"
++#include "lconf.c"
+ #include "util.c"
+ #include "confdata.c"
+ #include "expr.c"
scripts/kconfig/confdata.c --> libs/parser/confdata.c
scripts/kconfig/expr.c --> libs/parser/expr.c
scripts/kconfig/expr.h --> libs/parser/expr.h
+scripts/kconfig/zconf.gperf --> libs/parser/hconf.gperf
+scripts/kconfig/zconf.l --> libs/parser/lconf.l
scripts/kconfig/lkc.h --> libs/parser/lkc.h
scripts/kconfig/lkc_proto.h --> libs/parser/lkc_proto.h
scripts/kconfig/menu.c --> libs/parser/menu.c
scripts/kconfig/symbol.c --> libs/parser/symbol.c
scripts/kconfig/util.c --> libs/parser/util.c
+scripts/kconfig/zconf.y --> libs/parser/yconf.y
scripts/diffconfig --> misc/diffconfig
scripts/kconfig/kxgettext.c --> misc/kxgettext.c
scripts/kconfig/merge_config.sh --> misc/merge_config.sh