Bug 945587 - Move the declarations of kRDFServiceCID to the consumer site
Remove some unneeded #undef's, no bug