cleaned -Wshadow warnings

[SVN r86730]
(hopefully) fixed use of sizeof on an incomplete type

[SVN r86731]