diff --git a/core/tox.h b/core/tox.h
index d5e61240..099b53e1 100644
--- a/core/tox.h
+++ b/core/tox.h
@@ -41,14 +41,14 @@ typedef union {
     uint8_t c[4];
     uint16_t s[2];
     uint32_t i;
-} IP;
+} tox_IP;
 
 typedef struct {
-    IP ip;
+    tox_IP ip;
     uint16_t port;
     /* not used for anything right now */
     uint16_t padding;
-} IP_Port;
+} tox_IP_Port;
 
 /* status definitions */
 enum {
@@ -252,7 +252,7 @@ void tox_callback_connectionstatus(Tox *tox, void (*function)(Tox *tox, int, uin
 
 /* Use this function to bootstrap the client
     Sends a get nodes request to the given node with ip port and public_key */
-void tox_bootstrap(Tox *tox, IP_Port ip_port, uint8_t *public_key);
+void tox_bootstrap(Tox *tox, tox_IP_Port ip_port, uint8_t *public_key);
 
 /* returns 0 if we are not connected to the DHT
     returns 1 if we are */
diff --git a/testing/nTox.c b/testing/nTox.c
index 87fec818..9df1e78b 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
     new_lines(idstring);
     strcpy(line, "");
 
-    IP_Port bootstrap_ip_port;
+    tox_IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);