Some functions that are used only by CDS are always compiled. E.g.,

ConstantPoolCache::remove_unshareable_info
Klass::restore_unshareable_info
Method::restore_unshareable_info

They should be placed inside #if INCLUDE_CDS.

Note:
In this RFE, I am just taking out the easy stuff. There are other cases, such as code inside if (DumpSharedSpaces) {...}, that I am ignoring for now.