The missing include changes

As was asked for #370 and #371