Some fixes
Replaced headerlines for Rule-includes.