Maybe the best option is to remove CU_SuiteInfo from the user-accessible header files... that way they are forced to use the CU_add_test and CU_add_suite functions instead?