[PATCH] beginning of #include protection rewrite: cleanup