10 files changed, 29 insertions, 29 deletions
diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c
index fb38cc1cb..1fbcaa08a 100644
--- a/nuttx/net/igmp/igmp_group.c
+++ b/nuttx/net/igmp/igmp_group.c
@@ -55,10 +55,10 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_init.c b/nuttx/net/igmp/igmp_init.c
index f0f94198a..36f48b547 100644
--- a/nuttx/net/igmp/igmp_init.c
+++ b/nuttx/net/igmp/igmp_init.c
@@ -47,10 +47,10 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c
index 660d9f0b0..b1c39399b 100644
--- a/nuttx/net/igmp/igmp_input.c
+++ b/nuttx/net/igmp/igmp_input.c
@@ -48,10 +48,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c
index 33e5b5140..5dafb0dd6 100644
--- a/nuttx/net/igmp/igmp_join.c
+++ b/nuttx/net/igmp/igmp_join.c
@@ -47,10 +47,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c
index 1b80272ee..f3bfe9f4d 100644
--- a/nuttx/net/igmp/igmp_leave.c
+++ b/nuttx/net/igmp/igmp_leave.c
@@ -48,10 +48,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c
index 937810935..163ad0db5 100644
--- a/nuttx/net/igmp/igmp_mcastmac.c
+++ b/nuttx/net/igmp/igmp_mcastmac.c
@@ -47,9 +47,9 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_msg.c b/nuttx/net/igmp/igmp_msg.c
index ae0155e70..ba4151209 100644
--- a/nuttx/net/igmp/igmp_msg.c
+++ b/nuttx/net/igmp/igmp_msg.c
@@ -47,10 +47,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c
index 522826e29..9f6f8f0a5 100644
--- a/nuttx/net/igmp/igmp_poll.c
+++ b/nuttx/net/igmp/igmp_poll.c
@@ -47,10 +47,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c
index af7da4cfb..64e609827 100644
--- a/nuttx/net/igmp/igmp_send.c
+++ b/nuttx/net/igmp/igmp_send.c
@@ -43,12 +43,12 @@
 #include <arpa/inet.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/uip/uip-ipopt.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/ip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/igmp/igmp_timer.c b/nuttx/net/igmp/igmp_timer.c
index bf7007998..bdcc846b5 100644
--- a/nuttx/net/igmp/igmp_timer.c
+++ b/nuttx/net/igmp/igmp_timer.c
@@ -49,10 +49,10 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-igmp.h>
+#include <nuttx/net/uip.h>
+#include <nuttx/net/igmp.h>
 
-#include "uip/uip_internal.h"
+#include "uip/uip.h"
 
 #ifdef CONFIG_NET_IGMP