diff --git a/src/hidpp10.c b/src/hidpp10.c
index 3bafee06..2ccf244c 100644
--- a/src/hidpp10.c
+++ b/src/hidpp10.c
@@ -1203,20 +1203,25 @@ hidpp10_get_device_info(struct hidpp10_device *dev)
 	uint32_t feature_mask, notifications;
 	uint8_t reflect;
 	int i;
+	uint16_t xres, yres;
+	uint16_t refresh_rate;
+	enum hidpp10_led_status led[6];
+	int8_t current_profile;
+	struct hidpp10_profile profiles[HIDPP10_NUM_PROFILES];
 
 	hidpp10_get_individual_features(dev, &feature_mask);
 	hidpp10_get_hidpp_notifications(dev, &notifications);
 
-	hidpp10_get_current_resolution(dev, &dev->xres, &dev->yres);
-	hidpp10_get_led_status(dev, dev->led);
-	hidpp10_get_usb_refresh_rate(dev, &dev->refresh_rate);
+	hidpp10_get_current_resolution(dev, &xres, &yres);
+	hidpp10_get_led_status(dev, led);
+	hidpp10_get_usb_refresh_rate(dev, &refresh_rate);
 
 	hidpp10_get_optical_sensor_settings(dev, &reflect);
 
-	hidpp10_get_current_profile(dev, &dev->current_profile);
+	hidpp10_get_current_profile(dev, &current_profile);
 
 	for (i = 0; i < HIDPP10_NUM_PROFILES; i++)
-		hidpp10_get_profile(dev, i, &dev->profiles[i]);
+		hidpp10_get_profile(dev, i, &profiles[i]);
 
 	return 0;
 }
diff --git a/src/hidpp10.h b/src/hidpp10.h
index 10fe111c..41181404 100644
--- a/src/hidpp10.h
+++ b/src/hidpp10.h
@@ -509,17 +509,6 @@ hidpp10_get_firmare_information(struct hidpp10_device *dev,
 struct hidpp10_device  {
 	struct hidpp_device base;
 	unsigned index;
-	char name[15];
 	uint16_t wpid;
-	uint8_t report_interval;
-	uint8_t device_type;
-	uint8_t fw_major;
-	uint8_t fw_minor;
-	uint8_t build;
-	uint16_t xres, yres;
-	uint16_t refresh_rate;
-	enum hidpp10_led_status led[6];
-	int8_t current_profile;
-	struct hidpp10_profile profiles[HIDPP10_NUM_PROFILES];
 };
 #endif /* HIDPP_10_H */