BPHE code is close to being ready for full solver (reorganized external includes in c++)

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>