Correctly register the component MCA parameters.
Few cleanups in the includes.