Log Message: oops - have to order the includes / tests a bit differently to avoid an unwanted dependency on pth on 1.6.x