diff --git a/.clang-format b/.clang-format
index de0166ea3..d917fcd0b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -51,7 +51,7 @@ IncludeBlocks: Merge
 IncludeCategories:
   - Regex:           '^.*.h"'
     Priority:        1
-  - Regex:           '^.*(boost|gflags|glog|gtest|gnuradio|volk|gnsssdr)/'
+  - Regex:           '^.*(boost|gflags|glog|gtest|gnsssdr|gnuradio|pmt|uhd|volk)/'
     Priority:        2
   - Regex:           '^.*(armadillo|matio)'
     Priority:        2
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
index 11551024a..54a353837 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@@ -33,10 +33,10 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include <glog/logging.h>
-#include <volk/volk.h>
-#include <iostream>
 #include <uhd/exception.hpp>
 #include <uhd/types/device_addr.hpp>
+#include <volk/volk.h>
+#include <iostream>
 #include <utility>
 
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index c500cb586..77603d0aa 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -47,11 +47,11 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
 #include <iostream>
 #include <memory>
-#include <pmt/pmt.h>
 #include <sstream>
 #include <utility>
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index c56ad5ba5..10f1064f5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -45,10 +45,10 @@
 //#include "tracking_loop_filter.h"
 #include "cpu_multicorrelator.h"
 #include <gnuradio/block.h>
+#include <pmt/pmt.h>
 #include <deque>
 #include <fstream>
 #include <map>
-#include <pmt/pmt.h>
 #include <string>
 
 class glonass_l1_ca_dll_pll_c_aid_tracking_cc;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index db43b94aa..96009c777 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -47,10 +47,10 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt.h>
 #include <cmath>
 #include <iostream>
 #include <memory>
-#include <pmt/pmt.h>
 #include <sstream>
 #include <utility>
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 7d5475fd0..0299968b3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -45,11 +45,11 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
 #include <iostream>
 #include <memory>
-#include <pmt/pmt.h>
 #include <sstream>
 #include <utility>
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index 9441262ac..129e4609e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -43,10 +43,10 @@
 //#include "tracking_loop_filter.h"
 #include "cpu_multicorrelator.h"
 #include <gnuradio/block.h>
+#include <pmt/pmt.h>
 #include <deque>
 #include <fstream>
 #include <map>
-#include <pmt/pmt.h>
 #include <string>
 
 class glonass_l2_ca_dll_pll_c_aid_tracking_cc;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index 85895f6af..ec9db011a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -45,10 +45,10 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt.h>
 #include <cmath>
 #include <iostream>
 #include <memory>
-#include <pmt/pmt.h>
 #include <sstream>
 #include <utility>
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index d2128e948..43db468ae 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -43,10 +43,10 @@
 //#include "tracking_loop_filter.h"
 #include "cpu_multicorrelator.h"
 #include <gnuradio/block.h>
+#include <pmt/pmt.h>
 #include <deque>
 #include <fstream>
 #include <map>
-#include <pmt/pmt.h>
 #include <string>
 
 class gps_l1_ca_dll_pll_c_aid_tracking_cc;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 8936c7b0e..457b7e65f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -39,10 +39,10 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt.h>
 #include <cmath>
 #include <iostream>
 #include <memory>
-#include <pmt/pmt.h>
 #include <sstream>
 #include <utility>