diff --git a/include/rtl-sdr.h b/include/rtl-sdr.h
index 8e8bf1b..f14acff 100644
--- a/include/rtl-sdr.h
+++ b/include/rtl-sdr.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #include <stdint.h>
 
-typedef int rtlsdr_dev_t;
+typedef struct rtlsdr_dev rtlsdr_dev_t;
 
 uint32_t rtlsdr_get_device_count(void);
 
diff --git a/include/rtlsdr_i2c.h b/include/rtlsdr_i2c.h
index 0877380..56ac9b6 100644
--- a/include/rtlsdr_i2c.h
+++ b/include/rtlsdr_i2c.h
@@ -1,7 +1,7 @@
 #ifndef __I2C_H
 #define __I2C_H
 
-typedef int rtlsdr_dev_t;
+typedef struct rtlsdr_dev rtlsdr_dev_t;
 
 int rtlsdr_i2c_write(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len);
 int rtlsdr_i2c_read(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len);
diff --git a/src/rtl-sdr.c b/src/rtl-sdr.c
index 0ba312c..ae22d8a 100644
--- a/src/rtl-sdr.c
+++ b/src/rtl-sdr.c
@@ -110,7 +110,7 @@ static rtlsdr_device_t devices[] = {
 	{ 0x1d19, 0x1101, "Dexatek DK DVB-T Dongle (Logilink VG0002A)" },
 };
 
-typedef struct {
+typedef struct rtlsdr_dev {
 	struct libusb_device_handle *devh;
 	rtlsdr_tuner_t *tuner;
 	int rate; /* Hz */