fix include and definitions
fix namespace swiddle
Merge branch 'master' of github.com:woolstar/tools

Fix cross iterator updates.