WOTest r201, 3 items changed

Fix problems with header file inclusion after doing a full clean (wiping out the shared built products folder)