Changes for latest version of OT with .hpp headers

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>