Move Material and Stock into public interface
Add interface to set stock object.

Also cleanup some unneeded includes.