Added some missing *.inl includes