Merge "Moving #defines to *.c from *.h."