Merge "Add -D option to generate extra declarations"