coalescing-OK; change header file names