Added checks for library inclusions