Merge "Remove redundant header file declaration"