diff --git a/etc/visual-studio/libopenthread.vcxproj b/etc/visual-studio/libopenthread.vcxproj
index 3f541d9c3..e2072807f 100644
--- a/etc/visual-studio/libopenthread.vcxproj
+++ b/etc/visual-studio/libopenthread.vcxproj
@@ -77,12 +77,15 @@
+
+
+
@@ -100,9 +103,6 @@
-
-
-
@@ -147,12 +147,15 @@
+
+
+
@@ -165,7 +168,7 @@
-
+
@@ -173,9 +176,6 @@
-
-
-
diff --git a/etc/visual-studio/libopenthread.vcxproj.filters b/etc/visual-studio/libopenthread.vcxproj.filters
index 953f985b7..c7adf3de2 100644
--- a/etc/visual-studio/libopenthread.vcxproj.filters
+++ b/etc/visual-studio/libopenthread.vcxproj.filters
@@ -189,21 +189,18 @@
Source Files
-
- Source Files\thread
-
-
- Source Files\thread
-
-
- Source Files\thread
-
Source Files\mac
Source Files\meshcop
+
+ Source Files\thread
+
+
+ Source Files\thread
+
Source Files\meshcop
@@ -216,6 +213,9 @@
Source Files\meshcop
+
+ Source Files\thread
+
Source Files\meshcop
@@ -353,6 +353,9 @@
Header Files\thread
+
+ Header Files\thread
+
Header Files\thread
@@ -413,21 +416,21 @@
Header Files\thread
-
- Header Files\thread
-
-
- Header Files\thread
-
-
- Header Files\thread
-
Header Files\mac
+
+ Header Files\meshcop
+
Header Files\meshcop
+
+ Header Files\thread
+
+
+ Header Files\thread
+
Header Files\meshcop
@@ -446,6 +449,9 @@
Header Files\meshcop
+
+ Header Files\thread
+
Header Files\crypto
@@ -464,12 +470,6 @@
Header Files\utils
-
- Header Files\meshcop
-
-
- Header Files\thread
-
Header Files\common
diff --git a/etc/visual-studio/libopenthread_k.vcxproj b/etc/visual-studio/libopenthread_k.vcxproj
index 22ab844a5..ece30b5c4 100644
--- a/etc/visual-studio/libopenthread_k.vcxproj
+++ b/etc/visual-studio/libopenthread_k.vcxproj
@@ -85,6 +85,8 @@
+
+
@@ -92,6 +94,7 @@
+
@@ -109,9 +112,6 @@
-
-
-
@@ -159,12 +159,15 @@
+
+
+
@@ -187,9 +190,6 @@
-
-
-
diff --git a/etc/visual-studio/libopenthread_k.vcxproj.filters b/etc/visual-studio/libopenthread_k.vcxproj.filters
index 8e524c3d6..876eb819a 100644
--- a/etc/visual-studio/libopenthread_k.vcxproj.filters
+++ b/etc/visual-studio/libopenthread_k.vcxproj.filters
@@ -189,21 +189,18 @@
Source Files
-
- Source Files\thread
-
-
- Source Files\thread
-
-
- Source Files\thread
-
Source Files\mac
Source Files\meshcop
+
+ Source Files\thread
+
+
+ Source Files\thread
+
Source Files\meshcop
@@ -222,6 +219,9 @@
Source Files\meshcop
+
+ Source Files\thread
+
Source Files\crypto
@@ -407,21 +407,18 @@
Header Files\thread
-
- Header Files\thread
-
-
- Header Files\thread
-
-
- Header Files\thread
-
Header Files\mac
Header Files\meshcop
+
+ Header Files\thread
+
+
+ Header Files\thread
+
Header Files\meshcop
@@ -440,6 +437,9 @@
Header Files\meshcop
+
+ Header Files\thread
+
Header Files\crypto
diff --git a/src/cli/cli_dataset.hpp b/src/cli/cli_dataset.hpp
index c4159336b..a7796b702 100644
--- a/src/cli/cli_dataset.hpp
+++ b/src/cli/cli_dataset.hpp
@@ -37,7 +37,6 @@
#include
#include
-#include
namespace Thread {
namespace Cli {
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 0827a9616..6df8617d3 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -60,6 +60,9 @@ SOURCES_COMMON = \
mac/mac_frame.cpp \
mac/mac_whitelist.cpp \
mac/mac_blacklist.cpp \
+ meshcop/dataset.cpp \
+ meshcop/dataset_manager.cpp \
+ meshcop/tlvs.cpp \
net/icmp6.cpp \
net/ip6.cpp \
net/ip6_address.cpp \
@@ -73,9 +76,6 @@ SOURCES_COMMON = \
thread/key_manager.cpp \
thread/link_quality.cpp \
thread/lowpan.cpp \
- thread/meshcop_dataset.cpp \
- thread/meshcop_dataset_manager.cpp \
- thread/meshcop_tlvs.cpp \
thread/mesh_forwarder.cpp \
thread/mle.cpp \
thread/mle_tlvs.cpp \
@@ -185,6 +185,8 @@ noinst_HEADERS = \
mac/mac_blacklist.hpp \
meshcop/announce_begin_client.hpp \
meshcop/commissioner.hpp \
+ meshcop/dataset.hpp \
+ meshcop/dataset_manager.hpp \
meshcop/dtls.hpp \
meshcop/energy_scan_client.hpp \
meshcop/joiner.hpp \
@@ -195,6 +197,7 @@ noinst_HEADERS = \
meshcop/leader_ftd.hpp \
meshcop/leader_mtd.hpp \
meshcop/panid_query_client.hpp \
+ meshcop/tlvs.hpp \
net/icmp6.hpp \
net/ip6.hpp \
net/ip6_address.hpp \
@@ -217,11 +220,7 @@ noinst_HEADERS = \
thread/key_manager.hpp \
thread/link_quality.hpp \
thread/lowpan.hpp \
- thread/meshcop_tlvs.hpp \
thread/mesh_forwarder.hpp \
- thread/meshcop_dataset.hpp \
- thread/meshcop_dataset_manager.hpp \
- thread/meshcop_tlvs.hpp \
thread/mle.hpp \
thread/mle_constants.hpp \
thread/mle_router.hpp \
diff --git a/src/core/meshcop/announce_begin_client.cpp b/src/core/meshcop/announce_begin_client.cpp
index 9fefb508e..9f428ec3f 100644
--- a/src/core/meshcop/announce_begin_client.cpp
+++ b/src/core/meshcop/announce_begin_client.cpp
@@ -45,7 +45,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp
index a633ad638..41d78b0c4 100644
--- a/src/core/meshcop/commissioner.cpp
+++ b/src/core/meshcop/commissioner.cpp
@@ -48,8 +48,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
diff --git a/src/core/thread/meshcop_dataset.cpp b/src/core/meshcop/dataset.cpp
similarity index 99%
rename from src/core/thread/meshcop_dataset.cpp
rename to src/core/meshcop/dataset.cpp
index d001facb4..3c58c02c9 100644
--- a/src/core/thread/meshcop_dataset.cpp
+++ b/src/core/meshcop/dataset.cpp
@@ -36,10 +36,10 @@
#include
#include
+#include
+#include
#include
-#include
#include
-#include
namespace Thread {
namespace MeshCoP {
diff --git a/src/core/thread/meshcop_dataset.hpp b/src/core/meshcop/dataset.hpp
similarity index 99%
rename from src/core/thread/meshcop_dataset.hpp
rename to src/core/meshcop/dataset.hpp
index 9fedc8553..5435bf0c7 100644
--- a/src/core/thread/meshcop_dataset.hpp
+++ b/src/core/meshcop/dataset.hpp
@@ -36,7 +36,7 @@
#define MESHCOP_DATASET_HPP_
#include
-#include
+#include
namespace Thread {
namespace MeshCoP {
diff --git a/src/core/thread/meshcop_dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp
similarity index 99%
rename from src/core/thread/meshcop_dataset_manager.cpp
rename to src/core/meshcop/dataset_manager.cpp
index 577638ba6..b25e0c535 100644
--- a/src/core/thread/meshcop_dataset_manager.cpp
+++ b/src/core/meshcop/dataset_manager.cpp
@@ -32,7 +32,7 @@
*
*/
-#define WPP_NAME "meshcop_dataset_manager.tmh"
+#define WPP_NAME "dataset_manager.tmh"
#include
@@ -44,11 +44,11 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/src/core/thread/meshcop_dataset_manager.hpp b/src/core/meshcop/dataset_manager.hpp
similarity index 99%
rename from src/core/thread/meshcop_dataset_manager.hpp
rename to src/core/meshcop/dataset_manager.hpp
index 914950b3d..f642fb952 100644
--- a/src/core/thread/meshcop_dataset_manager.hpp
+++ b/src/core/meshcop/dataset_manager.hpp
@@ -39,8 +39,8 @@
#include
#include
+#include
#include
-#include
#include
#include
diff --git a/src/core/meshcop/dtls.hpp b/src/core/meshcop/dtls.hpp
index d8aa0eb5d..a29b376ec 100644
--- a/src/core/meshcop/dtls.hpp
+++ b/src/core/meshcop/dtls.hpp
@@ -38,7 +38,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp
index 360631b72..1962cedf7 100644
--- a/src/core/meshcop/energy_scan_client.cpp
+++ b/src/core/meshcop/energy_scan_client.cpp
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/src/core/meshcop/joiner.hpp b/src/core/meshcop/joiner.hpp
index 155c6f122..535e6cce3 100644
--- a/src/core/meshcop/joiner.hpp
+++ b/src/core/meshcop/joiner.hpp
@@ -42,7 +42,7 @@
#include
#include
#include
-#include
+#include
namespace Thread {
diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp
index 977ddd53b..21151229c 100644
--- a/src/core/meshcop/joiner_router.cpp
+++ b/src/core/meshcop/joiner_router.cpp
@@ -45,8 +45,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
diff --git a/src/core/meshcop/leader_ftd.hpp b/src/core/meshcop/leader_ftd.hpp
index 3af549002..c234045dc 100644
--- a/src/core/meshcop/leader_ftd.hpp
+++ b/src/core/meshcop/leader_ftd.hpp
@@ -37,8 +37,8 @@
#include
#include
#include
+#include
#include
-#include
#include
namespace Thread {
diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp
index cfb6b4199..6aa208b8c 100644
--- a/src/core/meshcop/panid_query_client.cpp
+++ b/src/core/meshcop/panid_query_client.cpp
@@ -39,7 +39,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/src/core/thread/meshcop_tlvs.cpp b/src/core/meshcop/tlvs.cpp
similarity index 99%
rename from src/core/thread/meshcop_tlvs.cpp
rename to src/core/meshcop/tlvs.cpp
index e1ac0e236..08c88a5a2 100644
--- a/src/core/thread/meshcop_tlvs.cpp
+++ b/src/core/meshcop/tlvs.cpp
@@ -32,7 +32,7 @@
*/
#include
-#include
+#include
namespace Thread {
namespace MeshCoP {
diff --git a/src/core/thread/meshcop_tlvs.hpp b/src/core/meshcop/tlvs.hpp
similarity index 100%
rename from src/core/thread/meshcop_tlvs.hpp
rename to src/core/meshcop/tlvs.hpp
diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp
index 7d347305e..76895365b 100644
--- a/src/core/thread/announce_begin_server.cpp
+++ b/src/core/thread/announce_begin_server.cpp
@@ -43,8 +43,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp
index b362f9925..abab0d882 100644
--- a/src/core/thread/energy_scan_server.cpp
+++ b/src/core/thread/energy_scan_server.cpp
@@ -37,8 +37,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index 4663daff4..212356298 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -40,12 +40,12 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp
index 5aa338a4a..a667d544e 100644
--- a/src/core/thread/mle_tlvs.hpp
+++ b/src/core/thread/mle_tlvs.hpp
@@ -39,8 +39,8 @@
#include
#include
#include
+#include
#include
-#include
#include
using Thread::Encoding::BigEndian::HostSwap16;
diff --git a/src/core/thread/network_diag_tlvs.hpp b/src/core/thread/network_diag_tlvs.hpp
index 1d9b2715d..def4d8042 100644
--- a/src/core/thread/network_diag_tlvs.hpp
+++ b/src/core/thread/network_diag_tlvs.hpp
@@ -39,8 +39,8 @@
#include
#include
#include
+#include
#include
-#include
#include
using Thread::Encoding::BigEndian::HostSwap16;
diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp
index 4253b9b16..994d46d5a 100644
--- a/src/core/thread/panid_query_server.cpp
+++ b/src/core/thread/panid_query_server.cpp
@@ -37,8 +37,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp
index ff98d2fc4..14b40ce13 100644
--- a/src/core/thread/thread_netif.hpp
+++ b/src/core/thread/thread_netif.hpp
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -59,7 +60,6 @@
#include
#include
#include
-#include
#include
#include
#include