Fixed conflicts with merge changes

Additional changes will be needed to ensure that dependencies are actually being removed.

This builds with GCC 4.7