Hello Oleg,

here are re-based patches -- maybe it'll help to solve build problems.