Re-added missing included files to OTKeyring.cpp