Include modules with only callbacks in BindingDeclarations.

This commit also includes improvements to the 'use' order in some of the
touched files.