Changes for build after moving logging.[ch] into library