diff --git a/core.lib b/core.lib
index 1029889dc0..4d9802479f 100644
--- a/core.lib
+++ b/core.lib
@@ -1 +1 @@
-https://github.com/mbedmicro/mbed/#d0db5c94e5ce899412280d8c71d65850e0c8b30b
+https://github.com/mbedmicro/mbed/#42561b91931e793fe0151fbd3852c924fe394016
diff --git a/features/FEATURE_IPV6/atmel-rf-driver.lib b/features/FEATURE_IPV6/atmel-rf-driver.lib
deleted file mode 100644
index 2e57d0fc32..0000000000
--- a/features/FEATURE_IPV6/atmel-rf-driver.lib
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/ARMmbed/atmel-rf-driver/#0e3cc04ffd2dc36c0d3edd6be5692fdc5bd9e682
diff --git a/features/FEATURE_CLIENT/mbed-mesh-api.lib b/features/FEATURE_IPV6/mbed-mesh-api.lib
similarity index 100%
rename from features/FEATURE_CLIENT/mbed-mesh-api.lib
rename to features/FEATURE_IPV6/mbed-mesh-api.lib
diff --git a/features/NetworkSocketAPI/Socket.cpp b/features/NetworkSocketAPI/Socket.cpp
index 49b92f4d13..bd9930d849 100644
--- a/features/NetworkSocketAPI/Socket.cpp
+++ b/features/NetworkSocketAPI/Socket.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Socket.h"
+#include "NetworkSocketAPI/Socket.h"
 
 Socket::Socket()
     : _iface(0)
diff --git a/features/NetworkSocketAPI/TCPServer.h b/features/NetworkSocketAPI/TCPServer.h
index 6c32286216..aaae9070e2 100644
--- a/features/NetworkSocketAPI/TCPServer.h
+++ b/features/NetworkSocketAPI/TCPServer.h
@@ -17,7 +17,7 @@
 #ifndef TCPSERVER_H
 #define TCPSERVER_H
 
-#include "Socket.h"
+#include "NetworkSocketAPI/Socket.h"
 #include "TCPSocket.h"
 #include "NetworkStack.h"
 #include "Semaphore.h"
diff --git a/features/NetworkSocketAPI/TCPSocket.h b/features/NetworkSocketAPI/TCPSocket.h
index 4f19b60a0b..6b6d91aec5 100644
--- a/features/NetworkSocketAPI/TCPSocket.h
+++ b/features/NetworkSocketAPI/TCPSocket.h
@@ -17,7 +17,7 @@
 #ifndef TCPSOCKET_H
 #define TCPSOCKET_H
 
-#include "Socket.h"
+#include "NetworkSocketAPI/Socket.h"
 #include "NetworkStack.h"
 #include "Semaphore.h"
 
diff --git a/features/NetworkSocketAPI/UDPSocket.h b/features/NetworkSocketAPI/UDPSocket.h
index 7e3439678e..8db58b9c16 100644
--- a/features/NetworkSocketAPI/UDPSocket.h
+++ b/features/NetworkSocketAPI/UDPSocket.h
@@ -17,7 +17,7 @@
 #ifndef UDPSOCKET_H
 #define UDPSOCKET_H
 
-#include "Socket.h"
+#include "NetworkSocketAPI/Socket.h"
 #include "NetworkStack.h"
 #include "Semaphore.h"