Properly skip includes if not present