Merge "Get declarations from the proper header file"