[#858] Explicitly include libraries being used