fixed include structure (files should include all needed headers - not more and not less)

[r13523]