fix wrong Polycode includes
fix namespace traoubles
add empty header for first step