-extern enum consumerd_state ust_consumerd_state;
-extern enum consumerd_state kernel_consumerd_state;
-
-extern const char default_home_dir[],
- default_tracing_group[],
- default_ust_sock_dir[],
- default_global_apps_pipe[];
+extern enum consumerd_state the_ust_consumerd_state;
+extern enum consumerd_state the_kernel_consumerd_state;