Fixed architecture detection for installation, added missing include.