renamed per review
corrected from review comments
renamed to cpp_common_pd_definitions.h