reflect #include changes from IlwisCore