Add missing includes, canonize resource name to avoid conflicts