follow up after renaming classes in openmrn.
Updates includes.
Effect of some renames in the main openmrn tree.