Fixed library includes