I include these 3rd-parth repos in the wrong way.

The right way to include them appears to be to use git submodules.
I'm removing these directories and will add them back as submodules.
Lost my changes at some point.  Adding them back.
Added this in the wrong way; going to redo as a git submodule.
Updated info about stuff kept here.