put back the %{ badly removed
add a couple of missing includes that prevent compilation