Fix includes
Add support for replacing rbm watcher
Clean usages of this_type
Cleanup