some header cleanup
some changes in debian rules