Merge "fix implicit declaration"