removed circular dependencies between includes
fixed compilation
comment out some unused types/structs
removed unused type RsCircleInternalId, and moved SSLId and GPGId types to proper rsids
fixed compilation