diff --git a/gnuradio-runtime/apps/gnuradio-config-info.cc b/gnuradio-runtime/apps/gnuradio-config-info.cc
index b4ba29124ed..9ed8cac4593 100644
--- a/gnuradio-runtime/apps/gnuradio-config-info.cc
+++ b/gnuradio-runtime/apps/gnuradio-config-info.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include <gnuradio/constants.h>
-#include <gnuradio/sys_paths.h>
 #include <gnuradio/prefs.h>
-#include <boost/program_options.hpp>
+#include <gnuradio/sys_paths.h>
 #include <boost/format.hpp>
+#include <boost/program_options.hpp>
 #include <iostream>
 
 namespace po = boost::program_options;
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
index 450086c4b95..63f2994df81 100644
--- a/gnuradio-runtime/include/gnuradio/basic_block.h
+++ b/gnuradio-runtime/include/gnuradio/basic_block.h
@@ -24,19 +24,19 @@
 #define INCLUDED_GR_BASIC_BLOCK_H
 
 #include <gnuradio/api.h>
-#include <gnuradio/sptr_magic.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/msg_accepter.h>
 #include <gnuradio/runtime_types.h>
-#include <gnuradio/io_signature.h>
+#include <gnuradio/sptr_magic.h>
 #include <gnuradio/thread/thread.h>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/function.hpp>
 #include <boost/foreach.hpp>
+#include <boost/function.hpp>
 #include <boost/thread/condition_variable.hpp>
-#include <iostream>
-#include <string>
 #include <deque>
+#include <iostream>
 #include <map>
+#include <string>
 
 #ifdef GR_CTRLPORT
 #include <gnuradio/rpcregisterhelpers.h>
diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h
index 51c9e0ac8b4..58b86e3ea3b 100644
--- a/gnuradio-runtime/include/gnuradio/block.h
+++ b/gnuradio-runtime/include/gnuradio/block.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_GR_RUNTIME_BLOCK_H
 #define INCLUDED_GR_RUNTIME_BLOCK_H
 
-#include <gnuradio/config.h>
 #include <gnuradio/api.h>
 #include <gnuradio/basic_block.h>
-#include <gnuradio/tags.h>
+#include <gnuradio/config.h>
 #include <gnuradio/logger.h>
+#include <gnuradio/tags.h>
 #ifdef GR_MPLIB_MPIR
 #include <mpirxx.h>
 #else
@@ -169,8 +169,8 @@ class GR_RUNTIME_API block : public basic_block
      * \param ninput_items	number of input items available on each input stream
      * \param input_items	vector of pointers to the input items, one entry per input
      * stream
-     * \param output_items	vector of pointers to the output items, one entry per output
-     * stream
+     * \param output_items	vector of pointers to the output items, one entry per
+     * output stream
      *
      * \returns number of items actually written to each output stream
      * or WORK_CALLED_PRODUCE or WORK_DONE.  It is OK to return a
diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h
index 8f27fa2de9a..43ed1f22064 100644
--- a/gnuradio-runtime/include/gnuradio/block_detail.h
+++ b/gnuradio-runtime/include/gnuradio/block_detail.h
@@ -24,10 +24,10 @@
 #define INCLUDED_GR_RUNTIME_BLOCK_DETAIL_H
 
 #include <gnuradio/api.h>
+#include <gnuradio/high_res_timer.h>
 #include <gnuradio/runtime_types.h>
-#include <gnuradio/tpb_detail.h>
 #include <gnuradio/tags.h>
-#include <gnuradio/high_res_timer.h>
+#include <gnuradio/tpb_detail.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gnuradio-runtime/include/gnuradio/buffer.h b/gnuradio-runtime/include/gnuradio/buffer.h
index d51fb92629d..a2ba4d6c965 100644
--- a/gnuradio-runtime/include/gnuradio/buffer.h
+++ b/gnuradio-runtime/include/gnuradio/buffer.h
@@ -26,8 +26,8 @@
 #include <gnuradio/api.h>
 #include <gnuradio/runtime_types.h>
 #include <gnuradio/tags.h>
-#include <boost/weak_ptr.hpp>
 #include <gnuradio/thread/thread.h>
+#include <boost/weak_ptr.hpp>
 #include <map>
 
 namespace gr {
diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h
index 5c62ac2d782..157fff512ec 100644
--- a/gnuradio-runtime/include/gnuradio/logger.h
+++ b/gnuradio-runtime/include/gnuradio/logger.h
@@ -37,18 +37,18 @@ typedef int mode_t;
 
 #include <gnuradio/api.h>
 #include <assert.h>
-#include <iostream>
-#include <time.h>
-#include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
-#include <boost/format.hpp>
-#include <pmt/pmt.h>
 #include <log4cpp/Category.hh>
-#include <log4cpp/PropertyConfigurator.hh>
 #include <log4cpp/FileAppender.hh>
-#include <log4cpp/RollingFileAppender.hh>
 #include <log4cpp/OstreamAppender.hh>
 #include <log4cpp/PatternLayout.hh>
+#include <log4cpp/PropertyConfigurator.hh>
+#include <log4cpp/RollingFileAppender.hh>
+#include <pmt/pmt.h>
+#include <time.h>
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
+#include <boost/thread.hpp>
+#include <iostream>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h
index 5f0f54cb2db..6c54c2fd76a 100644
--- a/gnuradio-runtime/include/gnuradio/math.h
+++ b/gnuradio-runtime/include/gnuradio/math.h
@@ -27,9 +27,9 @@
 #ifndef _GR_MATH_H_
 #define _GR_MATH_H_
 
-#include <cmath>
 #include <gnuradio/api.h>
 #include <gnuradio/gr_complex.h>
+#include <cmath>
 
 /*
  * \brief Define commonly used mathematical constants
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
index c8df3db7bdf..604174b8b62 100644
--- a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
@@ -27,8 +27,8 @@
  */
 
 #include <gnuradio/api.h>
-#include <pmt/pmt.h>
 #include <gnuradio/messages/msg_accepter.h>
+#include <pmt/pmt.h>
 
 namespace gr {
 namespace messages {
diff --git a/gnuradio-runtime/include/gnuradio/nco.h b/gnuradio-runtime/include/gnuradio/nco.h
index 658bfd75249..7a123065b78 100644
--- a/gnuradio-runtime/include/gnuradio/nco.h
+++ b/gnuradio-runtime/include/gnuradio/nco.h
@@ -23,12 +23,12 @@
 #ifndef _GR_NCO_H_
 #define _GR_NCO_H_
 
-#include <gnuradio/sincos.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/include/gnuradio/prefs.h b/gnuradio-runtime/include/gnuradio/prefs.h
index a8f66af785d..038d89e2f7d 100644
--- a/gnuradio-runtime/include/gnuradio/prefs.h
+++ b/gnuradio-runtime/include/gnuradio/prefs.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_PREFS_H
 
 #include <gnuradio/api.h>
-#include <string>
-#include <map>
 #include <gnuradio/thread/thread.h>
+#include <map>
+#include <string>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/include/gnuradio/py_feval.h b/gnuradio-runtime/include/gnuradio/py_feval.h
index ab7a0dd8568..cf3aa96d2b6 100644
--- a/gnuradio-runtime/include/gnuradio/py_feval.h
+++ b/gnuradio-runtime/include/gnuradio/py_feval.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_PY_FEVAL_H
 #define INCLUDED_GR_PY_FEVAL_H
 
+#include <gnuradio/feval.h>
 #include <Python.h>
 #include <pmt/pmt.h>
-#include <gnuradio/feval.h>
 
 class ensure_py_gil_state
 {
diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h
index 87f5e416917..4cc2488e64e 100644
--- a/gnuradio-runtime/include/gnuradio/pycallback_object.h
+++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <iostream>
 #include <gnuradio/rpcregisterhelpers.h>
 #include <pythread.h>
 #include <boost/format.hpp>
+#include <iostream>
 
 enum pyport_t { PYPORT_STRING, PYPORT_FLOAT };
 
diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h
index 89b6b79ba2d..dd160ac9d28 100644
--- a/gnuradio-runtime/include/gnuradio/rpcmanager.h
+++ b/gnuradio-runtime/include/gnuradio/rpcmanager.h
@@ -26,8 +26,8 @@
 #include <gnuradio/api.h>
 #include <gnuradio/rpcmanager_base.h>
 #include <gnuradio/rpcserver_booter_aggregator.h>
-#include <memory>
 #include <iostream>
+#include <memory>
 
 class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
 {
diff --git a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
index 2cfb6ddab48..c1c2118a8ca 100644
--- a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
+++ b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
@@ -22,10 +22,10 @@
 #ifndef RPCPMTCONVERTERS_THRIFT_H
 #define RPCPMTCONVERTERS_THRIFT_H
 
+#include "thrift/gnuradio_types.h"
 #include <pmt/pmt.h>
 #include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
-#include "thrift/gnuradio_types.h"
 
 
 namespace rpcpmtconverter {
diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
index 3e81a76f986..83c57967cc2 100644
--- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
+++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
@@ -23,13 +23,13 @@
 #ifndef RPCREGISTERHELPERS_H
 #define RPCREGISTERHELPERS_H
 
-#include <stdio.h>
-#include <sstream>
-#include <iostream>
-#include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/rpcmanager.h>
-#include <gnuradio/rpcserver_selector.h>
 #include <gnuradio/rpcserver_base.h>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/rpcserver_selector.h>
+#include <stdio.h>
+#include <iostream>
+#include <sstream>
 
 // Fixes circular dependency issue before including block_registry.h
 class rpcbasic_base;
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
index 75484ba1a2d..85be9662e99 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
@@ -23,10 +23,10 @@
 #ifndef RPCSERVER_AGGREGATOR_H
 #define RPCSERVER_AGGREGATOR_H
 
-#include <vector>
-#include <string>
-#include <gnuradio/rpcserver_base.h>
 #include <gnuradio/rpcmanager_base.h>
+#include <gnuradio/rpcserver_base.h>
+#include <string>
+#include <vector>
 
 class rpcserver_aggregator : public virtual rpcserver_base
 {
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
index 579a346d579..0fbbb604ea7 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
@@ -24,8 +24,8 @@
 #define RPCSERVER_BOOTER_AGGREGATOR
 
 #include <gnuradio/api.h>
-#include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/rpcserver_aggregator.h>
+#include <gnuradio/rpcserver_booter_base.h>
 #include <boost/shared_ptr.hpp>
 #include <string>
 
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h
index ca475e57feb..98f72c0e6c2 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h
@@ -23,9 +23,9 @@
 #ifndef RPCSERVER_BOOTER_THRIFT_H
 #define RPCSERVER_BOOTER_THRIFT_H
 
+#include "thrift/ControlPort.h"
 #include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/thrift_server_template.h>
-#include "thrift/ControlPort.h"
 
 class rpcserver_base;
 class rpcserver_thrift;
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h b/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
index cc762acd39f..d79a533a5ae 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
@@ -23,16 +23,16 @@
 #ifndef RPCSERVER_THRIFT_H
 #define RPCSERVER_THRIFT_H
 
-#include <gnuradio/rpcserver_base.h>
-#include <gnuradio/rpcpmtconverters_thrift.h>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <map>
 #include "thrift/ControlPort.h"
 #include "thrift/gnuradio_types.h"
+#include <gnuradio/rpcpmtconverters_thrift.h>
+#include <gnuradio/rpcserver_base.h>
 #include <boost/format.hpp>
 #include <boost/thread/mutex.hpp>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
 
 #define S(x) #x
 #define S_(x) S(x)
diff --git a/gnuradio-runtime/include/gnuradio/tag_checker.h b/gnuradio-runtime/include/gnuradio/tag_checker.h
index 46e736da6af..d7cf0bf7c76 100644
--- a/gnuradio-runtime/include/gnuradio/tag_checker.h
+++ b/gnuradio-runtime/include/gnuradio/tag_checker.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_RUNTIME_TAG_CHECKER_H
 #define INCLUDED_GR_RUNTIME_TAG_CHECKER_H
 
-#include <vector>
 #include <gnuradio/tags.h>
+#include <vector>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h
index 49306e4b266..eedecfda22d 100644
--- a/gnuradio-runtime/include/gnuradio/thread/thread.h
+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h
@@ -23,12 +23,12 @@
 #define INCLUDED_THREAD_H
 
 #include <gnuradio/api.h>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <boost/thread/barrier.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/thread/barrier.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 #include <vector>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread_group.h b/gnuradio-runtime/include/gnuradio/thread/thread_group.h
index aa2336e944e..c82d0211cd4 100644
--- a/gnuradio-runtime/include/gnuradio/thread/thread_group.h
+++ b/gnuradio-runtime/include/gnuradio/thread/thread_group.h
@@ -17,9 +17,9 @@
 
 #include <gnuradio/api.h>
 #include <gnuradio/thread/thread.h>
-#include <boost/utility.hpp>
-#include <boost/thread/shared_mutex.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/utility.hpp>
 
 namespace gr {
 namespace thread {
diff --git a/gnuradio-runtime/include/gnuradio/thrift_server_template.h b/gnuradio-runtime/include/gnuradio/thrift_server_template.h
index a8ca18cb1a4..1c87e4820ff 100644
--- a/gnuradio-runtime/include/gnuradio/thrift_server_template.h
+++ b/gnuradio-runtime/include/gnuradio/thrift_server_template.h
@@ -23,18 +23,18 @@
 #ifndef THRIFT_SERVER_TEMPLATE_H
 #define THRIFT_SERVER_TEMPLATE_H
 
-#include <gnuradio/prefs.h>
 #include <gnuradio/logger.h>
+#include <gnuradio/prefs.h>
 #include <gnuradio/thrift_application_base.h>
 #include <iostream>
 
+#include "thrift/ControlPort.h"
+#include <thrift/concurrency/PlatformThreadFactory.h>
+#include <thrift/concurrency/ThreadManager.h>
 #include <thrift/server/TSimpleServer.h>
 #include <thrift/server/TThreadPoolServer.h>
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/transport/TServerSocket.h>
 #include <thrift/transport/TBufferTransports.h>
-#include "thrift/ControlPort.h"
+#include <thrift/transport/TServerSocket.h>
 
 using namespace apache;
 
diff --git a/gnuradio-runtime/include/gnuradio/tpb_detail.h b/gnuradio-runtime/include/gnuradio/tpb_detail.h
index db857393fd4..fb8b05c2802 100644
--- a/gnuradio-runtime/include/gnuradio/tpb_detail.h
+++ b/gnuradio-runtime/include/gnuradio/tpb_detail.h
@@ -24,8 +24,8 @@
 
 #include <gnuradio/api.h>
 #include <gnuradio/thread/thread.h>
-#include <deque>
 #include <pmt/pmt.h>
+#include <deque>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/include/gnuradio/types.h b/gnuradio-runtime/include/gnuradio/types.h
index f08bf3158d4..2e325ee3e14 100644
--- a/gnuradio-runtime/include/gnuradio/types.h
+++ b/gnuradio-runtime/include/gnuradio/types.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_TYPES_H
 
 #include <gnuradio/api.h>
+#include <stddef.h> // size_t
 #include <boost/shared_ptr.hpp>
 #include <vector>
-#include <stddef.h> // size_t
 
 #include <gnuradio/gr_complex.h>
 
diff --git a/gnuradio-runtime/include/gnuradio/unittests.h b/gnuradio-runtime/include/gnuradio/unittests.h
index 42d7b81d9d3..15482dfd327 100644
--- a/gnuradio-runtime/include/gnuradio/unittests.h
+++ b/gnuradio-runtime/include/gnuradio/unittests.h
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif
diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h
index ea188ca6133..c05c2851ee5 100644
--- a/gnuradio-runtime/include/pmt/pmt.h
+++ b/gnuradio-runtime/include/pmt/pmt.h
@@ -24,14 +24,14 @@
 #define INCLUDED_PMT_H
 
 #include <pmt/api.h>
+#include <stdint.h>
+#include <boost/any.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/any.hpp>
 #include <complex>
-#include <string>
-#include <stdint.h>
 #include <iosfwd>
 #include <stdexcept>
+#include <string>
 #include <vector>
 
 namespace gr {
diff --git a/gnuradio-runtime/include/pmt/pmt_pool.h b/gnuradio-runtime/include/pmt/pmt_pool.h
index b31b051682d..e935b3823ed 100644
--- a/gnuradio-runtime/include/pmt/pmt_pool.h
+++ b/gnuradio-runtime/include/pmt/pmt_pool.h
@@ -22,9 +22,9 @@
 #define INCLUDED_PMT_POOL_H
 
 #include <pmt/api.h>
+#include <boost/thread.hpp>
 #include <cstddef>
 #include <vector>
-#include <boost/thread.hpp>
 
 namespace pmt {
 
diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc
index 60aaa86c46c..bc16617657c 100644
--- a/gnuradio-runtime/lib/basic_block.cc
+++ b/gnuradio-runtime/lib/basic_block.cc
@@ -27,9 +27,9 @@
 #include <gnuradio/basic_block.h>
 #include <gnuradio/block_registry.h>
 #include <gnuradio/logger.h>
-#include <stdexcept>
-#include <sstream>
 #include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index 65399bfc3e6..a09409708e8 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -25,12 +25,12 @@
 #endif
 
 #include <gnuradio/block.h>
-#include <gnuradio/block_registry.h>
 #include <gnuradio/block_detail.h>
+#include <gnuradio/block_registry.h>
 #include <gnuradio/buffer.h>
 #include <gnuradio/prefs.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc
index 9f0d7ded5ec..eb08c84de40 100644
--- a/gnuradio-runtime/lib/block_executor.cc
+++ b/gnuradio-runtime/lib/block_executor.cc
@@ -24,17 +24,17 @@
 #include "config.h"
 #endif
 
-#include <block_executor.h>
 #include <gnuradio/block.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/buffer.h>
 #include <gnuradio/prefs.h>
-#include <boost/thread.hpp>
+#include <assert.h>
+#include <block_executor.h>
+#include <stdio.h>
 #include <boost/format.hpp>
+#include <boost/thread.hpp>
 #include <iostream>
 #include <limits>
-#include <assert.h>
-#include <stdio.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc
index 67f9990c4af..7ccbeaddfc7 100644
--- a/gnuradio-runtime/lib/block_gateway_impl.cc
+++ b/gnuradio-runtime/lib/block_gateway_impl.cc
@@ -21,8 +21,8 @@
 
 #include "block_gateway_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <boost/bind.hpp>
+#include <iostream>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index e66e9ed6c67..cc9d991c957 100644
--- a/gnuradio-runtime/lib/buffer.cc
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -23,14 +23,13 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <algorithm>
+#include "vmcircbuf.h"
 #include <gnuradio/buffer.h>
 #include <gnuradio/math.h>
-#include "vmcircbuf.h"
-#include <stdexcept>
-#include <iostream>
 #include <assert.h>
 #include <algorithm>
+#include <iostream>
+#include <stdexcept>
 
 // the following header is deprecated as of Boost 1.66.0, and the
 // other API was introduced in Boost 1.58.0. Since we still support
diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc
index 3569baf2808..dcfccf9af38 100644
--- a/gnuradio-runtime/lib/circular_file.cc
+++ b/gnuradio-runtime/lib/circular_file.cc
@@ -31,17 +31,17 @@
 #include <sys/mman.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <assert.h>
 #include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include <algorithm>
 #include <stdio.h>
 #include <string.h>
+#include <algorithm>
 
 #ifdef HAVE_IO_H
 #include <io.h>
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
index 7d2453fd36f..6c6c8080894 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/rpcserver_booter_aggregator.h>
 #include <gnuradio/rpcmanager.h>
+#include <gnuradio/rpcserver_booter_aggregator.h>
 #include <gnuradio/rpcserver_selector.h>
 
 bool rpcmanager::make_aggregator(false);
diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
index 05bb936f5a6..73846733b79 100644
--- a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
+++ b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
@@ -19,10 +19,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <boost/assign/ptr_map_inserter.hpp>
-#include <gnuradio/rpcpmtconverters_thrift.h>
-#include <gnuradio/gr_complex.h>
 #include "thrift/gnuradio_types.h"
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/rpcpmtconverters_thrift.h>
+#include <boost/assign/ptr_map_inserter.hpp>
 #include <iostream>
 
 GNURadio::Knob rpcpmtconverter::from_pmt(const pmt::pmt_t& knob)
diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc
index a5017cd17a6..fd63330e1bc 100644
--- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc
+++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/rpcserver_thrift.h>
 #include <gnuradio/rpcserver_booter_thrift.h>
+#include <gnuradio/rpcserver_thrift.h>
 
 #include <boost/asio/ip/host_name.hpp>
 
diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
index 180bb85f3d2..6b715f1082a 100644
--- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
+++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
@@ -20,16 +20,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "thrift/ControlPort.h"
 #include <gnuradio/rpcserver_thrift.h>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
 #include <pmt/pmt.h>
 #include <thrift/protocol/TBinaryProtocol.h>
 #include <thrift/transport/TSocket.h>
 #include <thrift/transport/TTransportUtils.h>
 #include <boost/xpressive/xpressive.hpp>
-#include "thrift/ControlPort.h"
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 #define DEBUG 0
 
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc
index b798e4812eb..a41d150e236 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.cc
+++ b/gnuradio-runtime/lib/flat_flowgraph.cc
@@ -30,9 +30,9 @@
 #include <gnuradio/logger.h>
 #include <gnuradio/prefs.h>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 #include <iostream>
 #include <map>
-#include <boost/format.hpp>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h
index 3630a2a5c8c..75082349e2e 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.h
+++ b/gnuradio-runtime/lib/flat_flowgraph.h
@@ -24,8 +24,8 @@
 #define INCLUDED_GR_RUNTIME_FLAT_FLOWGRAPH_H
 
 #include <gnuradio/api.h>
-#include <gnuradio/flowgraph.h>
 #include <gnuradio/block.h>
+#include <gnuradio/flowgraph.h>
 #include <gnuradio/logger.h>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
index acc1429ae28..11c816f79f1 100644
--- a/gnuradio-runtime/lib/flowgraph.cc
+++ b/gnuradio-runtime/lib/flowgraph.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include <gnuradio/flowgraph.h>
-#include <stdexcept>
-#include <sstream>
 #include <iterator>
+#include <sstream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
index 4c6414c465e..755977c8419 100644
--- a/gnuradio-runtime/lib/hier_block2.cc
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -24,10 +24,10 @@
 #include "config.h"
 #endif
 
+#include "hier_block2_detail.h"
+#include <gnuradio/flowgraph.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/io_signature.h>
-#include <gnuradio/flowgraph.h>
-#include "hier_block2_detail.h"
 #include <iostream>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
index 38925330cb4..59f290bf997 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -27,9 +27,9 @@
 #include "hier_block2_detail.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
-#include <stdexcept>
-#include <sstream>
 #include <boost/format.hpp>
+#include <sstream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
index 7e9aefc2a72..d5bb427ab8b 100644
--- a/gnuradio-runtime/lib/io_signature.cc
+++ b/gnuradio-runtime/lib/io_signature.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/local_sighandler.cc b/gnuradio-runtime/lib/local_sighandler.cc
index 4f3083b3edf..97491b24dea 100644
--- a/gnuradio-runtime/lib/local_sighandler.cc
+++ b/gnuradio-runtime/lib/local_sighandler.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "local_sighandler.h"
-#include <stdexcept>
 #include <stdio.h>
 #include <string.h>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index f3fa86b30af..6aab82b6038 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -32,8 +32,8 @@
 
 #include <gnuradio/logger.h>
 #include <gnuradio/prefs.h>
-#include <stdexcept>
 #include <algorithm>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/math/qa_fxpt.cc b/gnuradio-runtime/lib/math/qa_fxpt.cc
index 16e04b819ac..d54c873846d 100644
--- a/gnuradio-runtime/lib/math/qa_fxpt.cc
+++ b/gnuradio-runtime/lib/math/qa_fxpt.cc
@@ -26,11 +26,11 @@
 
 #include <gnuradio/fxpt.h>
 #include <gnuradio/math.h>
-#include <boost/test/unit_test.hpp>
-#include <iostream>
+#include <math.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <math.h>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 static const float SIN_COS_TOLERANCE = 1e-5;
 
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.cc b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc
index 2c4a8c327ab..4dc22fcf9a2 100644
--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.cc
+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc
@@ -26,11 +26,11 @@
 
 #include <gnuradio/fxpt_nco.h>
 #include <gnuradio/nco.h>
-#include <boost/test/unit_test.hpp>
-#include <iostream>
+#include <math.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <math.h>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 static const float SIN_COS_TOLERANCE = 1e-5;
 
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc
index a24e38d63b8..202f2da0bfd 100644
--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc
+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc
@@ -26,11 +26,11 @@
 
 #include "vco.h"
 #include <gnuradio/fxpt_vco.h>
-#include <boost/test/unit_test.hpp>
-#include <iostream>
+#include <math.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <math.h>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 static const float SIN_COS_TOLERANCE = 1e-5;
 
diff --git a/gnuradio-runtime/lib/math/qa_math.cc b/gnuradio-runtime/lib/math/qa_math.cc
index 46833286e9d..da129987c25 100644
--- a/gnuradio-runtime/lib/math/qa_math.cc
+++ b/gnuradio-runtime/lib/math/qa_math.cc
@@ -20,8 +20,8 @@
  */
 
 #include <gnuradio/math.h>
-#include <boost/test/unit_test.hpp>
 #include <stdio.h>
+#include <boost/test/unit_test.hpp>
 #include <cmath>
 
 BOOST_AUTO_TEST_CASE(test_binary_slicer1)
diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc
index 9e30c94399d..223e9141fec 100644
--- a/gnuradio-runtime/lib/math/random.cc
+++ b/gnuradio-runtime/lib/math/random.cc
@@ -39,8 +39,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/random.h>
 #include <gnuradio/math.h>
+#include <gnuradio/random.h>
 
 #include <cmath>
 
diff --git a/gnuradio-runtime/lib/math/vco.h b/gnuradio-runtime/lib/math/vco.h
index 1687de6af74..05ca3b9c416 100644
--- a/gnuradio-runtime/lib/math/vco.h
+++ b/gnuradio-runtime/lib/math/vco.h
@@ -23,12 +23,12 @@
 #ifndef _GR_VCO_H_
 #define _GR_VCO_H_
 
-#include <gnuradio/sincos.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/msg_accepter.cc b/gnuradio-runtime/lib/msg_accepter.cc
index 77870ad4985..2ba41b300b6 100644
--- a/gnuradio-runtime/lib/msg_accepter.cc
+++ b/gnuradio-runtime/lib/msg_accepter.cc
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/msg_accepter.h>
 #include <gnuradio/block.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/hier_block2.h>
+#include <gnuradio/msg_accepter.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/pagesize.cc b/gnuradio-runtime/lib/pagesize.cc
index 3a58c3d8d73..d03069ccf89 100644
--- a/gnuradio-runtime/lib/pagesize.cc
+++ b/gnuradio-runtime/lib/pagesize.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pagesize.h"
-#include <unistd.h>
 #include <stdio.h>
+#include <unistd.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index 4adb763e5f1..67e1f557e8c 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -24,13 +24,13 @@
 #include <config.h>
 #endif
 
-#include <vector>
-#include <pmt/pmt.h>
 #include "pmt_int.h"
 #include <gnuradio/messages/msg_accepter.h>
+#include <pmt/pmt.h>
 #include <pmt/pmt_pool.h>
 #include <stdio.h>
 #include <string.h>
+#include <vector>
 
 namespace pmt {
 
diff --git a/gnuradio-runtime/lib/pmt/pmt_int.h b/gnuradio-runtime/lib/pmt/pmt_int.h
index ea3dd5e2c94..4be2391c300 100644
--- a/gnuradio-runtime/lib/pmt/pmt_int.h
+++ b/gnuradio-runtime/lib/pmt/pmt_int.h
@@ -23,9 +23,9 @@
 #define INCLUDED_PMT_INT_H
 
 #include <pmt/pmt.h>
+#include <boost/atomic.hpp>
 #include <boost/utility.hpp>
 #include <boost/version.hpp>
-#include <boost/atomic.hpp>
 
 /*
  * EVERYTHING IN THIS FILE IS PRIVATE TO THE IMPLEMENTATION!
diff --git a/gnuradio-runtime/lib/pmt/pmt_io.cc b/gnuradio-runtime/lib/pmt/pmt_io.cc
index 2c39a0872f6..09c0a54e2ac 100644
--- a/gnuradio-runtime/lib/pmt/pmt_io.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_io.cc
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
-#include <vector>
-#include <pmt/pmt.h>
 #include "pmt_int.h"
-#include <sstream>
+#include <pmt/pmt.h>
 #include <iostream>
+#include <sstream>
+#include <vector>
 
 namespace pmt {
 
diff --git a/gnuradio-runtime/lib/pmt/pmt_pool.cc b/gnuradio-runtime/lib/pmt/pmt_pool.cc
index 066d31296fb..3334e7c5295 100644
--- a/gnuradio-runtime/lib/pmt/pmt_pool.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_pool.cc
@@ -24,8 +24,8 @@
 #endif
 
 #include <pmt/pmt_pool.h>
-#include <algorithm>
 #include <stdint.h>
+#include <algorithm>
 
 namespace pmt {
 
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
index 4f77c0378a4..150f8fa1e5c 100644
--- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
-#include <vector>
-#include <limits>
-#include <pmt/pmt.h>
-#include "pmt_int.h"
 #include "pmt/pmt_serial_tags.h"
+#include "pmt_int.h"
+#include <pmt/pmt.h>
+#include <limits>
+#include <vector>
 
 namespace pmt {
 
diff --git a/gnuradio-runtime/lib/pmt/pmt_unv.cc b/gnuradio-runtime/lib/pmt/pmt_unv.cc
index fc295fb6b35..d6c38165e0d 100644
--- a/gnuradio-runtime/lib/pmt/pmt_unv.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_unv.cc
@@ -26,8 +26,8 @@
 #include <config.h>
 #endif
 
-#include "pmt_unv_int.h"
 #include "pmt_int.h"
+#include "pmt_unv_int.h"
 #include <pmt/pmt.h>
 #include <boost/lexical_cast.hpp>
 #include <vector>
diff --git a/gnuradio-runtime/lib/pmt/pmt_unv_int.h b/gnuradio-runtime/lib/pmt/pmt_unv_int.h
index c2e2617f636..d48d8346367 100644
--- a/gnuradio-runtime/lib/pmt/pmt_unv_int.h
+++ b/gnuradio-runtime/lib/pmt/pmt_unv_int.h
@@ -25,8 +25,8 @@
 
 #include "pmt_int.h"
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace pmt {
 ////////////////////////////////////////////////////////////////////////////
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
index b715d69df4d..ccaf807a61b 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <pmt/api.h> //reason: suppress warnings
 #include <gnuradio/messages/msg_passing.h>
-#include <boost/test/unit_test.hpp>
+#include <pmt/api.h> //reason: suppress warnings
 #include <boost/format.hpp>
+#include <boost/test/unit_test.hpp>
 #include <cstdio>
 #include <cstring>
 #include <sstream>
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc b/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc
index 9dd9452e5e0..8a6d72f9a34 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc
@@ -20,14 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/messages/msg_passing.h>
 #include <pmt/api.h> //reason: suppress warnings
 #include <pmt/pmt.h>
-#include <gnuradio/messages/msg_passing.h>
-#include <boost/test/unit_test.hpp>
 #include <boost/format.hpp>
-#include <sstream>
+#include <boost/test/unit_test.hpp>
 #include <cstdio>
 #include <cstring>
+#include <sstream>
 
 
 using namespace pmt;
diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc
index 218926d3125..a17e51bbef0 100644
--- a/gnuradio-runtime/lib/prefs.cc
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -24,19 +24,19 @@
 #include <config.h>
 #endif
 
+#include <gnuradio/constants.h>
 #include <gnuradio/prefs.h>
 #include <gnuradio/sys_paths.h>
-#include <gnuradio/constants.h>
 
 #include <algorithm>
 #include <fstream>
 #include <iostream>
 
+#include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/program_options.hpp>
 #include <boost/foreach.hpp>
+#include <boost/program_options.hpp>
 namespace fs = boost::filesystem;
 namespace po = boost::program_options;
 typedef std::ifstream::char_type char_t;
diff --git a/gnuradio-runtime/lib/qa_buffer.cc b/gnuradio-runtime/lib/qa_buffer.cc
index 64b1d0fc1f1..1b8e4db3069 100644
--- a/gnuradio-runtime/lib/qa_buffer.cc
+++ b/gnuradio-runtime/lib/qa_buffer.cc
@@ -25,10 +25,10 @@
 #endif
 
 
-#include <gnuradio/random.h>
 #include <gnuradio/buffer.h>
-#include <boost/test/unit_test.hpp>
+#include <gnuradio/random.h>
 #include <stdlib.h>
+#include <boost/test/unit_test.hpp>
 
 
 static void leak_check(void f())
diff --git a/gnuradio-runtime/lib/qa_circular_file.cc b/gnuradio-runtime/lib/qa_circular_file.cc
index 164650819d5..53c98e9f872 100644
--- a/gnuradio-runtime/lib/qa_circular_file.cc
+++ b/gnuradio-runtime/lib/qa_circular_file.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "circular_file.h"
-#include <boost/test/unit_test.hpp>
 #include <unistd.h>
+#include <boost/test/unit_test.hpp>
 
 static const char* test_file = "qa_gr_circular_file.data";
 static const int BUFFER_SIZE = 8192;
diff --git a/gnuradio-runtime/lib/realtime_impl.cc b/gnuradio-runtime/lib/realtime_impl.cc
index de624f9ad7a..f97d3b757ea 100644
--- a/gnuradio-runtime/lib/realtime_impl.cc
+++ b/gnuradio-runtime/lib/realtime_impl.cc
@@ -30,11 +30,11 @@
 #include <sched.h>
 #endif
 
-#include <algorithm>
-#include <math.h>
-#include <string.h>
 #include <errno.h>
+#include <math.h>
 #include <stdio.h>
+#include <string.h>
+#include <algorithm>
 
 #include <iostream>
 
diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h
index 36bec129616..8041771f3cb 100644
--- a/gnuradio-runtime/lib/scheduler.h
+++ b/gnuradio-runtime/lib/scheduler.h
@@ -22,10 +22,10 @@
 #ifndef INCLUDED_GR_SCHEDULER_H
 #define INCLUDED_GR_SCHEDULER_H
 
+#include "flat_flowgraph.h"
 #include <gnuradio/api.h>
-#include <boost/utility.hpp>
 #include <gnuradio/block.h>
-#include "flat_flowgraph.h"
+#include <boost/utility.hpp>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/scheduler_tpb.h b/gnuradio-runtime/lib/scheduler_tpb.h
index a353d1aae0e..152b11c8f3b 100644
--- a/gnuradio-runtime/lib/scheduler_tpb.h
+++ b/gnuradio-runtime/lib/scheduler_tpb.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_GR_SCHEDULER_TPB_H
 #define INCLUDED_GR_SCHEDULER_TPB_H
 
+#include "scheduler.h"
 #include <gnuradio/api.h>
 #include <gnuradio/thread/thread_group.h>
-#include "scheduler.h"
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc
index 03693cdc8f8..c55bee7427c 100644
--- a/gnuradio-runtime/lib/sptr_magic.cc
+++ b/gnuradio-runtime/lib/sptr_magic.cc
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/sptr_magic.h>
 #include <gnuradio/hier_block2.h>
+#include <gnuradio/sptr_magic.h>
 #include <map>
 #include <stdexcept>
 
diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc
index 068a38a51da..6305bb40bca 100644
--- a/gnuradio-runtime/lib/sys_paths.cc
+++ b/gnuradio-runtime/lib/sys_paths.cc
@@ -20,8 +20,8 @@
  */
 
 #include <gnuradio/sys_paths.h>
-#include <cstdlib> //getenv
 #include <cstdio>  //P_tmpdir (maybe)
+#include <cstdlib> //getenv
 
 #include <boost/filesystem/path.hpp>
 
diff --git a/gnuradio-runtime/lib/tagged_stream_block.cc b/gnuradio-runtime/lib/tagged_stream_block.cc
index 1617bb36985..da4165b55d4 100644
--- a/gnuradio-runtime/lib/tagged_stream_block.cc
+++ b/gnuradio-runtime/lib/tagged_stream_block.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <boost/format.hpp>
 #include <gnuradio/tagged_stream_block.h>
+#include <boost/format.hpp>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc
index 04fe8a30d68..0a2176c24de 100644
--- a/gnuradio-runtime/lib/test.cc
+++ b/gnuradio-runtime/lib/test.cc
@@ -26,9 +26,9 @@
 
 #include "test.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
-#include <iostream>
 #include <string.h>
+#include <iostream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h
index 51e17ac49a6..ebaea13cfa0 100644
--- a/gnuradio-runtime/lib/test.h
+++ b/gnuradio-runtime/lib/test.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_GR_TEST_H
 #define INCLUDED_GR_TEST_H
 
+#include "test_types.h"
 #include <gnuradio/api.h>
 #include <gnuradio/block.h>
 #include <string>
-#include "test_types.h"
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc
index 85240cbee16..15d433d62d4 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -218,10 +218,10 @@ void set_thread_name(gr_thread_t thread, std::string name)
 
 #else
 
-#include <sstream>
-#include <stdexcept>
 #include <pthread.h>
 #include <sys/prctl.h>
+#include <sstream>
+#include <stdexcept>
 
 namespace gr {
 namespace thread {
diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc
index fa3902c735e..92f4cb7786f 100644
--- a/gnuradio-runtime/lib/top_block.cc
+++ b/gnuradio-runtime/lib/top_block.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include "top_block_impl.h"
-#include <gnuradio/top_block.h>
+#include <gnuradio/high_res_timer.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
-#include <gnuradio/high_res_timer.h>
+#include <gnuradio/top_block.h>
 #include <unistd.h>
 #include <iostream>
 
diff --git a/gnuradio-runtime/lib/top_block_impl.cc b/gnuradio-runtime/lib/top_block_impl.cc
index 70b1e3e87ce..16acb3826da 100644
--- a/gnuradio-runtime/lib/top_block_impl.cc
+++ b/gnuradio-runtime/lib/top_block_impl.cc
@@ -24,17 +24,17 @@
 #include "config.h"
 #endif
 
-#include "top_block_impl.h"
 #include "flat_flowgraph.h"
 #include "scheduler_tpb.h"
-#include <gnuradio/top_block.h>
+#include "top_block_impl.h"
 #include <gnuradio/prefs.h>
+#include <gnuradio/top_block.h>
 
-#include <stdexcept>
-#include <iostream>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <iostream>
+#include <stdexcept>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/top_block_impl.h b/gnuradio-runtime/lib/top_block_impl.h
index d31be2fac21..84611b3f857 100644
--- a/gnuradio-runtime/lib/top_block_impl.h
+++ b/gnuradio-runtime/lib/top_block_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
 #define INCLUDED_GR_TOP_BLOCK_IMPL_H
 
-#include <gnuradio/api.h>
 #include "scheduler.h"
+#include <gnuradio/api.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/tpb_detail.cc b/gnuradio-runtime/lib/tpb_detail.cc
index f5963fc4917..1d354082a0b 100644
--- a/gnuradio-runtime/lib/tpb_detail.cc
+++ b/gnuradio-runtime/lib/tpb_detail.cc
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/tpb_detail.h>
 #include <gnuradio/block.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/buffer.h>
+#include <gnuradio/tpb_detail.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc
index e40c6df16bb..ff70ae197fc 100644
--- a/gnuradio-runtime/lib/tpb_thread_body.cc
+++ b/gnuradio-runtime/lib/tpb_thread_body.cc
@@ -25,9 +25,9 @@
 
 #include "tpb_thread_body.h"
 #include <gnuradio/prefs.h>
-#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
 #include <pmt/pmt.h>
+#include <boost/foreach.hpp>
+#include <boost/thread.hpp>
 #include <iostream>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/tpb_thread_body.h b/gnuradio-runtime/lib/tpb_thread_body.h
index c9196122816..e5342d5f70a 100644
--- a/gnuradio-runtime/lib/tpb_thread_body.h
+++ b/gnuradio-runtime/lib/tpb_thread_body.h
@@ -21,11 +21,11 @@
 #ifndef INCLUDED_GR_TPB_THREAD_BODY_H
 #define INCLUDED_GR_TPB_THREAD_BODY_H
 
+#include "block_executor.h"
 #include <gnuradio/api.h>
 #include <gnuradio/block.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/thread/thread.h>
-#include "block_executor.h"
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/vmcircbuf.cc b/gnuradio-runtime/lib/vmcircbuf.cc
index 59e6187b273..3f17b0ab6d7 100644
--- a/gnuradio-runtime/lib/vmcircbuf.cc
+++ b/gnuradio-runtime/lib/vmcircbuf.cc
@@ -24,21 +24,21 @@
 #include "config.h"
 #endif
 
+#include "local_sighandler.h"
+#include "vmcircbuf.h"
+#include "vmcircbuf_prefs.h"
 #include <assert.h>
-#include <stdexcept>
 #include <stdio.h>
 #include <string.h>
-#include <vector>
 #include <boost/format.hpp>
-#include "vmcircbuf.h"
-#include "vmcircbuf_prefs.h"
-#include "local_sighandler.h"
+#include <stdexcept>
+#include <vector>
 
 // all the factories we know about
 #include "vmcircbuf_createfilemapping.h"
-#include "vmcircbuf_sysv_shm.h"
 #include "vmcircbuf_mmap_shm_open.h"
 #include "vmcircbuf_mmap_tmpfile.h"
+#include "vmcircbuf_sysv_shm.h"
 
 gr::thread::mutex s_vm_mutex;
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
index b215fcfa6af..55f8daace81 100644
--- a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
@@ -24,20 +24,20 @@
 #include "config.h"
 #endif
 
-#include <stdexcept>
 #include <assert.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdexcept>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
-#include <errno.h>
-#include <stdio.h>
 #include "pagesize.h"
 #include "vmcircbuf_createfilemapping.h"
+#include <errno.h>
+#include <stdio.h>
 #include <boost/format.hpp>
 
 namespace gr {
diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
index f289abcd968..e7c4b724b11 100644
--- a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
+++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
@@ -23,8 +23,8 @@
 #ifndef GR_VMCIRCBUF_CREATEFILEMAPPING_H
 #define GR_VMCIRCBUF_CREATEFILEMAPPING_H
 
-#include <gnuradio/api.h>
 #include "vmcircbuf.h"
+#include <gnuradio/api.h>
 
 #ifdef HAVE_CREATEFILEMAPPING
 #include <windows.h>
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
index 3eef159d73d..94f0a26f113 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
@@ -25,20 +25,20 @@
 #endif
 
 #include "vmcircbuf_mmap_shm_open.h"
-#include <stdexcept>
 #include <assert.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdexcept>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
-#include <errno.h>
-#include <stdio.h>
 #include "pagesize.h"
 #include <gnuradio/sys_paths.h>
+#include <errno.h>
+#include <stdio.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
index d0171e6c839..d3cbe4f0189 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
@@ -23,8 +23,8 @@
 #ifndef GR_VMCIRCBUF_MMAP_SHM_OPEN_H
 #define GR_VMCIRCBUF_MMAP_SHM_OPEN_H
 
-#include <gnuradio/api.h>
 #include "vmcircbuf.h"
+#include <gnuradio/api.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
index d9eec36df49..ec5f320ab11 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
@@ -25,22 +25,22 @@
 #endif
 
 #include "vmcircbuf_mmap_tmpfile.h"
-#include <stdexcept>
 #include <assert.h>
-#include <unistd.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <stdexcept>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
-#include <fcntl.h>
+#include "pagesize.h"
+#include <gnuradio/sys_paths.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include "pagesize.h"
-#include <gnuradio/sys_paths.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
index 4f4ae64090f..e2a9ddc51ae 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
@@ -23,8 +23,8 @@
 #ifndef GR_VMCIRCBUF_MMAP_TMPFILE_H
 #define GR_VMCIRCBUF_MMAP_TMPFILE_H
 
-#include <gnuradio/api.h>
 #include "vmcircbuf.h"
+#include <gnuradio/api.h>
 
 namespace gr {
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_prefs.cc b/gnuradio-runtime/lib/vmcircbuf_prefs.cc
index 80c36f189ff..3ff3e5af309 100644
--- a/gnuradio-runtime/lib/vmcircbuf_prefs.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_prefs.cc
@@ -24,16 +24,15 @@
 #include "config.h"
 #endif
 
-#include "vmcircbuf_prefs.h"
 #include "vmcircbuf.h"
+#include "vmcircbuf_prefs.h"
 #include <gnuradio/sys_paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <string.h>
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
index 7f1ccd2d7b3..92e627f78b1 100644
--- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
@@ -25,20 +25,20 @@
 #endif
 
 #include "vmcircbuf_sysv_shm.h"
-#include <stdexcept>
 #include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdexcept>
 #ifdef HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif
 #ifdef HAVE_SYS_SHM_H
 #include <sys/shm.h>
 #endif
+#include "pagesize.h"
 #include <errno.h>
 #include <stdio.h>
-#include "pagesize.h"
 
 #define MAX_SYSV_SHM_ATTEMPTS 3
 
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
index 461d60544e5..fa503ea3127 100644
--- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
@@ -23,8 +23,8 @@
 #ifndef GR_VMCIRCBUF_SYSV_SHM_H
 #define GR_VMCIRCBUF_SYSV_SHM_H
 
-#include <gnuradio/api.h>
 #include "vmcircbuf.h"
+#include <gnuradio/api.h>
 
 namespace gr {
 
diff --git a/gr-analog/include/gnuradio/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h
index d494f13a0be..3356322f1db 100644
--- a/gr-analog/include/gnuradio/analog/agc2_cc.h
+++ b/gr-analog/include/gnuradio/analog/agc2_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC2_CC_H
 #define INCLUDED_ANALOG_AGC2_CC_H
 
-#include <gnuradio/analog/api.h>
 #include <gnuradio/analog/agc2.h>
+#include <gnuradio/analog/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-analog/include/gnuradio/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h
index 96d6a119c9c..8f75831a861 100644
--- a/gr-analog/include/gnuradio/analog/agc2_ff.h
+++ b/gr-analog/include/gnuradio/analog/agc2_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC2_FF_H
 #define INCLUDED_ANALOG_AGC2_FF_H
 
-#include <gnuradio/analog/api.h>
 #include <gnuradio/analog/agc2.h>
+#include <gnuradio/analog/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-analog/include/gnuradio/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h
index 34689c28023..70571ccbce4 100644
--- a/gr-analog/include/gnuradio/analog/agc_cc.h
+++ b/gr-analog/include/gnuradio/analog/agc_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC_CC_H
 #define INCLUDED_ANALOG_AGC_CC_H
 
-#include <gnuradio/analog/api.h>
 #include <gnuradio/analog/agc.h>
+#include <gnuradio/analog/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-analog/include/gnuradio/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h
index 3fc92d59564..d6a54ccf560 100644
--- a/gr-analog/include/gnuradio/analog/agc_ff.h
+++ b/gr-analog/include/gnuradio/analog/agc_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC_FF_H
 #define INCLUDED_ANALOG_AGC_FF_H
 
-#include <gnuradio/analog/api.h>
 #include <gnuradio/analog/agc.h>
+#include <gnuradio/analog/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-analog/include/gnuradio/analog/fastnoise_source.h b/gr-analog/include/gnuradio/analog/fastnoise_source.h
index 35a4fb1351e..3ba10acb6e0 100644
--- a/gr-analog/include/gnuradio/analog/fastnoise_source.h
+++ b/gr-analog/include/gnuradio/analog/fastnoise_source.h
@@ -27,8 +27,8 @@
 #include <gnuradio/analog/api.h>
 #include <gnuradio/analog/noise_type.h>
 #include <gnuradio/sync_block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace analog {
diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc
index ab1922237ff..071110975b6 100644
--- a/gr-analog/lib/cpfsk_bc_impl.cc
+++ b/gr-analog/lib/cpfsk_bc_impl.cc
@@ -23,8 +23,8 @@
 #endif
 
 #include "cpfsk_bc_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 
 namespace gr {
diff --git a/gr-analog/lib/cpm.cc b/gr-analog/lib/cpm.cc
index a0bfb1893e4..51e5b8c71c5 100644
--- a/gr-analog/lib/cpm.cc
+++ b/gr-analog/lib/cpm.cc
@@ -27,8 +27,8 @@
 #include <gnuradio/analog/cpm.h>
 #include <gnuradio/math.h>
 
-#include <cmath>
 #include <cfloat>
+#include <cmath>
 
 namespace gr {
 namespace analog {
diff --git a/gr-analog/lib/fastnoise_source_impl.cc b/gr-analog/lib/fastnoise_source_impl.cc
index 580cf25e9a8..1910001b23a 100644
--- a/gr-analog/lib/fastnoise_source_impl.cc
+++ b/gr-analog/lib/fastnoise_source_impl.cc
@@ -26,8 +26,8 @@
 #endif
 
 #include "fastnoise_source_impl.h"
-#include <gnuradio/xoroshiro128p.h>
 #include <gnuradio/io_signature.h>
+#include <gnuradio/xoroshiro128p.h>
 #include <stdexcept>
 #include <vector>
 
diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc
index f4d0c0ed917..5f2d67c377c 100644
--- a/gr-analog/lib/frequency_modulator_fc_impl.cc
+++ b/gr-analog/lib/frequency_modulator_fc_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "frequency_modulator_fc_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <cmath>
 
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc
index efd576abc04..9f33c8ceac8 100644
--- a/gr-analog/lib/pll_carriertracking_cc_impl.cc
+++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc
@@ -26,8 +26,8 @@
 
 #include "pll_carriertracking_cc_impl.h"
 #include <gnuradio/io_signature.h>
-#include <gnuradio/sincos.h>
 #include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 
 #include <cmath>
 
diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc
index 3c41aa12dfc..9dbb8f5eada 100644
--- a/gr-analog/lib/pll_refout_cc_impl.cc
+++ b/gr-analog/lib/pll_refout_cc_impl.cc
@@ -26,9 +26,9 @@
 
 #include "pll_refout_cc_impl.h"
 #include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
 #include <gnuradio/sincos.h>
 #include <math.h>
-#include <gnuradio/math.h>
 
 namespace gr {
 namespace analog {
diff --git a/gr-analog/lib/pwr_squelch_cc_impl.h b/gr-analog/lib/pwr_squelch_cc_impl.h
index 464275f9039..f9ab67742c2 100644
--- a/gr-analog/lib/pwr_squelch_cc_impl.h
+++ b/gr-analog/lib/pwr_squelch_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H
 #define INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H
 
-#include <gnuradio/analog/pwr_squelch_cc.h>
 #include "squelch_base_cc_impl.h"
+#include <gnuradio/analog/pwr_squelch_cc.h>
 #include <gnuradio/filter/single_pole_iir.h>
 #include <cmath>
 
diff --git a/gr-analog/lib/pwr_squelch_ff_impl.h b/gr-analog/lib/pwr_squelch_ff_impl.h
index d1f7578b943..9eb9e67e88e 100644
--- a/gr-analog/lib/pwr_squelch_ff_impl.h
+++ b/gr-analog/lib/pwr_squelch_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H
 #define INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H
 
-#include <gnuradio/analog/pwr_squelch_ff.h>
 #include "squelch_base_ff_impl.h"
+#include <gnuradio/analog/pwr_squelch_ff.h>
 #include <gnuradio/filter/single_pole_iir.h>
 #include <cmath>
 
diff --git a/gr-analog/lib/sig_source_impl.h b/gr-analog/lib/sig_source_impl.h
index b9786a05d8d..6b6457a1645 100644
--- a/gr-analog/lib/sig_source_impl.h
+++ b/gr-analog/lib/sig_source_impl.h
@@ -25,8 +25,8 @@
 #define SIG_SOURCE_IMPL_H
 
 #include <gnuradio/analog/sig_source.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/fxpt_nco.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace analog {
diff --git a/gr-audio/examples/c++/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc
index bb6f150a4f4..039fa39b924 100644
--- a/gr-audio/examples/c++/dial_tone.cc
+++ b/gr-audio/examples/c++/dial_tone.cc
@@ -37,9 +37,9 @@
  */
 
 // Include header files for each block used in flowgraph
-#include <gnuradio/top_block.h>
 #include <gnuradio/analog/sig_source.h>
 #include <gnuradio/audio/sink.h>
+#include <gnuradio/top_block.h>
 
 using namespace gr;
 
diff --git a/gr-audio/lib/alsa/alsa_impl.h b/gr-audio/lib/alsa/alsa_impl.h
index a85ef166f77..b9eeeaedb5c 100644
--- a/gr-audio/lib/alsa/alsa_impl.h
+++ b/gr-audio/lib/alsa/alsa_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ALSA_IMPL_H
 #define INCLUDED_ALSA_IMPL_H
 
-#include <stdio.h>
 #include <alsa/asoundlib.h>
+#include <stdio.h>
 
 void gri_alsa_dump_hw_params(snd_pcm_t* pcm, snd_pcm_hw_params_t* hwparams, FILE* fp);
 
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index 5df5a83dc6c..7de5de650bd 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "../audio_registry.h"
-#include "alsa_sink.h"
 #include "alsa_impl.h"
+#include "alsa_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h
index 50edc99616f..3e60d20b7fc 100644
--- a/gr-audio/lib/alsa/alsa_sink.h
+++ b/gr-audio/lib/alsa/alsa_sink.h
@@ -29,8 +29,8 @@
 
 #include <gnuradio/audio/sink.h>
 #include <alsa/asoundlib.h>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 82443268c48..c0bea10c712 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "../audio_registry.h"
-#include "alsa_source.h"
 #include "alsa_impl.h"
+#include "alsa_source.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h
index 66d349a840e..9008d858b3c 100644
--- a/gr-audio/lib/alsa/alsa_source.h
+++ b/gr-audio/lib/alsa/alsa_source.h
@@ -29,8 +29,8 @@
 
 #include <gnuradio/audio/source.h>
 #include <alsa/asoundlib.h>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/audio_registry.cc b/gr-audio/lib/audio_registry.cc
index 5c0c6317cb1..2fb085b8590 100644
--- a/gr-audio/lib/audio_registry.cc
+++ b/gr-audio/lib/audio_registry.cc
@@ -20,12 +20,12 @@
  */
 
 #include "audio_registry.h"
-#include <boost/foreach.hpp>
-#include <gnuradio/prefs.h>
 #include <gnuradio/logger.h>
+#include <gnuradio/prefs.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 #include <stdexcept>
 #include <vector>
-#include <iostream>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index 7a7e14706d8..a244c9e9eb8 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "../audio_registry.h"
-#include "jack_sink.h"
 #include "jack_impl.h"
+#include "jack_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h
index 80fc7312d18..c4170001067 100644
--- a/gr-audio/lib/jack/jack_sink.h
+++ b/gr-audio/lib/jack/jack_sink.h
@@ -25,8 +25,8 @@
 #include <gnuradio/audio/sink.h>
 #include <jack/jack.h>
 #include <jack/ringbuffer.h>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index e24e1af6376..7b931f36c21 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "../audio_registry.h"
-#include "jack_source.h"
 #include "jack_impl.h"
+#include "jack_source.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h
index f91b2fad5a3..2fbc97479eb 100644
--- a/gr-audio/lib/jack/jack_source.h
+++ b/gr-audio/lib/jack/jack_source.h
@@ -25,8 +25,8 @@
 #include <gnuradio/audio/source.h>
 #include <jack/jack.h>
 #include <jack/ringbuffer.h>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/oss/oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc
index 972271d6d16..58a6fdccacf 100644
--- a/gr-audio/lib/oss/oss_sink.cc
+++ b/gr-audio/lib/oss/oss_sink.cc
@@ -28,13 +28,13 @@
 #include "oss_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
-#include <sys/soundcard.h>
+#include <fcntl.h>
+#include <stdio.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
+#include <sys/soundcard.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdio.h>
 #include <iostream>
 #include <stdexcept>
 
diff --git a/gr-audio/lib/oss/oss_source.cc b/gr-audio/lib/oss/oss_source.cc
index 14b8a0c969f..267eef7d208 100644
--- a/gr-audio/lib/oss/oss_source.cc
+++ b/gr-audio/lib/oss/oss_source.cc
@@ -28,13 +28,13 @@
 #include "oss_source.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
-#include <sys/soundcard.h>
+#include <fcntl.h>
+#include <stdio.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
+#include <sys/soundcard.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdio.h>
 #include <iostream>
 #include <stdexcept>
 
diff --git a/gr-audio/lib/osx/osx_sink.h b/gr-audio/lib/osx/osx_sink.h
index db7763e1889..16977397211 100644
--- a/gr-audio/lib/osx/osx_sink.h
+++ b/gr-audio/lib/osx/osx_sink.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/audio/sink.h>
 
-#include "osx_common.h"
 #include "circular_buffer.h"
+#include "osx_common.h"
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/osx/osx_source.h b/gr-audio/lib/osx/osx_source.h
index 688ff3c32d0..324e25b0d6e 100644
--- a/gr-audio/lib/osx/osx_source.h
+++ b/gr-audio/lib/osx/osx_source.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/audio/source.h>
 
-#include "osx_common.h"
 #include "circular_buffer.h"
+#include "osx_common.h"
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/portaudio/portaudio_impl.h b/gr-audio/lib/portaudio/portaudio_impl.h
index f57a601ac73..779d7f91ef6 100644
--- a/gr-audio/lib/portaudio/portaudio_impl.h
+++ b/gr-audio/lib/portaudio/portaudio_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_AUDIO_PORTAUDIO_IMPL_H
 #define INCLUDED_AUDIO_PORTAUDIO_IMPL_H
 
-#include <stdio.h>
 #include <portaudio.h>
+#include <stdio.h>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index e9ff3759da1..5619f80a9f2 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -29,15 +29,15 @@
 #endif
 
 #include "../audio_registry.h"
-#include "portaudio_sink.h"
 #include "portaudio_impl.h"
+#include "portaudio_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
-#include <iostream>
+#include <string.h>
 #include <unistd.h>
+#include <iostream>
 #include <stdexcept>
-#include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
 #endif
diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h
index 98e72fc2c28..6fb4ebc2b7c 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.h
+++ b/gr-audio/lib/portaudio/portaudio_sink.h
@@ -25,9 +25,9 @@
 #include <gnuradio/audio/sink.h>
 #include <gnuradio/buffer.h>
 #include <gnuradio/thread/thread.h>
-#include <string>
 #include <portaudio.h>
 #include <stdexcept>
+#include <string>
 //#include <gri_logger.h>
 
 namespace gr {
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index f7853629469..efaf3589ea1 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -29,15 +29,15 @@
 #endif
 
 #include "../audio_registry.h"
-#include "portaudio_source.h"
 #include "portaudio_impl.h"
+#include "portaudio_source.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
-#include <iostream>
+#include <string.h>
 #include <unistd.h>
+#include <iostream>
 #include <stdexcept>
-#include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
 #endif
diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h
index a72cdd41292..ba5fb4e2411 100644
--- a/gr-audio/lib/portaudio/portaudio_source.h
+++ b/gr-audio/lib/portaudio/portaudio_source.h
@@ -26,9 +26,9 @@
 #include <gnuradio/audio/source.h>
 #include <gnuradio/buffer.h>
 #include <gnuradio/thread/thread.h>
-#include <string>
 #include <portaudio.h>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc
index 7c220ff831e..daf460e10c9 100644
--- a/gr-audio/lib/windows/windows_sink.cc
+++ b/gr-audio/lib/windows/windows_sink.cc
@@ -27,17 +27,17 @@
 #include "../audio_registry.h"
 #include "windows_sink.h"
 #include <gnuradio/io_signature.h>
-#include <gnuradio/prefs.h>
 #include <gnuradio/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <gnuradio/prefs.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <iostream>
+#include <sstream>
 #include <stdexcept>
 #include <string>
-#include <sstream>
 
 namespace gr {
 namespace audio {
diff --git a/gr-audio/lib/windows/windows_sink.h b/gr-audio/lib/windows/windows_sink.h
index fcfae94dcb5..2186e3ce350 100644
--- a/gr-audio/lib/windows/windows_sink.h
+++ b/gr-audio/lib/windows/windows_sink.h
@@ -26,8 +26,8 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX // stops windef.h defining max/min under cygwin
 
-#include <windows.h>
 #include <mmsystem.h>
+#include <windows.h>
 
 #include <gnuradio/audio/sink.h>
 #include <string>
diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc
index 5389a2383b5..ae74e53c8fd 100644
--- a/gr-audio/lib/windows/windows_source.cc
+++ b/gr-audio/lib/windows/windows_source.cc
@@ -26,17 +26,17 @@
 
 #include "../audio_registry.h"
 #include "windows_source.h"
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/logger.h>
+#include <gnuradio/prefs.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <iostream>
-#include <stdexcept>
 #include <sstream>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/prefs.h>
-#include <gnuradio/logger.h>
+#include <stdexcept>
 
 
 namespace gr {
diff --git a/gr-audio/lib/windows/windows_source.h b/gr-audio/lib/windows/windows_source.h
index cf858647aa7..2df16670db6 100644
--- a/gr-audio/lib/windows/windows_source.h
+++ b/gr-audio/lib/windows/windows_source.h
@@ -26,8 +26,8 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX // stops windef.h defining max/min under cygwin
 
-#include <windows.h>
 #include <mmsystem.h>
+#include <windows.h>
 
 #include <gnuradio/audio/source.h>
 #include <string>
diff --git a/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
index 2330af5cef4..9f89d003831 100644
--- a/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
+++ b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_BIN_STATISTICS_F_H
 
 #include <gnuradio/blocks/api.h>
-#include <gnuradio/sync_block.h>
-#include <gnuradio/msg_queue.h>
 #include <gnuradio/feval.h>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/copy.h b/gr-blocks/include/gnuradio/blocks/copy.h
index 8305485a13a..f5201f07f34 100644
--- a/gr-blocks/include/gnuradio/blocks/copy.h
+++ b/gr-blocks/include/gnuradio/blocks/copy.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_COPY_H
 #define INCLUDED_GR_COPY_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
index 40ef05ed825..7515fd90442 100644
--- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
+++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE_C_H
 
 #include <gnuradio/blocks/api.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/rpcregisterhelpers.h>
+#include <gnuradio/sync_block.h>
 #include <boost/thread/shared_mutex.hpp>
 
 namespace gr {
diff --git a/gr-blocks/include/gnuradio/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h
index 1589ebae16a..5fd7ea5a2fd 100644
--- a/gr-blocks/include/gnuradio/blocks/deinterleave.h
+++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_DEINTERLEAVE_H
 #define INCLUDED_BLOCKS_DEINTERLEAVE_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/delay.h b/gr-blocks/include/gnuradio/blocks/delay.h
index 771212501b6..d4c42cbeac6 100644
--- a/gr-blocks/include/gnuradio/blocks/delay.h
+++ b/gr-blocks/include/gnuradio/blocks/delay.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_DELAY_H
 #define INCLUDED_BLOCKS_DELAY_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h
index 8b4be52b263..9f0bafcb044 100644
--- a/gr-blocks/include/gnuradio/blocks/interleave.h
+++ b/gr-blocks/include/gnuradio/blocks/interleave.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_INTERLEAVE_H
 #define INCLUDED_BLOCKS_INTERLEAVE_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
index 38d6a3cb3ff..a9a055cfd3c 100644
--- a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
+++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_KEEP_M_IN_N_H
 #define INCLUDED_BLOCKS_KEEP_M_IN_N_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
index f95146ca364..a5bc7dae927 100644
--- a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
+++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
 #define INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h
index 6b83da76bba..6dccda96fd9 100644
--- a/gr-blocks/include/gnuradio/blocks/message_debug.h
+++ b/gr-blocks/include/gnuradio/blocks/message_debug.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_DEBUG_H
 #define INCLUDED_GR_MESSAGE_DEBUG_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/message_strobe.h b/gr-blocks/include/gnuradio/blocks/message_strobe.h
index 2a2fbdae5ba..60047d81736 100644
--- a/gr-blocks/include/gnuradio/blocks/message_strobe.h
+++ b/gr-blocks/include/gnuradio/blocks/message_strobe.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_STROBE_H
 #define INCLUDED_GR_MESSAGE_STROBE_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/message_strobe_random.h b/gr-blocks/include/gnuradio/blocks/message_strobe_random.h
index e481d670e04..a0076052985 100644
--- a/gr-blocks/include/gnuradio/blocks/message_strobe_random.h
+++ b/gr-blocks/include/gnuradio/blocks/message_strobe_random.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_STROBE_RANDOM_H
 #define INCLUDED_GR_MESSAGE_STROBE_RANDOM_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/nop.h b/gr-blocks/include/gnuradio/blocks/nop.h
index f5977e0c202..faf9bdc0ac5 100644
--- a/gr-blocks/include/gnuradio/blocks/nop.h
+++ b/gr-blocks/include/gnuradio/blocks/nop.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_NOP_H
 #define INCLUDED_GR_NOP_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 #include <stddef.h> // size_t
 
 namespace gr {
diff --git a/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h
index 0c384af56ab..0ddf2a465bb 100644
--- a/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h
+++ b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h
@@ -24,8 +24,8 @@
 #ifndef PACKED_TO_UNPACKED_H
 #define PACKED_TO_UNPACKED_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 #include <gnuradio/endianness.h>
 #include <cstdint>
 
diff --git a/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
index 05c3e074140..5b41a6ac101 100644
--- a/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
+++ b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
 #define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_filter.h b/gr-blocks/include/gnuradio/blocks/pdu_filter.h
index f98eb2d7fb6..70b8d8d22ae 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_filter.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_filter.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PDU_FILTER_H
 #define INCLUDED_BLOCKS_PDU_FILTER_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_remove.h b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
index 472729e5496..fb614a5af19 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_remove.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PDU_REMOVE_H
 #define INCLUDED_BLOCKS_PDU_REMOVE_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_set.h b/gr-blocks/include/gnuradio/blocks/pdu_set.h
index c0874bbad5a..0b4f1490d53 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_set.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_set.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PDU_SET_H
 #define INCLUDED_BLOCKS_PDU_SET_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_v.h b/gr-blocks/include/gnuradio/blocks/probe_signal_v.h
index f3e43fe2fb3..d3269c306aa 100644
--- a/gr-blocks/include/gnuradio/blocks/probe_signal_v.h
+++ b/gr-blocks/include/gnuradio/blocks/probe_signal_v.h
@@ -23,10 +23,10 @@
 #ifndef PROBE_SIGNAL_V_H
 #define PROBE_SIGNAL_V_H
 
-#include <vector>
 #include <gnuradio/blocks/api.h>
 #include <gnuradio/sync_block.h>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/random_pdu.h b/gr-blocks/include/gnuradio/blocks/random_pdu.h
index 6bbc506fe09..c2fa0d26235 100644
--- a/gr-blocks/include/gnuradio/blocks/random_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/random_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_RANDOM_PDU_H
 #define INCLUDED_BLOCKS_RANDOM_PDU_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
index 8eb694f8e6b..f4467014f80 100644
--- a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
@@ -24,8 +24,8 @@
 #define INCLUDED_BLOCKS_REPACK_BITS_BB_H
 
 #include <gnuradio/blocks/api.h>
-#include <gnuradio/tagged_stream_block.h>
 #include <gnuradio/endianness.h>
+#include <gnuradio/tagged_stream_block.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
index f91881621e3..be63a17b1c8 100644
--- a/gr-blocks/include/gnuradio/blocks/socket_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_SOCKET_PDU_H
 #define INCLUDED_BLOCKS_SOCKET_PDU_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h
index 9dc0386795c..19118ccf6c7 100644
--- a/gr-blocks/include/gnuradio/blocks/stream_mux.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_STREAM_MUX_H
 #define INCLUDED_BLOCKS_STREAM_MUX_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
index 72548429fae..73ed891473a 100644
--- a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_TAGGED_STREAM_ALIGN_H
 #define INCLUDED_TAGGED_STREAM_ALIGN_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h b/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h
index 593c47c18c6..55bf5a2bc31 100644
--- a/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_TEST_TAG_VARIABLE_RATE_FF_H
 #define INCLUDED_GR_TEST_TAG_VARIABLE_RATE_FF_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
index cda9b586c09..d42fa600a49 100644
--- a/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_TUNTAP_PDU_H
 #define INCLUDED_BLOCKS_TUNTAP_PDU_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h
index 9317e1add5e..51b1b0ff1be 100644
--- a/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h
+++ b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h
@@ -24,8 +24,8 @@
 #ifndef UNPACKED_TO_PACKED_H
 #define UNPACKED_TO_PACKED_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 #include <gnuradio/endianness.h>
 #include <cstdint>
 
diff --git a/gr-blocks/include/gnuradio/blocks/vector_insert.h b/gr-blocks/include/gnuradio/blocks/vector_insert.h
index ee24adca36f..e7774bdc843 100644
--- a/gr-blocks/include/gnuradio/blocks/vector_insert.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_insert.h
@@ -24,8 +24,8 @@
 #ifndef VECTOR_INSERT_H
 #define VECTOR_INSERT_H
 
-#include <gnuradio/blocks/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/api.h>
 #include <cstdint>
 
 namespace gr {
diff --git a/gr-blocks/include/gnuradio/blocks/vector_map.h b/gr-blocks/include/gnuradio/blocks/vector_map.h
index bdf39f1355b..4c5854d2dc5 100644
--- a/gr-blocks/include/gnuradio/blocks/vector_map.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_map.h
@@ -24,8 +24,8 @@
 #define INCLUDED_GR_VECTOR_MAP_H
 
 #include <gnuradio/blocks/api.h>
-#include <vector>
 #include <gnuradio/sync_block.h>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc
index 1b099cde740..7b8693f45da 100644
--- a/gr-blocks/lib/annotator_1to1_impl.cc
+++ b/gr-blocks/lib/annotator_1to1_impl.cc
@@ -27,8 +27,8 @@
 #include "annotator_1to1_impl.h"
 #include <gnuradio/io_signature.h>
 #include <string.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/annotator_alltoall_impl.cc b/gr-blocks/lib/annotator_alltoall_impl.cc
index 8eeb7625e0e..7bb57234509 100644
--- a/gr-blocks/lib/annotator_alltoall_impl.cc
+++ b/gr-blocks/lib/annotator_alltoall_impl.cc
@@ -27,8 +27,8 @@
 #include "annotator_alltoall_impl.h"
 #include <gnuradio/io_signature.h>
 #include <string.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc
index 4ca6f3fde59..4d2239bef7a 100644
--- a/gr-blocks/lib/annotator_raw_impl.cc
+++ b/gr-blocks/lib/annotator_raw_impl.cc
@@ -27,8 +27,8 @@
 #include "annotator_raw_impl.h"
 #include <gnuradio/io_signature.h>
 #include <string.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <stdexcept>
 
 using namespace pmt;
diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
index a3826d5a6e1..8cdc92abea4 100644
--- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc
+++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
@@ -26,8 +26,8 @@
 
 #include "check_lfsr_32k_s_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/complex_to_arg_impl.cc b/gr-blocks/lib/complex_to_arg_impl.cc
index 8f5bf61c81e..74ae3e224bb 100644
--- a/gr-blocks/lib/complex_to_arg_impl.cc
+++ b/gr-blocks/lib/complex_to_arg_impl.cc
@@ -26,8 +26,8 @@
 
 #include "complex_to_arg_impl.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
 #include <gnuradio/math.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/complex_to_magphase_impl.cc b/gr-blocks/lib/complex_to_magphase_impl.cc
index dd72c8e9c82..b44f5648769 100644
--- a/gr-blocks/lib/complex_to_magphase_impl.cc
+++ b/gr-blocks/lib/complex_to_magphase_impl.cc
@@ -26,8 +26,8 @@
 
 #include "complex_to_magphase_impl.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
 #include <gnuradio/math.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.h b/gr-blocks/lib/ctrlport_probe2_b_impl.h
index 8a5f7952c83..e6c62387c4a 100644
--- a/gr-blocks/lib/ctrlport_probe2_b_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_b_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE2_B_IMPL_H
 
 #include <gnuradio/blocks/ctrlport_probe2_b.h>
-#include <gnuradio/rpcregisterhelpers.h>
 #include <gnuradio/rpcbufferedget.h>
+#include <gnuradio/rpcregisterhelpers.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h
index 63d7629e26b..ab4afed6378 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE2_C_IMPL_H
 
 #include <gnuradio/blocks/ctrlport_probe2_c.h>
-#include <gnuradio/rpcregisterhelpers.h>
 #include <gnuradio/rpcbufferedget.h>
+#include <gnuradio/rpcregisterhelpers.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.h b/gr-blocks/lib/ctrlport_probe2_f_impl.h
index 81c79e4d36a..ea012059455 100644
--- a/gr-blocks/lib/ctrlport_probe2_f_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_f_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE2_F_IMPL_H
 
 #include <gnuradio/blocks/ctrlport_probe2_f.h>
-#include <gnuradio/rpcregisterhelpers.h>
 #include <gnuradio/rpcbufferedget.h>
+#include <gnuradio/rpcregisterhelpers.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.h b/gr-blocks/lib/ctrlport_probe2_i_impl.h
index ed59801160f..7747ee41292 100644
--- a/gr-blocks/lib/ctrlport_probe2_i_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_i_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE2_I_IMPL_H
 
 #include <gnuradio/blocks/ctrlport_probe2_i.h>
-#include <gnuradio/rpcregisterhelpers.h>
 #include <gnuradio/rpcbufferedget.h>
+#include <gnuradio/rpcregisterhelpers.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.h b/gr-blocks/lib/ctrlport_probe2_s_impl.h
index 6b3677a4f3c..e7806458f88 100644
--- a/gr-blocks/lib/ctrlport_probe2_s_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_s_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CTRLPORT_PROBE2_S_IMPL_H
 
 #include <gnuradio/blocks/ctrlport_probe2_s.h>
-#include <gnuradio/rpcregisterhelpers.h>
 #include <gnuradio/rpcbufferedget.h>
+#include <gnuradio/rpcregisterhelpers.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/exponentiate_const_cci_impl.cc b/gr-blocks/lib/exponentiate_const_cci_impl.cc
index cd9a287ae58..ec97ef2ee3a 100644
--- a/gr-blocks/lib/exponentiate_const_cci_impl.cc
+++ b/gr-blocks/lib/exponentiate_const_cci_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "exponentiate_const_cci_impl.h"
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 namespace gr {
diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc
index cb16129bcce..1d24bd441df 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.cc
+++ b/gr-blocks/lib/file_descriptor_sink_impl.cc
@@ -26,13 +26,13 @@
 
 #include "file_descriptor_sink_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 #ifdef HAVE_IO_H
 #include <io.h>
diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc
index de47bb85a3e..4ecdf5345c0 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.cc
+++ b/gr-blocks/lib/file_descriptor_source_impl.cc
@@ -26,14 +26,14 @@
 
 #include "file_descriptor_source_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 #ifdef HAVE_IO_H
 #include <io.h>
diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc
index 342ee4573ca..ed75f135c90 100644
--- a/gr-blocks/lib/file_meta_sink_impl.cc
+++ b/gr-blocks/lib/file_meta_sink_impl.cc
@@ -26,12 +26,12 @@
 
 #include "file_meta_sink_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index fcf8228de55..b395d5d8c7d 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -26,12 +26,12 @@
 
 #include "file_meta_source_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h
index 242edce56a3..fd0fbc58e3d 100644
--- a/gr-blocks/lib/file_meta_source_impl.h
+++ b/gr-blocks/lib/file_meta_source_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/blocks/file_meta_source.h>
 #include <gnuradio/tags.h>
-#include <pmt/pmt.h>
 #include <gnuradio/thread/thread.h>
+#include <pmt/pmt.h>
 
 #include <gnuradio/blocks/file_meta_sink.h>
 
diff --git a/gr-blocks/lib/file_sink_base.cc b/gr-blocks/lib/file_sink_base.cc
index 2b10ba93e5d..290e56731ed 100644
--- a/gr-blocks/lib/file_sink_base.cc
+++ b/gr-blocks/lib/file_sink_base.cc
@@ -25,13 +25,13 @@
 #endif
 
 #include <gnuradio/blocks/file_sink_base.h>
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <gnuradio/thread/thread.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
-#include <gnuradio/thread/thread.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc
index b025f449aff..ee8f08d9801 100644
--- a/gr-blocks/lib/file_source_impl.cc
+++ b/gr-blocks/lib/file_source_impl.cc
@@ -24,15 +24,15 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/thread/thread.h>
 #include "file_source_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <gnuradio/thread/thread.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 #ifdef _MSC_VER
 #define GR_FSEEK _fseeki64
diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc
index 4c8ae689d89..5e0584ec4b8 100644
--- a/gr-blocks/lib/float_to_int_impl.cc
+++ b/gr-blocks/lib/float_to_int_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "float_to_int_impl.h"
 #include "float_array_to_int.h"
+#include "float_to_int_impl.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
diff --git a/gr-blocks/lib/float_to_uchar_impl.cc b/gr-blocks/lib/float_to_uchar_impl.cc
index ad75df9eff2..80a828346b2 100644
--- a/gr-blocks/lib/float_to_uchar_impl.cc
+++ b/gr-blocks/lib/float_to_uchar_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "float_to_uchar_impl.h"
 #include "float_array_to_uchar.h"
+#include "float_to_uchar_impl.h"
 #include <gnuradio/io_signature.h>
 
 namespace gr {
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
index ada88cd34ae..b83d311a033 100644
--- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc
+++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "interleaved_short_to_complex_impl.h"
 #include "interleaved_short_array_to_complex.h"
+#include "interleaved_short_to_complex_impl.h"
 #include <gnuradio/io_signature.h>
 
 namespace gr {
diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.h b/gr-blocks/lib/lfsr_32k_source_s_impl.h
index 7705c9f02f0..6a7dcd7cd1b 100644
--- a/gr-blocks/lib/lfsr_32k_source_s_impl.h
+++ b/gr-blocks/lib/lfsr_32k_source_s_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H
 #define INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H
 
-#include <gnuradio/blocks/lfsr_32k_source_s.h>
 #include <gnuradio/blocks/lfsr_32k.h>
+#include <gnuradio/blocks/lfsr_32k_source_s.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-blocks/lib/message_debug_impl.h b/gr-blocks/lib/message_debug_impl.h
index 2faa42a0d01..68bf6fa02ac 100644
--- a/gr-blocks/lib/message_debug_impl.h
+++ b/gr-blocks/lib/message_debug_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_DEBUG_IMPL_H
 #define INCLUDED_GR_MESSAGE_DEBUG_IMPL_H
 
-#include <gnuradio/blocks/message_debug.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/message_debug.h>
 #include <gnuradio/thread/thread.h>
 #include <pmt/pmt.h>
 
diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc
index cf06448ecba..038eeae5a17 100644
--- a/gr-blocks/lib/message_strobe_impl.cc
+++ b/gr-blocks/lib/message_strobe_impl.cc
@@ -26,14 +26,14 @@
 
 #include "message_strobe_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc
index 0a36b6d3802..0ab5d6adc7e 100644
--- a/gr-blocks/lib/message_strobe_random_impl.cc
+++ b/gr-blocks/lib/message_strobe_random_impl.cc
@@ -26,14 +26,14 @@
 
 #include "message_strobe_random_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/message_strobe_random_impl.h b/gr-blocks/lib/message_strobe_random_impl.h
index de70c284198..77eaa005e56 100644
--- a/gr-blocks/lib/message_strobe_random_impl.h
+++ b/gr-blocks/lib/message_strobe_random_impl.h
@@ -24,11 +24,11 @@
 #define INCLUDED_GR_MESSAGE_STROBE_RANDOM_IMPL_H
 
 #include <gnuradio/blocks/message_strobe_random.h>
-#include <boost/random/variate_generator.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/random/poisson_distribution.hpp>
 #include <boost/random/normal_distribution.hpp>
+#include <boost/random/poisson_distribution.hpp>
 #include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/moving_average_impl.h b/gr-blocks/lib/moving_average_impl.h
index bb29e26d239..c2ca07ed818 100644
--- a/gr-blocks/lib/moving_average_impl.h
+++ b/gr-blocks/lib/moving_average_impl.h
@@ -25,8 +25,8 @@
 #define MOVING_AVERAGE_IMPL_H
 
 #include <gnuradio/blocks/moving_average.h>
-#include <vector>
 #include <algorithm>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc
index eb0a77409d0..b9c7ed1dce9 100644
--- a/gr-blocks/lib/multiply_matrix_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
+#include "multiply_matrix_impl.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include "multiply_matrix_impl.h"
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pack_k_bits.cc b/gr-blocks/lib/pack_k_bits.cc
index 8ff5f638ff2..cd3c0fa6bb1 100644
--- a/gr-blocks/lib/pack_k_bits.cc
+++ b/gr-blocks/lib/pack_k_bits.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include <gnuradio/blocks/pack_k_bits.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc
index 06c422b923b..04fbd236d90 100644
--- a/gr-blocks/lib/pack_k_bits_bb_impl.cc
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc
@@ -26,8 +26,8 @@
 
 #include "pack_k_bits_bb_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h
index 6459a1e8116..6c9d0a0f1ea 100644
--- a/gr-blocks/lib/pack_k_bits_bb_impl.h
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_PACK_K_BITS_BB_IMPL_H
 #define INCLUDED_GR_PACK_K_BITS_BB_IMPL_H
 
-#include <gnuradio/blocks/pack_k_bits_bb.h>
 #include <gnuradio/blocks/pack_k_bits.h>
+#include <gnuradio/blocks/pack_k_bits_bb.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/packed_to_unpacked_impl.h b/gr-blocks/lib/packed_to_unpacked_impl.h
index 1ef8b17c488..8d56be3f176 100644
--- a/gr-blocks/lib/packed_to_unpacked_impl.h
+++ b/gr-blocks/lib/packed_to_unpacked_impl.h
@@ -24,8 +24,8 @@
 #ifndef PACKED_TO_UNPACKED_IMPL_H
 #define PACKED_TO_UNPACKED_IMPL_H
 
-#include <gnuradio/blocks/packed_to_unpacked.h>
 #include <gnuradio/blocks/log2_const.h>
+#include <gnuradio/blocks/packed_to_unpacked.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc
index 10423ae05d7..b0748eec025 100644
--- a/gr-blocks/lib/pdu_filter_impl.cc
+++ b/gr-blocks/lib/pdu_filter_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pdu_filter_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc
index 09c73c58758..19cc4dc76a4 100644
--- a/gr-blocks/lib/pdu_remove_impl.cc
+++ b/gr-blocks/lib/pdu_remove_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pdu_remove_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc
index 6ef46f370fd..40fbc3cd83f 100644
--- a/gr-blocks/lib/pdu_set_impl.cc
+++ b/gr-blocks/lib/pdu_set_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pdu_set_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/plateau_detector_fb_impl.cc b/gr-blocks/lib/plateau_detector_fb_impl.cc
index 6f75702c847..6fb0b5ff708 100644
--- a/gr-blocks/lib/plateau_detector_fb_impl.cc
+++ b/gr-blocks/lib/plateau_detector_fb_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "plateau_detector_fb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/probe_signal_v_impl.h b/gr-blocks/lib/probe_signal_v_impl.h
index 17d8e348db6..ae5c0f9257e 100644
--- a/gr-blocks/lib/probe_signal_v_impl.h
+++ b/gr-blocks/lib/probe_signal_v_impl.h
@@ -23,8 +23,8 @@
 #ifndef PROBE_SIGNAL_V_IMPL_H
 #define PROBE_SIGNAL_V_IMPL_H
 
-#include <vector>
 #include <gnuradio/blocks/probe_signal_v.h>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc
index 2c45551e37d..847ca6cad47 100644
--- a/gr-blocks/lib/qa_block_tags.cc
+++ b/gr-blocks/lib/qa_block_tags.cc
@@ -25,13 +25,13 @@
 #endif
 
 #include <gnuradio/block.h>
-#include <gnuradio/top_block.h>
-#include <gnuradio/blocks/null_source.h>
-#include <gnuradio/blocks/null_sink.h>
-#include <gnuradio/blocks/head.h>
-#include <gnuradio/blocks/annotator_alltoall.h>
 #include <gnuradio/blocks/annotator_1to1.h>
+#include <gnuradio/blocks/annotator_alltoall.h>
+#include <gnuradio/blocks/head.h>
 #include <gnuradio/blocks/keep_one_in_n.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/top_block.h>
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/gr-blocks/lib/qa_gr_block.cc b/gr-blocks/lib/qa_gr_block.cc
index b40a63cd2ab..ad234374461 100644
--- a/gr-blocks/lib/qa_gr_block.cc
+++ b/gr-blocks/lib/qa_gr_block.cc
@@ -70,10 +70,10 @@ BOOST_AUTO_TEST_CASE(t1)
     BOOST_REQUIRE_EQUAL(0, dst2->output_signature()->max_streams());
 }
 
-#include <gnuradio/top_block.h>
-#include <gnuradio/buffer.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/blocks/nop.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/top_block.h>
 
 BOOST_AUTO_TEST_CASE(t2)
 {
diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc
index 524c43755e7..c6d1ca1c6da 100644
--- a/gr-blocks/lib/qa_gr_flowgraph.cc
+++ b/gr-blocks/lib/qa_gr_flowgraph.cc
@@ -24,10 +24,10 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/flowgraph.h>
 #include <gnuradio/blocks/nop.h>
-#include <gnuradio/blocks/null_source.h>
 #include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/flowgraph.h>
 #include <boost/test/unit_test.hpp>
 
 namespace gr {
diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc
index 9b22568a4ca..eb63ec6aa13 100644
--- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc
+++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc
@@ -24,12 +24,12 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/top_block.h>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/blocks/null_source.h>
-#include <gnuradio/blocks/null_sink.h>
-#include <gnuradio/blocks/head.h>
 #include <gnuradio/blocks/copy.h>
+#include <gnuradio/blocks/head.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/top_block.h>
 #include <boost/test/unit_test.hpp>
 
 // Declare a test C++ hierarchical block
diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc
index 04e4379e975..2ef00f31e5f 100644
--- a/gr-blocks/lib/qa_gr_top_block.cc
+++ b/gr-blocks/lib/qa_gr_top_block.cc
@@ -24,11 +24,11 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/top_block.h>
 #include <gnuradio/blocks/head.h>
 #include <gnuradio/blocks/nop.h>
-#include <gnuradio/blocks/null_source.h>
 #include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/top_block.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/gr-blocks/lib/qa_rotator.cc b/gr-blocks/lib/qa_rotator.cc
index 7a1426b4b9a..db118302fef 100644
--- a/gr-blocks/lib/qa_rotator.cc
+++ b/gr-blocks/lib/qa_rotator.cc
@@ -24,11 +24,11 @@
 #include <config.h>
 #endif
 
-#include <boost/test/unit_test.hpp>
 #include <gnuradio/attributes.h>
 #include <gnuradio/blocks/rotator.h>
 #include <gnuradio/expj.h>
 #include <gnuradio/math.h>
+#include <boost/test/unit_test.hpp>
 
 #include <cmath>
 
diff --git a/gr-blocks/lib/qa_set_msg_handler.cc b/gr-blocks/lib/qa_set_msg_handler.cc
index 368643bfa77..4f3e337260b 100644
--- a/gr-blocks/lib/qa_set_msg_handler.cc
+++ b/gr-blocks/lib/qa_set_msg_handler.cc
@@ -24,14 +24,14 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/top_block.h>
 #include <gnuradio/blocks/head.h>
-#include <gnuradio/blocks/null_source.h>
-#include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/blocks/nop.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
 #include <gnuradio/messages/msg_passing.h>
-#include <boost/thread/thread.hpp>
+#include <gnuradio/top_block.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/thread/thread.hpp>
 #include <iostream>
 
 /*
diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc
index 08078cc75b9..75d825aefaf 100644
--- a/gr-blocks/lib/random_pdu_impl.cc
+++ b/gr-blocks/lib/random_pdu_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "random_pdu_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h
index ecb8ec770d3..6745dcde0bc 100644
--- a/gr-blocks/lib/random_pdu_impl.h
+++ b/gr-blocks/lib/random_pdu_impl.h
@@ -24,8 +24,8 @@
 #define INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H
 
 #include <gnuradio/blocks/random_pdu.h>
-#include <boost/random.hpp>
 #include <boost/generator_iterator.hpp>
+#include <boost/random.hpp>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/repack_bits_bb_impl.cc b/gr-blocks/lib/repack_bits_bb_impl.cc
index 240cac4a1f8..eff58a8a5eb 100644
--- a/gr-blocks/lib/repack_bits_bb_impl.cc
+++ b/gr-blocks/lib/repack_bits_bb_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "repack_bits_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/rotator_cc_impl.h b/gr-blocks/lib/rotator_cc_impl.h
index 415b49cd495..fd3dcef6a4f 100644
--- a/gr-blocks/lib/rotator_cc_impl.h
+++ b/gr-blocks/lib/rotator_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_ROTATOR_CC_IMPL_H
 #define INCLUDED_BLOCKS_ROTATOR_CC_IMPL_H
 
-#include <gnuradio/blocks/rotator_cc.h>
 #include <gnuradio/blocks/rotator.h>
+#include <gnuradio/blocks/rotator_cc.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index b3a96d350aa..df69f07ad2b 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -26,8 +26,8 @@
 
 #include "socket_pdu_impl.h"
 #include "tcp_connection.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h
index c05ef7bbc93..53a78df736d 100644
--- a/gr-blocks/lib/socket_pdu_impl.h
+++ b/gr-blocks/lib/socket_pdu_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
 #define INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
 
-#include <gnuradio/blocks/socket_pdu.h>
 #include "tcp_connection.h"
+#include <gnuradio/blocks/socket_pdu.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/stream_pdu_base.cc b/gr-blocks/lib/stream_pdu_base.cc
index 1cbcb0485cf..3d5dd0a0a0c 100644
--- a/gr-blocks/lib/stream_pdu_base.cc
+++ b/gr-blocks/lib/stream_pdu_base.cc
@@ -32,9 +32,9 @@
 #include <winsock2.h>
 #endif
 
-#include <gnuradio/blocks/pdu.h>
-#include <gnuradio/basic_block.h>
 #include "stream_pdu_base.h"
+#include <gnuradio/basic_block.h>
+#include <gnuradio/blocks/pdu.h>
 #include <boost/format.hpp>
 
 static const long timeout_us = 100 * 1000; // 100ms
diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h
index cc3394d6f08..00622eed160 100644
--- a/gr-blocks/lib/stream_pdu_base.h
+++ b/gr-blocks/lib/stream_pdu_base.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_STREAM_PDU_BASE_H
 #define INCLUDED_STREAM_PDU_BASE_H
 
-#include <gnuradio/thread/thread.h>
 #include <gnuradio/basic_block.h>
+#include <gnuradio/thread/thread.h>
 #include <pmt/pmt.h>
 
 class basic_block;
diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.cc b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
index 2873e980421..31d7a51e611 100644
--- a/gr-blocks/lib/stream_to_tagged_stream_impl.cc
+++ b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <cstring>
-#include <gnuradio/io_signature.h>
 #include "stream_to_tagged_stream_impl.h"
+#include <gnuradio/io_signature.h>
+#include <cstring>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc
index 450e5f87fef..f4faff8e7c6 100644
--- a/gr-blocks/lib/tag_debug_impl.cc
+++ b/gr-blocks/lib/tag_debug_impl.cc
@@ -26,8 +26,8 @@
 
 #include "tag_debug_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tag_gate_impl.cc b/gr-blocks/lib/tag_gate_impl.cc
index 08390beca28..1ced79a7a8b 100644
--- a/gr-blocks/lib/tag_gate_impl.cc
+++ b/gr-blocks/lib/tag_gate_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "tag_gate_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tag_share_impl.cc b/gr-blocks/lib/tag_share_impl.cc
index f8a11297042..5e66dc88757 100644
--- a/gr-blocks/lib/tag_share_impl.cc
+++ b/gr-blocks/lib/tag_share_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "tag_share_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_file_sink_impl.cc b/gr-blocks/lib/tagged_file_sink_impl.cc
index 83b0432253b..b4e6f2e7cfa 100644
--- a/gr-blocks/lib/tagged_file_sink_impl.cc
+++ b/gr-blocks/lib/tagged_file_sink_impl.cc
@@ -27,11 +27,11 @@
 #include "tagged_file_sink_impl.h"
 #include <gnuradio/io_signature.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <iostream>
+#include <stdexcept>
 
 #ifdef HAVE_IO_H
 #include <io.h>
diff --git a/gr-blocks/lib/tagged_stream_align_impl.cc b/gr-blocks/lib/tagged_stream_align_impl.cc
index c2050e15567..6c091da984f 100644
--- a/gr-blocks/lib/tagged_stream_align_impl.cc
+++ b/gr-blocks/lib/tagged_stream_align_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "tagged_stream_align_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_align_impl.h b/gr-blocks/lib/tagged_stream_align_impl.h
index 8b203115c28..77a642b1964 100644
--- a/gr-blocks/lib/tagged_stream_align_impl.h
+++ b/gr-blocks/lib/tagged_stream_align_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_TAGGED_STREAM_ALIGN_IMPL_H
 #define INCLUDED_TAGGED_STREAM_ALIGN_IMPL_H
 
-#include <vector>
 #include <gnuradio/blocks/tagged_stream_align.h>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
index 96d77401ae6..30f4c46dc6e 100644
--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "tagged_stream_multiply_length_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.h b/gr-blocks/lib/tagged_stream_multiply_length_impl.h
index f54c71b3c73..3a8680b1e92 100644
--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.h
+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_TAGGED_STREAM_MULTIPLY_LENGTH_IMPL_H
 #define INCLUDED_TAGGED_STREAM_MULTIPLY_LENGTH_IMPL_H
 
-#include <vector>
 #include <gnuradio/blocks/tagged_stream_multiply_length.h>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_mux_impl.cc b/gr-blocks/lib/tagged_stream_mux_impl.cc
index 1742340d893..610a1c12678 100644
--- a/gr-blocks/lib/tagged_stream_mux_impl.cc
+++ b/gr-blocks/lib/tagged_stream_mux_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "tagged_stream_mux_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_mux_impl.h b/gr-blocks/lib/tagged_stream_mux_impl.h
index 03804a62534..ec6fa8dc01e 100644
--- a/gr-blocks/lib/tagged_stream_mux_impl.h
+++ b/gr-blocks/lib/tagged_stream_mux_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_TAGGED_STREAM_MUX_IMPL_H
 #define INCLUDED_TAGGED_STREAM_MUX_IMPL_H
 
-#include <vector>
 #include <gnuradio/blocks/tagged_stream_mux.h>
+#include <vector>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tags_strobe_impl.cc b/gr-blocks/lib/tags_strobe_impl.cc
index 51391fb0825..e9eac26c12f 100644
--- a/gr-blocks/lib/tags_strobe_impl.cc
+++ b/gr-blocks/lib/tags_strobe_impl.cc
@@ -26,14 +26,14 @@
 
 #include "tags_strobe_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h
index 4c5a67c54b0..4581abe4136 100644
--- a/gr-blocks/lib/tcp_connection.h
+++ b/gr-blocks/lib/tcp_connection.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_TCP_CONNECTION_H
 #define INCLUDED_TCP_CONNECTION_H
 
+#include <pmt/pmt.h>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/shared_ptr.hpp>
-#include <pmt/pmt.h>
 
 namespace gr {
 
diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc
index dd6a9d2e449..8e6d30e1e39 100644
--- a/gr-blocks/lib/tcp_server_sink_impl.cc
+++ b/gr-blocks/lib/tcp_server_sink_impl.cc
@@ -26,14 +26,14 @@
 
 #include "tcp_server_sink_impl.h"
 #include <gnuradio/io_signature.h>
-#include <algorithm>
+#include <gnuradio/thread/thread.h>
+#include <stdio.h>
+#include <string.h>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
-#include <gnuradio/thread/thread.h>
+#include <algorithm>
 #include <stdexcept>
-#include <stdio.h>
-#include <string.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h
index 6c4b0f938f0..a1d19efc4c1 100644
--- a/gr-blocks/lib/tcp_server_sink_impl.h
+++ b/gr-blocks/lib/tcp_server_sink_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/blocks/tcp_server_sink.h>
 #include <boost/asio.hpp>
-#include <set>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <set>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc b/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc
index 5a825710e6c..580bf0d19fd 100644
--- a/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc
+++ b/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc
@@ -27,11 +27,11 @@
 #include "test_tag_variable_rate_ff_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/xoroshiro128p.h>
+#include <stdint.h>
 #include <string.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <stdexcept>
-#include <stdint.h>
 
 using namespace pmt;
 
diff --git a/gr-blocks/lib/throttle_impl.cc b/gr-blocks/lib/throttle_impl.cc
index d5614c56768..c18d44522f2 100644
--- a/gr-blocks/lib/throttle_impl.cc
+++ b/gr-blocks/lib/throttle_impl.cc
@@ -26,8 +26,8 @@
 
 #include "throttle_impl.h"
 #include <gnuradio/io_signature.h>
-#include <cstring>
 #include <boost/thread/thread.hpp>
+#include <cstring>
 #include <limits>
 
 pmt::pmt_t throttle_rx_rate_pmt(pmt::intern("rx_rate"));
diff --git a/gr-blocks/lib/transcendental_impl.cc b/gr-blocks/lib/transcendental_impl.cc
index a29a1e75da1..1c53ec1b6d2 100644
--- a/gr-blocks/lib/transcendental_impl.cc
+++ b/gr-blocks/lib/transcendental_impl.cc
@@ -22,10 +22,10 @@
 
 #include "transcendental_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
-#include <complex> //complex math
 #include <cmath>   //real math
+#include <complex> //complex math
 #include <map>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc
index fa166835108..4343ae1dc3b 100644
--- a/gr-blocks/lib/tuntap_pdu_impl.cc
+++ b/gr-blocks/lib/tuntap_pdu_impl.cc
@@ -25,18 +25,18 @@
 #endif
 
 #include "tuntap_pdu_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
 #include <boost/format.hpp>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #if (defined(linux) || defined(__linux) || defined(__linux__))
-#include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <linux/if.h>
+#include <sys/ioctl.h>
 #endif
 
 namespace gr {
diff --git a/gr-blocks/lib/tuntap_pdu_impl.h b/gr-blocks/lib/tuntap_pdu_impl.h
index 31afc445e7b..fcd9523dc52 100644
--- a/gr-blocks/lib/tuntap_pdu_impl.h
+++ b/gr-blocks/lib/tuntap_pdu_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H
 #define INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H
 
-#include <gnuradio/blocks/tuntap_pdu.h>
 #include "stream_pdu_base.h"
+#include <gnuradio/blocks/tuntap_pdu.h>
 
 #if (defined(linux) || defined(__linux) || defined(__linux__))
 #include <linux/if_tun.h>
diff --git a/gr-blocks/lib/uchar_to_float_impl.cc b/gr-blocks/lib/uchar_to_float_impl.cc
index ec666da349c..879177310b3 100644
--- a/gr-blocks/lib/uchar_to_float_impl.cc
+++ b/gr-blocks/lib/uchar_to_float_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "uchar_to_float_impl.h"
 #include "uchar_array_to_float.h"
+#include "uchar_to_float_impl.h"
 #include <gnuradio/io_signature.h>
 
 namespace gr {
diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc
index cb44ba0b6f8..885503d0f11 100644
--- a/gr-blocks/lib/udp_sink_impl.cc
+++ b/gr-blocks/lib/udp_sink_impl.cc
@@ -26,13 +26,13 @@
 
 #include "udp_sink_impl.h"
 #include <gnuradio/io_signature.h>
+#include <gnuradio/thread/thread.h>
+#include <stdio.h>
+#include <string.h>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
-#include <gnuradio/thread/thread.h>
 #include <stdexcept>
-#include <stdio.h>
-#include <string.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc
index c948410c02f..a668086565e 100644
--- a/gr-blocks/lib/udp_source_impl.cc
+++ b/gr-blocks/lib/udp_source_impl.cc
@@ -28,10 +28,10 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <gnuradio/prefs.h>
-#include <stdexcept>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h
index a1f0b3b06d0..8ae337b50d2 100644
--- a/gr-blocks/lib/udp_source_impl.h
+++ b/gr-blocks/lib/udp_source_impl.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_UDP_SOURCE_IMPL_H
 
 #include <gnuradio/blocks/udp_source.h>
+#include <gnuradio/thread/thread.h>
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
-#include <gnuradio/thread/thread.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/unpack_k_bits.cc b/gr-blocks/lib/unpack_k_bits.cc
index 0865121d020..ee5333bbd90 100644
--- a/gr-blocks/lib/unpack_k_bits.cc
+++ b/gr-blocks/lib/unpack_k_bits.cc
@@ -26,8 +26,8 @@
 
 #include <gnuradio/blocks/unpack_k_bits.h>
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
index 49849e92852..c5824cf2d27 100644
--- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
@@ -26,8 +26,8 @@
 
 #include "unpack_k_bits_bb_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.h b/gr-blocks/lib/unpack_k_bits_bb_impl.h
index b677de81e16..0edbd186147 100644
--- a/gr-blocks/lib/unpack_k_bits_bb_impl.h
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H
 #define INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H
 
-#include <gnuradio/blocks/unpack_k_bits_bb.h>
 #include <gnuradio/blocks/unpack_k_bits.h>
+#include <gnuradio/blocks/unpack_k_bits_bb.h>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/vector_insert_impl.cc b/gr-blocks/lib/vector_insert_impl.cc
index 8f13dfa421f..71e1b6df83d 100644
--- a/gr-blocks/lib/vector_insert_impl.cc
+++ b/gr-blocks/lib/vector_insert_impl.cc
@@ -26,11 +26,11 @@
 #endif
 
 #include "vector_insert_impl.h"
-#include <algorithm>
-#include <gnuradio/io_signature.h>
 #include <gnuradio/block.h>
-#include <stdexcept>
+#include <gnuradio/io_signature.h>
 #include <stdio.h>
+#include <algorithm>
+#include <stdexcept>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/vector_source_impl.cc b/gr-blocks/lib/vector_source_impl.cc
index b7f94096310..b9709496fbc 100644
--- a/gr-blocks/lib/vector_source_impl.cc
+++ b/gr-blocks/lib/vector_source_impl.cc
@@ -26,8 +26,8 @@
 #endif
 
 #include "vector_source_impl.h"
-#include <algorithm>
 #include <gnuradio/io_signature.h>
+#include <algorithm>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc
index 72cec7d8bc1..9b7e9b7ecfd 100644
--- a/gr-blocks/lib/wavfile.cc
+++ b/gr-blocks/lib/wavfile.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include <gnuradio/blocks/wavfile.h>
-#include <cstring>
 #include <stdint.h>
 #include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
+#include <cstring>
 
 namespace gr {
 namespace blocks {
diff --git a/gr-blocks/lib/wavfile_sink_impl.cc b/gr-blocks/lib/wavfile_sink_impl.cc
index 8ce5d94b962..43bf1869bf7 100644
--- a/gr-blocks/lib/wavfile_sink_impl.cc
+++ b/gr-blocks/lib/wavfile_sink_impl.cc
@@ -27,13 +27,13 @@
 #include "wavfile_sink_impl.h"
 #include <gnuradio/blocks/wavfile.h>
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
-#include <climits>
-#include <cstring>
-#include <cmath>
-#include <fcntl.h>
 #include <gnuradio/thread/thread.h>
+#include <fcntl.h>
 #include <boost/math/special_functions/round.hpp>
+#include <climits>
+#include <cmath>
+#include <cstring>
+#include <stdexcept>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
diff --git a/gr-blocks/lib/wavfile_source_impl.cc b/gr-blocks/lib/wavfile_source_impl.cc
index b1950f2debb..a8f173634e2 100644
--- a/gr-blocks/lib/wavfile_source_impl.cc
+++ b/gr-blocks/lib/wavfile_source_impl.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include "wavfile_source_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/wavfile.h>
-#include <sys/types.h>
+#include <gnuradio/io_signature.h>
 #include <fcntl.h>
+#include <sys/types.h>
 #include <stdexcept>
 
 // win32 (mingw/msvc) specific
diff --git a/gr-blocks/tests/benchmark_nco.cc b/gr-blocks/tests/benchmark_nco.cc
index 71946dc3fec..223cebaf88a 100644
--- a/gr-blocks/tests/benchmark_nco.cc
+++ b/gr-blocks/tests/benchmark_nco.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/nco.h>
 #include <gnuradio/fxpt_nco.h>
 #include <gnuradio/math.h>
+#include <gnuradio/nco.h>
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/gr-blocks/tests/benchmark_vco.cc b/gr-blocks/tests/benchmark_vco.cc
index a8fae75a47c..df4502d8553 100644
--- a/gr-blocks/tests/benchmark_vco.cc
+++ b/gr-blocks/tests/benchmark_vco.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/vco.h>
 #include <gnuradio/fxpt_vco.h>
 #include <gnuradio/math.h>
+#include <gnuradio/vco.h>
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/gr-channels/include/gnuradio/channels/sro_model.h b/gr-channels/include/gnuradio/channels/sro_model.h
index 140f83aee79..00d7c693586 100644
--- a/gr-channels/include/gnuradio/channels/sro_model.h
+++ b/gr-channels/include/gnuradio/channels/sro_model.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_CHANNELS_SRO_MODEL_H
 #define INCLUDED_CHANNELS_SRO_MODEL_H
 
-#include <gnuradio/channels/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/channels/api.h>
 #include <gnuradio/types.h>
 
 namespace gr {
diff --git a/gr-channels/lib/cfo_model_impl.h b/gr-channels/lib/cfo_model_impl.h
index f087482641b..dd0febac894 100644
--- a/gr-channels/lib/cfo_model_impl.h
+++ b/gr-channels/lib/cfo_model_impl.h
@@ -23,13 +23,13 @@
 #ifndef INCLUDED_CHANNELS_CFO_MODEL_IMPL_H
 #define INCLUDED_CHANNELS_CFO_MODEL_IMPL_H
 
-#include <gnuradio/top_block.h>
+#include "sincostable.h"
+#include <gnuradio/analog/fastnoise_source.h>
 #include <gnuradio/blocks/integrate.h>
-#include <gnuradio/blocks/vco_c.h>
 #include <gnuradio/blocks/multiply.h>
-#include <gnuradio/analog/fastnoise_source.h>
+#include <gnuradio/blocks/vco_c.h>
 #include <gnuradio/channels/cfo_model.h>
-#include "sincostable.h"
+#include <gnuradio/top_block.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/channel_model2_impl.h b/gr-channels/lib/channel_model2_impl.h
index 13ddc54701d..75a84f88cf8 100644
--- a/gr-channels/lib/channel_model2_impl.h
+++ b/gr-channels/lib/channel_model2_impl.h
@@ -23,15 +23,15 @@
 #ifndef INCLUDED_CHANNELS_CHANNEL_MODEL2_IMPL_H
 #define INCLUDED_CHANNELS_CHANNEL_MODEL2_IMPL_H
 
-#include <gnuradio/channels/channel_model2.h>
-#include <gnuradio/top_block.h>
+#include <gnuradio/analog/fastnoise_source.h>
+#include <gnuradio/analog/sig_source.h>
 #include <gnuradio/blocks/add_blk.h>
 #include <gnuradio/blocks/multiply.h>
-#include <gnuradio/analog/sig_source.h>
-#include <gnuradio/analog/fastnoise_source.h>
-#include <gnuradio/filter/mmse_resampler_cc.h>
-#include <gnuradio/filter/fir_filter_blk.h>
 #include <gnuradio/blocks/vco_c.h>
+#include <gnuradio/channels/channel_model2.h>
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/mmse_resampler_cc.h>
+#include <gnuradio/top_block.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h
index 98b30f482d2..9a8a8b2a8a9 100644
--- a/gr-channels/lib/channel_model_impl.h
+++ b/gr-channels/lib/channel_model_impl.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 
-#include <gnuradio/top_block.h>
+#include <gnuradio/analog/fastnoise_source.h>
+#include <gnuradio/analog/sig_source.h>
 #include <gnuradio/blocks/add_blk.h>
 #include <gnuradio/blocks/multiply.h>
-#include <gnuradio/analog/sig_source.h>
-#include <gnuradio/analog/fastnoise_source.h>
 #include <gnuradio/channels/channel_model.h>
-#include <gnuradio/filter/mmse_resampler_cc.h>
 #include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/mmse_resampler_cc.h>
+#include <gnuradio/top_block.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/dynamic_channel_model_impl.h b/gr-channels/lib/dynamic_channel_model_impl.h
index befd641f6a9..e77f1ec60a0 100644
--- a/gr-channels/lib/dynamic_channel_model_impl.h
+++ b/gr-channels/lib/dynamic_channel_model_impl.h
@@ -23,17 +23,17 @@
 #ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 
-#include <gnuradio/top_block.h>
+#include <gnuradio/analog/fastnoise_source.h>
+#include <gnuradio/analog/sig_source.h>
 #include <gnuradio/blocks/add_blk.h>
 #include <gnuradio/blocks/multiply.h>
-#include <gnuradio/analog/sig_source.h>
-#include <gnuradio/analog/fastnoise_source.h>
+#include <gnuradio/channels/cfo_model.h>
 #include <gnuradio/channels/dynamic_channel_model.h>
 #include <gnuradio/channels/selective_fading_model.h>
 #include <gnuradio/channels/sro_model.h>
-#include <gnuradio/channels/cfo_model.h>
-#include <gnuradio/filter/mmse_resampler_cc.h>
 #include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/mmse_resampler_cc.h>
+#include <gnuradio/top_block.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/fading_model_impl.h b/gr-channels/lib/fading_model_impl.h
index bbe214ca904..f6e8e0aebbc 100644
--- a/gr-channels/lib/fading_model_impl.h
+++ b/gr-channels/lib/fading_model_impl.h
@@ -23,16 +23,16 @@
 #ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
 
-#include <gnuradio/sync_block.h>
-#include <gnuradio/channels/fading_model.h>
 #include "flat_fader_impl.h"
+#include <gnuradio/channels/fading_model.h>
+#include <gnuradio/sync_block.h>
 
 //#include <iostream>
 #include <boost/format.hpp>
 #include <boost/random.hpp>
 
-#include <gnuradio/fxpt.h>
 #include "sincostable.h"
+#include <gnuradio/fxpt.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/flat_fader_impl.h b/gr-channels/lib/flat_fader_impl.h
index df17c07ec25..1b6d957d595 100644
--- a/gr-channels/lib/flat_fader_impl.h
+++ b/gr-channels/lib/flat_fader_impl.h
@@ -24,14 +24,14 @@
 #define FLAT_FADER_IMPL_H
 
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <stdint.h>
+#include <iostream>
 
 #include <boost/format.hpp>
 #include <boost/random.hpp>
 
-#include <gnuradio/fxpt.h>
 #include "sincostable.h"
+#include <gnuradio/fxpt.h>
 
 // FASTSINCOS:  0 = slow native,  1 = gr::fxpt impl,  2 = sincostable.h
 #define FASTSINCOS 2
diff --git a/gr-channels/lib/selective_fading_model2_impl.cc b/gr-channels/lib/selective_fading_model2_impl.cc
index 00854655d9d..dd6cc801275 100644
--- a/gr-channels/lib/selective_fading_model2_impl.cc
+++ b/gr-channels/lib/selective_fading_model2_impl.cc
@@ -23,8 +23,8 @@
 #include "selective_fading_model2_impl.h"
 #include "sincostable.h"
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 
 #include <boost/format.hpp>
diff --git a/gr-channels/lib/selective_fading_model2_impl.h b/gr-channels/lib/selective_fading_model2_impl.h
index a60bb105629..55a818db30c 100644
--- a/gr-channels/lib/selective_fading_model2_impl.h
+++ b/gr-channels/lib/selective_fading_model2_impl.h
@@ -23,16 +23,16 @@
 #ifndef INCLUDED_CHANNELS_SELECTIVE_FADING_MODEL2_IMPL_H
 #define INCLUDED_CHANNELS_SELECTIVE_FADING_MODEL2_IMPL_H
 
-#include <gnuradio/sync_block.h>
-#include <gnuradio/channels/selective_fading_model2.h>
 #include "flat_fader_impl.h"
+#include <gnuradio/channels/selective_fading_model2.h>
+#include <gnuradio/sync_block.h>
 
 //#include <iostream>
 #include <boost/format.hpp>
 #include <boost/random.hpp>
 
-#include <gnuradio/fxpt.h>
 #include "sincostable.h"
+#include <gnuradio/fxpt.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/selective_fading_model_impl.cc b/gr-channels/lib/selective_fading_model_impl.cc
index 3460d7fefd7..5bb68d115ee 100644
--- a/gr-channels/lib/selective_fading_model_impl.cc
+++ b/gr-channels/lib/selective_fading_model_impl.cc
@@ -23,8 +23,8 @@
 #include "selective_fading_model_impl.h"
 #include "sincostable.h"
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 
 #include <boost/format.hpp>
diff --git a/gr-channels/lib/selective_fading_model_impl.h b/gr-channels/lib/selective_fading_model_impl.h
index 2ca7d3f1c33..64e90a078a3 100644
--- a/gr-channels/lib/selective_fading_model_impl.h
+++ b/gr-channels/lib/selective_fading_model_impl.h
@@ -23,16 +23,16 @@
 #ifndef INCLUDED_CHANNELS_SELECTIVE_FADING_MODEL_IMPL_H
 #define INCLUDED_CHANNELS_SELECTIVE_FADING_MODEL_IMPL_H
 
-#include <gnuradio/sync_block.h>
-#include <gnuradio/channels/selective_fading_model.h>
 #include "flat_fader_impl.h"
+#include <gnuradio/channels/selective_fading_model.h>
+#include <gnuradio/sync_block.h>
 
 //#include <iostream>
 #include <boost/format.hpp>
 #include <boost/random.hpp>
 
-#include <gnuradio/fxpt.h>
 #include "sincostable.h"
+#include <gnuradio/fxpt.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-channels/lib/sro_model_impl.cc b/gr-channels/lib/sro_model_impl.cc
index 5e6d7672bc6..06d3f106039 100644
--- a/gr-channels/lib/sro_model_impl.cc
+++ b/gr-channels/lib/sro_model_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "sro_model_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-channels/lib/sro_model_impl.h b/gr-channels/lib/sro_model_impl.h
index 68061781e2f..0056dddc039 100644
--- a/gr-channels/lib/sro_model_impl.h
+++ b/gr-channels/lib/sro_model_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_CHANNELS_SRO_MODEL_CC_IMPL_H
 #define INCLUDED_CHANNELS_SRO_MODEL_CC_IMPL_H
 
-#include <gnuradio/filter/mmse_interpolator_cc.h>
-#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/analog/fastnoise_source.h>
 #include <gnuradio/channels/sro_model.h>
+#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
+#include <gnuradio/filter/mmse_interpolator_cc.h>
 
 namespace gr {
 namespace channels {
diff --git a/gr-digital/include/gnuradio/digital/burst_shaper.h b/gr-digital/include/gnuradio/digital/burst_shaper.h
index 140e8cbfa00..b0be4bc4514 100644
--- a/gr-digital/include/gnuradio/digital/burst_shaper.h
+++ b/gr-digital/include/gnuradio/digital/burst_shaper.h
@@ -23,8 +23,8 @@
 #ifndef BURST_SHAPER_H
 #define BURST_SHAPER_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h
index dab3d386991..99525b2ff8b 100644
--- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h
+++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
 #define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h
index 437f9acbcec..3e2dd55daf0 100644
--- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h
+++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
 #define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/constellation.h b/gr-digital/include/gnuradio/digital/constellation.h
index 8ea728fc746..0be3d68730d 100644
--- a/gr-digital/include/gnuradio/digital/constellation.h
+++ b/gr-digital/include/gnuradio/digital/constellation.h
@@ -25,10 +25,10 @@
 
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/metric_type.h>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/any.hpp>
 #include <gnuradio/gr_complex.h>
 #include <pmt/pmt.h>
+#include <boost/any.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <vector>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h
index dde95100e96..1af20ecc0ac 100644
--- a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h
+++ b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 #define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/constellation.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
index f9922570966..0873eab715d 100644
--- a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
+++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 #define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 
+#include <gnuradio/block.h>
+#include <gnuradio/blocks/control_loop.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/constellation.h>
-#include <gnuradio/blocks/control_loop.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h
index d561f9878b0..5e76c9dadca 100644
--- a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h
+++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_TS_H
 #define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_TS_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 #include <string>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h
index 070b8d3246a..7ad348c3050 100644
--- a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h
+++ b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_FF_TS_H
 #define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_FF_TS_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 #include <string>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
index ebca2962d83..79b81f35ae6 100644
--- a/gr-digital/include/gnuradio/digital/costas_loop_cc.h
+++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 #define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/digital/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/cpmmod_bc.h b/gr-digital/include/gnuradio/digital/cpmmod_bc.h
index fead20246a7..57d3d91f9ce 100644
--- a/gr-digital/include/gnuradio/digital/cpmmod_bc.h
+++ b/gr-digital/include/gnuradio/digital/cpmmod_bc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_CPMMOD_BC_H
 #define INCLUDED_DIGITAL_CPMMOD_BC_H
 
+#include <gnuradio/analog/cpm.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/hier_block2.h>
-#include <gnuradio/analog/cpm.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/crc32.h b/gr-digital/include/gnuradio/digital/crc32.h
index 03d9774d2de..20a2698d801 100644
--- a/gr-digital/include/gnuradio/digital/crc32.h
+++ b/gr-digital/include/gnuradio/digital/crc32.h
@@ -24,8 +24,8 @@
 #define INCLUDED_DIGITAL_CRC32_H
 
 #include <gnuradio/digital/api.h>
-#include <string>
 #include <gnuradio/types.h>
+#include <string>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/crc32_async_bb.h b/gr-digital/include/gnuradio/digital/crc32_async_bb.h
index 0679c27e2b4..2a0b051e6da 100644
--- a/gr-digital/include/gnuradio/digital/crc32_async_bb.h
+++ b/gr-digital/include/gnuradio/digital/crc32_async_bb.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_DIGITAL_CRC32_ASYNC_BB_H
 #define INCLUDED_DIGITAL_CRC32_ASYNC_BB_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h
index 48acd4de4d9..d41bf1046c0 100644
--- a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h
+++ b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
 #define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
 
+#include <gnuradio/blocks/control_loop.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/sync_block.h>
-#include <gnuradio/blocks/control_loop.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/framer_sink_1.h b/gr-digital/include/gnuradio/digital/framer_sink_1.h
index 4c46f50c1fd..973e7ea7e68 100644
--- a/gr-digital/include/gnuradio/digital/framer_sink_1.h
+++ b/gr-digital/include/gnuradio/digital/framer_sink_1.h
@@ -24,8 +24,8 @@
 #define INCLUDED_GR_FRAMER_SINK_1_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/header_buffer.h b/gr-digital/include/gnuradio/digital/header_buffer.h
index fee3a7eefe0..08056291bf7 100644
--- a/gr-digital/include/gnuradio/digital/header_buffer.h
+++ b/gr-digital/include/gnuradio/digital/header_buffer.h
@@ -23,9 +23,9 @@
 #define INCLUDED_DIGITAL_HEADER_BUFFER_H
 
 #include <gnuradio/digital/api.h>
-#include <vector>
 #include <stdint.h>
 #include <stdlib.h>
+#include <vector>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/header_format_base.h b/gr-digital/include/gnuradio/digital/header_format_base.h
index 81278e80c1e..85690b87b9c 100644
--- a/gr-digital/include/gnuradio/digital/header_format_base.h
+++ b/gr-digital/include/gnuradio/digital/header_format_base.h
@@ -22,10 +22,10 @@
 #ifndef INCLUDED_DIGITAL_HEADER_FORMAT_BASE_H
 #define INCLUDED_DIGITAL_HEADER_FORMAT_BASE_H
 
-#include <pmt/pmt.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/header_buffer.h>
 #include <gnuradio/logger.h>
+#include <pmt/pmt.h>
 #include <boost/enable_shared_from_this.hpp>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/header_format_counter.h b/gr-digital/include/gnuradio/digital/header_format_counter.h
index e04ef7e0196..3db2c1a5a24 100644
--- a/gr-digital/include/gnuradio/digital/header_format_counter.h
+++ b/gr-digital/include/gnuradio/digital/header_format_counter.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_DIGITAL_HEADER_FORMAT_COUNTER_H
 #define INCLUDED_DIGITAL_HEADER_FORMAT_COUNTER_H
 
-#include <pmt/pmt.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/header_format_default.h>
+#include <pmt/pmt.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/header_format_crc.h b/gr-digital/include/gnuradio/digital/header_format_crc.h
index 410e6273fa9..d68af351f26 100644
--- a/gr-digital/include/gnuradio/digital/header_format_crc.h
+++ b/gr-digital/include/gnuradio/digital/header_format_crc.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_DIGITAL_HEADER_FORMAT_CRC_H
 #define INCLUDED_DIGITAL_HEADER_FORMAT_CRC_H
 
-#include <pmt/pmt.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/header_format_default.h>
+#include <pmt/pmt.h>
 #include <boost/crc.hpp>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/header_format_default.h b/gr-digital/include/gnuradio/digital/header_format_default.h
index 14af67dfdcc..e76cc350f8b 100644
--- a/gr-digital/include/gnuradio/digital/header_format_default.h
+++ b/gr-digital/include/gnuradio/digital/header_format_default.h
@@ -22,11 +22,11 @@
 #ifndef INCLUDED_DIGITAL_HEADER_FORMAT_DEFAULT_H
 #define INCLUDED_DIGITAL_HEADER_FORMAT_DEFAULT_H
 
-#include <pmt/pmt.h>
 #include <gnuradio/digital/api.h>
-#include <gnuradio/digital/header_format_base.h>
 #include <gnuradio/digital/header_buffer.h>
+#include <gnuradio/digital/header_format_base.h>
 #include <gnuradio/logger.h>
+#include <pmt/pmt.h>
 #include <boost/enable_shared_from_this.hpp>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/header_format_ofdm.h b/gr-digital/include/gnuradio/digital/header_format_ofdm.h
index ca68435fc5f..7e9d62ac7bd 100644
--- a/gr-digital/include/gnuradio/digital/header_format_ofdm.h
+++ b/gr-digital/include/gnuradio/digital/header_format_ofdm.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_DIGITAL_HEADER_FORMAT_OFDM_H
 #define INCLUDED_DIGITAL_HEADER_FORMAT_OFDM_H
 
-#include <pmt/pmt.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/header_format_crc.h>
+#include <pmt/pmt.h>
 #include <boost/crc.hpp>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/header_payload_demux.h b/gr-digital/include/gnuradio/digital/header_payload_demux.h
index 0bccf0bfb10..1563cc8b58d 100644
--- a/gr-digital/include/gnuradio/digital/header_payload_demux.h
+++ b/gr-digital/include/gnuradio/digital/header_payload_demux.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H
 #define INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/lfsr.h b/gr-digital/include/gnuradio/digital/lfsr.h
index d7502a3a391..88b8ab12045 100644
--- a/gr-digital/include/gnuradio/digital/lfsr.h
+++ b/gr-digital/include/gnuradio/digital/lfsr.h
@@ -24,8 +24,8 @@
 #define INCLUDED_DIGITAL_LFSR_H
 
 #include <gnuradio/digital/api.h>
-#include <stdexcept>
 #include <stdint.h>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h
index 3d946ec33fb..8a791af0733 100644
--- a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h
+++ b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h
@@ -24,8 +24,8 @@
 #define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/sync_decimator.h>
 #include <gnuradio/digital/constellation.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h
index 858bb7ca2bc..2a9eb8e7566 100644
--- a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h
+++ b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_MSK_TIMING_RECOVERY_CC_H
 #define INCLUDED_DIGITAL_MSK_TIMING_RECOVERY_CC_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h
index 248ad8c0eb3..7be7b12daac 100644
--- a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H
 #define INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h
index 392f576a606..aac0d5f5b68 100644
--- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h
@@ -23,8 +23,8 @@
 #define INCLUDED_DIGITAL_OFDM_EQUALIZER_BASE_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/tags.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/tags.h>
 #include <boost/enable_shared_from_this.hpp>
 
 namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h
index 2fabbd9f1d3..2e9102295d4 100644
--- a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h
@@ -23,8 +23,8 @@
 #define INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/tagged_stream_block.h>
 #include <gnuradio/digital/ofdm_carrier_allocator_cvc.h>
+#include <gnuradio/tagged_stream_block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/packet_header_default.h b/gr-digital/include/gnuradio/digital/packet_header_default.h
index 4c5337685c2..ad1290458ba 100644
--- a/gr-digital/include/gnuradio/digital/packet_header_default.h
+++ b/gr-digital/include/gnuradio/digital/packet_header_default.h
@@ -22,10 +22,10 @@
 #ifndef INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H
 #define INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H
 
-#include <gnuradio/tags.h>
 #include <gnuradio/digital/api.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <gnuradio/tags.h>
 #include <boost/crc.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h
index 708fc842f19..4df136d78bc 100644
--- a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h
+++ b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_DIGITAL_PACKET_HEADER_OFDM_H
 #define INCLUDED_DIGITAL_PACKET_HEADER_OFDM_H
 
-#include <vector>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/packet_header_default.h>
+#include <vector>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h
index d0d491267b5..4c2492fcc0a 100644
--- a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h
+++ b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h
@@ -23,8 +23,8 @@
 #define INCLUDED_PACKET_HEADERGENERATOR_BB_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/tagged_stream_block.h>
 #include <gnuradio/digital/packet_header_default.h>
+#include <gnuradio/tagged_stream_block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h
index 30a3cd0d261..9d60faac877 100644
--- a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h
+++ b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h
@@ -23,8 +23,8 @@
 #define INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/digital/packet_header_default.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/packet_sink.h b/gr-digital/include/gnuradio/digital/packet_sink.h
index ba5d5a1aff7..5163b8f1748 100644
--- a/gr-digital/include/gnuradio/digital/packet_sink.h
+++ b/gr-digital/include/gnuradio/digital/packet_sink.h
@@ -24,8 +24,8 @@
 #define INCLUDED_GR_PACKET_SINK_H
 
 #include <gnuradio/digital/api.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h
index 9d1241df2be..e5f7d522953 100644
--- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h
+++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h
@@ -24,9 +24,9 @@
 #ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_H
 #define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h
index 90396ba2fc2..03151826a22 100644
--- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h
+++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_H
 #define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h
index 67eaf33d208..3d7f595bb7d 100644
--- a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h
+++ b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h
@@ -24,9 +24,9 @@
 #ifndef INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_H
 #define INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/header_format_base.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/simple_correlator.h b/gr-digital/include/gnuradio/digital/simple_correlator.h
index 93e3b39eacb..7f5a600d1d5 100644
--- a/gr-digital/include/gnuradio/digital/simple_correlator.h
+++ b/gr-digital/include/gnuradio/digital/simple_correlator.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_SIMPLE_CORRELATOR_H
 #define INCLUDED_GR_SIMPLE_CORRELATOR_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h
index 91edfb05c25..58c201ffb12 100644
--- a/gr-digital/include/gnuradio/digital/simple_framer.h
+++ b/gr-digital/include/gnuradio/digital/simple_framer.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_SIMPLE_FRAMER_H
 #define INCLUDED_GR_SIMPLE_FRAMER_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/digital/api.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h
index 3bfb971b8d6..b2e2f9a5896 100644
--- a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h
+++ b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_DIGITAL_SYMBOL_SYNC_CC_H
 #define INCLUDED_DIGITAL_SYMBOL_SYNC_CC_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
-#include <gnuradio/digital/timing_error_detector_type.h>
+#include <gnuradio/digital/api.h>
 #include <gnuradio/digital/constellation.h>
 #include <gnuradio/digital/interpolating_resampler_type.h>
+#include <gnuradio/digital/timing_error_detector_type.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h
index 45d3f93266e..b5f9cfa5150 100644
--- a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h
+++ b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_DIGITAL_SYMBOL_SYNC_FF_H
 #define INCLUDED_DIGITAL_SYMBOL_SYNC_FF_H
 
-#include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
-#include <gnuradio/digital/timing_error_detector_type.h>
+#include <gnuradio/digital/api.h>
 #include <gnuradio/digital/constellation.h>
 #include <gnuradio/digital/interpolating_resampler_type.h>
+#include <gnuradio/digital/timing_error_detector_type.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/burst_shaper_impl.cc b/gr-digital/lib/burst_shaper_impl.cc
index 6b39f018a56..a64064c2de2 100644
--- a/gr-digital/lib/burst_shaper_impl.cc
+++ b/gr-digital/lib/burst_shaper_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "burst_shaper_impl.h"
-#include <boost/format.hpp>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.cc b/gr-digital/lib/clock_recovery_mm_cc_impl.cc
index 368bfa77e60..bb8baf8a48a 100644
--- a/gr-digital/lib/clock_recovery_mm_cc_impl.cc
+++ b/gr-digital/lib/clock_recovery_mm_cc_impl.cc
@@ -26,11 +26,11 @@
 
 #include "clock_recovery_mm_cc_impl.h"
 #include <gnuradio/io_signature.h>
-#include <gnuradio/prefs.h>
 #include <gnuradio/math.h>
-#include <stdexcept>
-#include <sstream>
+#include <gnuradio/prefs.h>
 #include <iomanip>
+#include <sstream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
index 972e1c134b5..2734a3e83ee 100644
--- a/gr-digital/lib/constellation.cc
+++ b/gr-digital/lib/constellation.cc
@@ -24,17 +24,17 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/digital/constellation.h>
-#include <gnuradio/math.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
 
 #include <boost/format.hpp>
 
-#include <cstdlib>
 #include <cfloat>
-#include <stdexcept>
+#include <cstdlib>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc
index a0f74efa037..7fb7559d5ef 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.cc
+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "constellation_receiver_cb_impl.h"
+#include <gnuradio/expj.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <gnuradio/expj.h>
 #include <gnuradio/tag_checker.h>
 #include <stdexcept>
 
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h
index c5de48f7a6d..45e3755e40d 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.h
+++ b/gr-digital/lib/constellation_receiver_cb_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
 #define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
 
-#include <gnuradio/digital/constellation_receiver_cb.h>
 #include <gnuradio/attributes.h>
+#include <gnuradio/digital/constellation_receiver_cb.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/math.h>
 
diff --git a/gr-digital/lib/corr_est_cc_impl.cc b/gr-digital/lib/corr_est_cc_impl.cc
index 8e6ef9832a6..b45a7280b4d 100644
--- a/gr-digital/lib/corr_est_cc_impl.cc
+++ b/gr-digital/lib/corr_est_cc_impl.cc
@@ -24,14 +24,14 @@
 #include "config.h"
 #endif
 
+#include "corr_est_cc_impl.h"
+#include <gnuradio/filter/firdes.h>
+#include <gnuradio/filter/pfb_arb_resampler.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include "corr_est_cc_impl.h"
 #include <volk/volk.h>
 #include <boost/format.hpp>
 #include <boost/math/special_functions/round.hpp>
-#include <gnuradio/filter/pfb_arb_resampler.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc
index 23b5b4282e4..15f37ee0c15 100644
--- a/gr-digital/lib/correlate_access_code_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_impl.cc
@@ -25,11 +25,11 @@
 #endif
 
 #include "correlate_access_code_bb_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/blocks/count_bits.h>
+#include <gnuradio/io_signature.h>
 #include <boost/format.hpp>
-#include <stdexcept>
 #include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
index bf70b296f61..ca584413c6b 100644
--- a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
@@ -26,11 +26,11 @@
 
 #include "correlate_access_code_bb_ts_impl.h"
 #include <gnuradio/io_signature.h>
-#include <boost/format.hpp>
-#include <stdexcept>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 #include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
index e784aa34b78..3813a5a5b4f 100644
--- a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
@@ -27,11 +27,11 @@
 #include "correlate_access_code_ff_ts_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <boost/format.hpp>
-#include <stdexcept>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 #include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
index 8af9b9d0f2e..7919eaa1b9f 100644
--- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
@@ -26,11 +26,11 @@
 
 #include "correlate_access_code_tag_bb_impl.h"
 #include <gnuradio/io_signature.h>
-#include <boost/format.hpp>
-#include <stdexcept>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 #include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
index 8b7c6f807ef..3d987435970 100644
--- a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
@@ -27,11 +27,11 @@
 #include "correlate_access_code_tag_ff_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <boost/format.hpp>
-#include <stdexcept>
 #include <volk/volk.h>
+#include <boost/format.hpp>
 #include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
index dc36d8df63f..23ab7fc36e7 100644
--- a/gr-digital/lib/costas_loop_cc_impl.cc
+++ b/gr-digital/lib/costas_loop_cc_impl.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include "costas_loop_cc_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
-#include <gnuradio/sincos.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 #include <boost/format.hpp>
 
 namespace gr {
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h
index e40bbbe9c0a..e912f2e22b9 100644
--- a/gr-digital/lib/cpmmod_bc_impl.h
+++ b/gr-digital/lib/cpmmod_bc_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H
 #define INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H
 
-#include <gnuradio/digital/cpmmod_bc.h>
-#include <gnuradio/blocks/char_to_float.h>
 #include <gnuradio/analog/frequency_modulator_fc.h>
+#include <gnuradio/blocks/char_to_float.h>
+#include <gnuradio/digital/cpmmod_bc.h>
 #include <gnuradio/filter/interp_fir_filter.h>
 
 namespace gr {
diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc
index 0dc16cf5d61..bffbb2a7379 100644
--- a/gr-digital/lib/crc32_async_bb_impl.cc
+++ b/gr-digital/lib/crc32_async_bb_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
+#include "crc32_async_bb_impl.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include "crc32_async_bb_impl.h"
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc
index fa46eb1776d..be718ad0baa 100644
--- a/gr-digital/lib/crc32_bb_impl.cc
+++ b/gr-digital/lib/crc32_bb_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "crc32_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc
index 3430c98c1f8..366893a888a 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.cc
+++ b/gr-digital/lib/fll_band_edge_cc_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "fll_band_edge_cc_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <cstdio>
 
 namespace gr {
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h
index 827662dafd8..7acb9501171 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.h
+++ b/gr-digital/lib/fll_band_edge_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H
 #define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H
 
-#include <gnuradio/digital/fll_band_edge_cc.h>
 #include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/digital/fll_band_edge_cc.h>
 #include <gnuradio/filter/fir_filter_with_buffer.h>
 
 namespace gr {
diff --git a/gr-digital/lib/glfsr_source_b_impl.h b/gr-digital/lib/glfsr_source_b_impl.h
index 246e82f01e9..391d108983a 100644
--- a/gr-digital/lib/glfsr_source_b_impl.h
+++ b/gr-digital/lib/glfsr_source_b_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_GLFSR_SOURCE_B_IMPL_H
 #define INCLUDED_GR_GLFSR_SOURCE_B_IMPL_H
 
-#include <gnuradio/digital/glfsr_source_b.h>
 #include <gnuradio/digital/glfsr.h>
+#include <gnuradio/digital/glfsr_source_b.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/glfsr_source_f_impl.h b/gr-digital/lib/glfsr_source_f_impl.h
index 0742d155b7d..5d5f2302d4e 100644
--- a/gr-digital/lib/glfsr_source_f_impl.h
+++ b/gr-digital/lib/glfsr_source_f_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_GLFSR_SOURCE_F_IMPL_H
 #define INCLUDED_GR_GLFSR_SOURCE_F_IMPL_H
 
-#include <gnuradio/digital/glfsr_source_f.h>
 #include <gnuradio/digital/glfsr.h>
+#include <gnuradio/digital/glfsr_source_f.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.cc b/gr-digital/lib/hdlc_deframer_bp_impl.cc
index 138e4fa7142..f55c6c3a1ca 100644
--- a/gr-digital/lib/hdlc_deframer_bp_impl.cc
+++ b/gr-digital/lib/hdlc_deframer_bp_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
+#include "hdlc_deframer_bp_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/tags.h>
-#include "hdlc_deframer_bp_impl.h"
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/hdlc_framer_pb_impl.cc b/gr-digital/lib/hdlc_framer_pb_impl.cc
index 37af4f17730..13d80e9b853 100644
--- a/gr-digital/lib/hdlc_framer_pb_impl.cc
+++ b/gr-digital/lib/hdlc_framer_pb_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
+#include "hdlc_framer_pb_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/tags.h>
-#include "hdlc_framer_pb_impl.h"
 #include <iostream>
 
 namespace gr {
diff --git a/gr-digital/lib/header_buffer.cc b/gr-digital/lib/header_buffer.cc
index 3b014d9896b..10688bbf0b8 100644
--- a/gr-digital/lib/header_buffer.cc
+++ b/gr-digital/lib/header_buffer.cc
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
+#include <gnuradio/digital/header_buffer.h>
 #include <string.h>
+#include <volk/volk.h>
 #include <algorithm>
 #include <stdexcept>
-#include <volk/volk.h>
-#include <gnuradio/digital/header_buffer.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/header_format_base.cc b/gr-digital/lib/header_format_base.cc
index b8b3c63df4d..a66aac38923 100644
--- a/gr-digital/lib/header_format_base.cc
+++ b/gr-digital/lib/header_format_base.cc
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
-#include <iostream>
-#include <string.h>
-#include <volk/volk.h>
 #include <gnuradio/digital/header_format_base.h>
 #include <gnuradio/math.h>
+#include <string.h>
+#include <volk/volk.h>
+#include <iostream>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/header_format_counter.cc b/gr-digital/lib/header_format_counter.cc
index 1dbd9993399..ac9262948f5 100644
--- a/gr-digital/lib/header_format_counter.cc
+++ b/gr-digital/lib/header_format_counter.cc
@@ -23,13 +23,13 @@
 #include "config.h"
 #endif
 
-#include <iostream>
-#include <iomanip>
-#include <string.h>
-#include <volk/volk.h>
-#include <gnuradio/digital/header_format_counter.h>
 #include <gnuradio/digital/header_buffer.h>
+#include <gnuradio/digital/header_format_counter.h>
 #include <gnuradio/math.h>
+#include <string.h>
+#include <volk/volk.h>
+#include <iomanip>
+#include <iostream>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/header_format_crc.cc b/gr-digital/lib/header_format_crc.cc
index aa967d6c71b..c7cb821725c 100644
--- a/gr-digital/lib/header_format_crc.cc
+++ b/gr-digital/lib/header_format_crc.cc
@@ -23,10 +23,10 @@
 #include "config.h"
 #endif
 
+#include <gnuradio/digital/header_buffer.h>
+#include <gnuradio/digital/header_format_crc.h>
 #include <string.h>
 #include <volk/volk.h>
-#include <gnuradio/digital/header_format_crc.h>
-#include <gnuradio/digital/header_buffer.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/header_format_default.cc b/gr-digital/lib/header_format_default.cc
index a82adfb8019..c4eb0d16fb3 100644
--- a/gr-digital/lib/header_format_default.cc
+++ b/gr-digital/lib/header_format_default.cc
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
-#include <iostream>
-#include <string.h>
-#include <volk/volk.h>
 #include <gnuradio/digital/header_format_default.h>
 #include <gnuradio/math.h>
+#include <string.h>
+#include <volk/volk.h>
+#include <iostream>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/header_format_ofdm.cc b/gr-digital/lib/header_format_ofdm.cc
index 16bfd1270b7..810b8a91340 100644
--- a/gr-digital/lib/header_format_ofdm.cc
+++ b/gr-digital/lib/header_format_ofdm.cc
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-#include <volk/volk.h>
-#include <gnuradio/digital/header_format_ofdm.h>
 #include <gnuradio/digital/header_buffer.h>
+#include <gnuradio/digital/header_format_ofdm.h>
 #include <gnuradio/digital/lfsr.h>
+#include <string.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/interpolating_resampler.cc b/gr-digital/lib/interpolating_resampler.cc
index ddf34317b03..9f59968b1db 100644
--- a/gr-digital/lib/interpolating_resampler.cc
+++ b/gr-digital/lib/interpolating_resampler.cc
@@ -26,8 +26,8 @@
 
 #include "interpolating_resampler.h"
 #include <gnuradio/math.h>
-#include <stdexcept>
 #include <deque>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
@@ -232,8 +232,8 @@ unsigned int interp_resampler_mmse_8tap_ff::ntaps() const { return d_interp->nta
 
 /*************************************************************************/
 
-#include "gnuradio/filter/interpolator_taps.h"
 #include "gnuradio/filter/interp_differentiator_taps.h"
+#include "gnuradio/filter/interpolator_taps.h"
 
 interp_resampler_pfb_no_mf_cc::interp_resampler_pfb_no_mf_cc(bool derivative, int nfilts)
     : interpolating_resampler_ccf(IR_PFB_NO_MF, derivative),
diff --git a/gr-digital/lib/interpolating_resampler.h b/gr-digital/lib/interpolating_resampler.h
index 59e8b4a6772..78190386c01 100644
--- a/gr-digital/lib/interpolating_resampler.h
+++ b/gr-digital/lib/interpolating_resampler.h
@@ -23,13 +23,13 @@
 #ifndef INCLUDED_DIGITAL_INTERPOLATING_RESAMPLER_H
 #define INCLUDED_DIGITAL_INTERPOLATING_RESAMPLER_H
 
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/digital/interpolating_resampler_type.h>
-#include <vector>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <gnuradio/filter/mmse_interp_differentiator_ff.h>
+#include <gnuradio/gr_complex.h>
+#include <vector>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.h b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
index 85d7825dd4c..6ae21ed61d8 100644
--- a/gr-digital/lib/kurtotic_equalizer_cc_impl.h
+++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
@@ -26,8 +26,8 @@
 #include <gnuradio/digital/kurtotic_equalizer_cc.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/math.h>
-#include <stdexcept>
 #include <complex>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/modulate_vector.cc b/gr-digital/lib/modulate_vector.cc
index eabd5964ab7..21660862074 100644
--- a/gr-digital/lib/modulate_vector.cc
+++ b/gr-digital/lib/modulate_vector.cc
@@ -40,11 +40,11 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/blocks/vector_source.h>
 #include <gnuradio/blocks/vector_sink.h>
+#include <gnuradio/blocks/vector_source.h>
+#include <gnuradio/digital/modulate_vector.h>
 #include <gnuradio/filter/fir_filter_blk.h>
 #include <gnuradio/top_block.h>
-#include <gnuradio/digital/modulate_vector.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/mpsk_snr_est.cc b/gr-digital/lib/mpsk_snr_est.cc
index 818aab34cbc..7ffaa99df77 100644
--- a/gr-digital/lib/mpsk_snr_est.cc
+++ b/gr-digital/lib/mpsk_snr_est.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include <gnuradio/digital/mpsk_snr_est.h>
-#include <stdexcept>
 #include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.cc b/gr-digital/lib/msk_timing_recovery_cc_impl.cc
index 98005eae2f3..1e4db9a6f32 100644
--- a/gr-digital/lib/msk_timing_recovery_cc_impl.cc
+++ b/gr-digital/lib/msk_timing_recovery_cc_impl.cc
@@ -24,10 +24,10 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include <gnuradio/math.h>
 #include "msk_timing_recovery_cc_impl.h"
 #include <gnuradio/filter/firdes.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.h b/gr-digital/lib/msk_timing_recovery_cc_impl.h
index d80bf0b5702..ede1586c9eb 100644
--- a/gr-digital/lib/msk_timing_recovery_cc_impl.h
+++ b/gr-digital/lib/msk_timing_recovery_cc_impl.h
@@ -24,9 +24,9 @@
 #define INCLUDED_DIGITAL_MSK_TIMING_RECOVERY_CC_IMPL_H
 
 #include <gnuradio/digital/msk_timing_recovery_cc.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
index 69e75a16889..82b105bfbaa 100644
--- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
+++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "ofdm_carrier_allocator_cvc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
index a653ddb4c8d..ea991990a75 100644
--- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
+++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "ofdm_chanest_vcvc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/ofdm_frame_acquisition_impl.cc b/gr-digital/lib/ofdm_frame_acquisition_impl.cc
index 346adcb74b5..0f17c171812 100644
--- a/gr-digital/lib/ofdm_frame_acquisition_impl.cc
+++ b/gr-digital/lib/ofdm_frame_acquisition_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "ofdm_frame_acquisition_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <cstdio>
 
diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
index 29822c970f5..e03e4ccf9c1 100644
--- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
+++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
@@ -24,8 +24,8 @@
 #endif
 
 #include "ofdm_frame_equalizer_vcvc_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 
 static const pmt::pmt_t CARR_OFFSET_KEY = pmt::mp("ofdm_sync_carr_offset");
diff --git a/gr-digital/lib/ofdm_frame_sink_impl.cc b/gr-digital/lib/ofdm_frame_sink_impl.cc
index e824201e647..c0b7b1a8a19 100644
--- a/gr-digital/lib/ofdm_frame_sink_impl.cc
+++ b/gr-digital/lib/ofdm_frame_sink_impl.cc
@@ -25,13 +25,13 @@
 #endif
 
 #include "ofdm_frame_sink_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <cmath>
 #include <cstdio>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 #include <string>
 
 namespace gr {
diff --git a/gr-digital/lib/ofdm_insert_preamble_impl.cc b/gr-digital/lib/ofdm_insert_preamble_impl.cc
index 38be3a4efa5..6dca224d735 100644
--- a/gr-digital/lib/ofdm_insert_preamble_impl.cc
+++ b/gr-digital/lib/ofdm_insert_preamble_impl.cc
@@ -25,8 +25,8 @@
 
 #include "ofdm_insert_preamble_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 #include <string>
 
 namespace gr {
diff --git a/gr-digital/lib/ofdm_sampler_impl.cc b/gr-digital/lib/ofdm_sampler_impl.cc
index a736e19ebc6..f3fe0a70b8c 100644
--- a/gr-digital/lib/ofdm_sampler_impl.cc
+++ b/gr-digital/lib/ofdm_sampler_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "ofdm_sampler_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <cstdio>
 
 namespace gr {
diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.cc b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
index 036d2fbcea7..e4a87b50f88 100644
--- a/gr-digital/lib/ofdm_serializer_vcc_impl.cc
+++ b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
@@ -23,8 +23,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "ofdm_serializer_vcc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
index 70dada43038..ae838ebdf8e 100644
--- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
+++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "ofdm_sync_sc_cfb_impl.h"
+#include <gnuradio/io_signature.h>
 
 #include <gnuradio/blocks/complex_to_arg.h>
 #include <gnuradio/blocks/complex_to_mag_squared.h>
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
index 52b224cb0ff..5d3c057088f 100644
--- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
+++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_IMPL_H
 #define INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_IMPL_H
 
-#include <gnuradio/digital/ofdm_sync_sc_cfb.h>
 #include <gnuradio/blocks/plateau_detector_fb.h>
+#include <gnuradio/digital/ofdm_sync_sc_cfb.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/packet_header_default.cc b/gr-digital/lib/packet_header_default.cc
index 4178a3e286a..c18a7aa15d4 100644
--- a/gr-digital/lib/packet_header_default.cc
+++ b/gr-digital/lib/packet_header_default.cc
@@ -23,8 +23,8 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <gnuradio/digital/packet_header_default.h>
+#include <string.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc
index 61f27aa70fb..d85ba3d9681 100644
--- a/gr-digital/lib/packet_header_ofdm.cc
+++ b/gr-digital/lib/packet_header_ofdm.cc
@@ -23,8 +23,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/digital/packet_header_ofdm.h>
 #include <gnuradio/digital/lfsr.h>
+#include <gnuradio/digital/packet_header_ofdm.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.cc b/gr-digital/lib/packet_headergenerator_bb_impl.cc
index 958fe499ddc..5103a19972e 100644
--- a/gr-digital/lib/packet_headergenerator_bb_impl.cc
+++ b/gr-digital/lib/packet_headergenerator_bb_impl.cc
@@ -23,9 +23,9 @@
 #include "config.h"
 #endif
 
-#include <boost/format.hpp>
-#include <gnuradio/io_signature.h>
 #include "packet_headergenerator_bb_impl.h"
+#include <gnuradio/io_signature.h>
+#include <boost/format.hpp>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc
index 68f82d309e7..aa7f7cbfa1f 100644
--- a/gr-digital/lib/packet_headerparser_b_impl.cc
+++ b/gr-digital/lib/packet_headerparser_b_impl.cc
@@ -23,9 +23,9 @@
 #include "config.h"
 #endif
 
-#include <boost/format.hpp>
-#include <gnuradio/io_signature.h>
 #include "packet_headerparser_b_impl.h"
+#include <gnuradio/io_signature.h>
+#include <boost/format.hpp>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/packet_sink_impl.cc b/gr-digital/lib/packet_sink_impl.cc
index be58659378a..6c784f51084 100644
--- a/gr-digital/lib/packet_sink_impl.cc
+++ b/gr-digital/lib/packet_sink_impl.cc
@@ -25,15 +25,15 @@
 #endif
 
 #include "packet_sink_impl.h"
+#include <gnuradio/blocks/count_bits.h>
 #include <gnuradio/io_signature.h>
-#include <cstdio>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdexcept>
-#include <gnuradio/blocks/count_bits.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
index 710ad014c9f..5962eca761d 100644
--- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <cstdio>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
+#include <cstdio>
 
 #include "pfb_clock_sync_ccf_impl.h"
 #include <gnuradio/io_signature.h>
diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
index 95ee916baa5..dbfadf2ed73 100644
--- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
 
 #include "pfb_clock_sync_fff_impl.h"
 #include <gnuradio/io_signature.h>
diff --git a/gr-digital/lib/pn_correlator_cc_impl.h b/gr-digital/lib/pn_correlator_cc_impl.h
index 81160060971..0c51cdead66 100644
--- a/gr-digital/lib/pn_correlator_cc_impl.h
+++ b/gr-digital/lib/pn_correlator_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_PN_CORRELATOR_CC_IMPL_H
 #define INCLUDED_GR_PN_CORRELATOR_CC_IMPL_H
 
-#include <gnuradio/digital/pn_correlator_cc.h>
 #include <gnuradio/digital/glfsr.h>
+#include <gnuradio/digital/pn_correlator_cc.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc
index 7e6fcbaf09f..84b693745da 100644
--- a/gr-digital/lib/protocol_formatter_async_impl.cc
+++ b/gr-digital/lib/protocol_formatter_async_impl.cc
@@ -24,10 +24,10 @@
 #include "config.h"
 #endif
 
-#include <volk/volk.h>
-#include <gnuradio/io_signature.h>
 #include "protocol_formatter_async_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdio.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/protocol_formatter_bb_impl.cc b/gr-digital/lib/protocol_formatter_bb_impl.cc
index 46113fada50..19a0027b52d 100644
--- a/gr-digital/lib/protocol_formatter_bb_impl.cc
+++ b/gr-digital/lib/protocol_formatter_bb_impl.cc
@@ -24,10 +24,10 @@
 #include "config.h"
 #endif
 
-#include <volk/volk.h>
-#include <gnuradio/io_signature.h>
 #include "protocol_formatter_bb_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdio.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/protocol_parser_b_impl.cc b/gr-digital/lib/protocol_parser_b_impl.cc
index 6d888f95b09..7a0f849bce1 100644
--- a/gr-digital/lib/protocol_parser_b_impl.cc
+++ b/gr-digital/lib/protocol_parser_b_impl.cc
@@ -26,9 +26,9 @@
 
 #include "protocol_parser_b_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <volk/volk.h>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/qa_header_buffer.cc b/gr-digital/lib/qa_header_buffer.cc
index 03f414d7674..d3cfd0f0f74 100644
--- a/gr-digital/lib/qa_header_buffer.cc
+++ b/gr-digital/lib/qa_header_buffer.cc
@@ -26,9 +26,9 @@
 
 #include <gnuradio/attributes.h>
 #include <gnuradio/digital/header_buffer.h>
+#include <stdio.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <stdio.h>
 
 BOOST_AUTO_TEST_CASE(test_add8)
 {
diff --git a/gr-digital/lib/qa_header_format.cc b/gr-digital/lib/qa_header_format.cc
index 7e0c0a5b02f..cffd4f07d8b 100644
--- a/gr-digital/lib/qa_header_format.cc
+++ b/gr-digital/lib/qa_header_format.cc
@@ -25,14 +25,14 @@
 #endif
 
 #include <gnuradio/attributes.h>
+#include <gnuradio/blocks/unpack_k_bits.h>
 #include <gnuradio/digital/header_format_counter.h>
 #include <gnuradio/digital/header_format_default.h>
-#include <gnuradio/blocks/unpack_k_bits.h>
 #include <gnuradio/expj.h>
 #include <gnuradio/xoroshiro128p.h>
+#include <stdio.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <stdio.h>
 #include <cmath>
 
 static void
diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h
index 585c6a484cc..df87705ea10 100644
--- a/gr-digital/lib/scrambler_bb_impl.h
+++ b/gr-digital/lib/scrambler_bb_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_SCRAMBLER_BB_IMPL_H
 #define INCLUDED_GR_SCRAMBLER_BB_IMPL_H
 
+#include <gnuradio/digital/lfsr.h>
 #include <gnuradio/digital/scrambler_bb.h>
 #include <gnuradio/sync_block.h>
-#include <gnuradio/digital/lfsr.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc
index 8b9d192f43e..b19c8f30644 100644
--- a/gr-digital/lib/simple_correlator_impl.cc
+++ b/gr-digital/lib/simple_correlator_impl.cc
@@ -25,13 +25,13 @@
 #endif
 
 #include "simple_correlator_impl.h"
+#include <gnuradio/blocks/count_bits.h>
 #include <gnuradio/digital/simple_framer_sync.h>
 #include <gnuradio/io_signature.h>
-#include <gnuradio/blocks/count_bits.h>
 #include <assert.h>
-#include <stdexcept>
 #include <string.h>
 #include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc
index aa5fd3dd4bb..66009ff58b8 100644
--- a/gr-digital/lib/symbol_sync_cc_impl.cc
+++ b/gr-digital/lib/symbol_sync_cc_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "symbol_sync_cc_impl.h"
-#include <boost/math/common_factor.hpp>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
+#include <boost/math/common_factor.hpp>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-digital/lib/symbol_sync_cc_impl.h b/gr-digital/lib/symbol_sync_cc_impl.h
index c1d34524c68..22511630977 100644
--- a/gr-digital/lib/symbol_sync_cc_impl.h
+++ b/gr-digital/lib/symbol_sync_cc_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_DIGITAL_SYMBOL_SYNC_CC_IMPL_H
 #define INCLUDED_DIGITAL_SYMBOL_SYNC_CC_IMPL_H
 
-#include <gnuradio/digital/symbol_sync_cc.h>
 #include "clock_tracking_loop.h"
-#include "timing_error_detector.h"
 #include "interpolating_resampler.h"
+#include "timing_error_detector.h"
+#include <gnuradio/digital/symbol_sync_cc.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc
index b7eb959071e..d3a61d486b8 100644
--- a/gr-digital/lib/symbol_sync_ff_impl.cc
+++ b/gr-digital/lib/symbol_sync_ff_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "symbol_sync_ff_impl.h"
-#include <boost/math/common_factor.hpp>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
+#include <boost/math/common_factor.hpp>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-digital/lib/symbol_sync_ff_impl.h b/gr-digital/lib/symbol_sync_ff_impl.h
index bd86326efff..64e3d05b808 100644
--- a/gr-digital/lib/symbol_sync_ff_impl.h
+++ b/gr-digital/lib/symbol_sync_ff_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_DIGITAL_SYMBOL_SYNC_FF_IMPL_H
 #define INCLUDED_DIGITAL_SYMBOL_SYNC_FF_IMPL_H
 
-#include <gnuradio/digital/symbol_sync_ff.h>
 #include "clock_tracking_loop.h"
-#include "timing_error_detector.h"
 #include "interpolating_resampler.h"
+#include "timing_error_detector.h"
+#include <gnuradio/digital/symbol_sync_ff.h>
 
 namespace gr {
 namespace digital {
diff --git a/gr-digital/lib/timing_error_detector.h b/gr-digital/lib/timing_error_detector.h
index 1397a0cc9b1..ba2b456f2d8 100644
--- a/gr-digital/lib/timing_error_detector.h
+++ b/gr-digital/lib/timing_error_detector.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DIGITAL_TIMING_ERROR_DETECTOR_H
 #define INCLUDED_DIGITAL_TIMING_ERROR_DETECTOR_H
 
-#include <gnuradio/gr_complex.h>
-#include <gnuradio/digital/timing_error_detector_type.h>
 #include <gnuradio/digital/constellation.h>
+#include <gnuradio/digital/timing_error_detector_type.h>
+#include <gnuradio/gr_complex.h>
 #include <deque>
 
 namespace gr {
diff --git a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
index cc605cb99c0..1c2d0ac80ca 100644
--- a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
+++ b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_EQUALIZER_H
 #define INCLUDED_DTV_ATSC_EQUALIZER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h b/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h
index 2ea3432b059..d68c8d04d25 100644
--- a/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h
+++ b/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_ATSC_FIELD_SYNC_MUX_H
 #define INCLUDED_DTV_ATSC_FIELD_SYNC_MUX_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h b/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h
index 7cfc8827655..84340648563 100644
--- a/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h
+++ b/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_FS_CHECKER_H
 #define INCLUDED_DTV_ATSC_FS_CHECKER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h
index 946075ac1c0..ca8d74e1eda 100644
--- a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_CATV_FRAME_SYNC_ENC_BB_H
 #define INCLUDED_DTV_CATV_FRAME_SYNC_ENC_BB_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/catv_config.h>
 
 namespace gr {
diff --git a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h
index 3229d87553c..e99eae441c0 100644
--- a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h
@@ -22,8 +22,8 @@
 #define INCLUDED_DTV_CATV_RANDOMIZER_BB_H
 
 #include <gnuradio/dtv/api.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/dtv/catv_config.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h
index d5f8bb5ff38..f34f3259e31 100644
--- a/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_CATV_REED_SOLOMON_ENC_BB_H
 #define INCLUDED_DTV_CATV_REED_SOLOMON_ENC_BB_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h
index 3c324340eb6..46ca23f056d 100644
--- a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_CATV_TRELLIS_ENC_BB_H
 #define INCLUDED_DTV_CATV_TRELLIS_ENC_BB_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/catv_config.h>
 
 namespace gr {
diff --git a/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h
index ab76b05ab21..78302062cbb 100644
--- a/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h
@@ -21,11 +21,11 @@
 #ifndef INCLUDED_DTV_DVB_BBHEADER_BB_H
 #define INCLUDED_DTV_DVB_BBHEADER_BB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
-#include <gnuradio/dtv/dvbt2_config.h>
 #include <gnuradio/dtv/dvbs2_config.h>
-#include <gnuradio/block.h>
+#include <gnuradio/dtv/dvbt2_config.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h
index 3daafaf6278..d19a736f943 100644
--- a/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_DTV_DVB_BCH_BB_H
 #define INCLUDED_DTV_DVB_BCH_BB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h
index 702d9c25807..e5b54512b3d 100644
--- a/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_DVB_LDPC_BB_H
 #define INCLUDED_DTV_DVB_LDPC_BB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h b/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h
index af7731fa655..14ac91687bb 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_DVBS2_INTERLEAVER_BB_H
 #define INCLUDED_DTV_DVBS2_INTERLEAVER_BB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h b/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h
index 1c6f6b4e564..0abae2b308c 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBS2_MODULATOR_BC_H
 #define INCLUDED_DTV_DVBS2_MODULATOR_BC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbs2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h b/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h
index bf872de4864..bfd411e6200 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBS2_PHYSICAL_CC_H
 #define INCLUDED_DTV_DVBS2_PHYSICAL_CC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbs2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
index 0a4827a7349..3a57e9fd4dc 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT2_FRAMEMAPPER_CC_H
 #define INCLUDED_DTV_DVBT2_FRAMEMAPPER_CC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h b/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h
index 78911d1c909..47304199617 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_DVBT2_INTERLEAVER_BB_H
 #define INCLUDED_DTV_DVBT2_INTERLEAVER_BB_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h
index 6c045108264..68f214c41ce 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT2_MODULATOR_BC_H
 #define INCLUDED_DTV_DVBT2_MODULATOR_BC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
index b45c6dedf27..9e8926da58c 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT2_P1INSERTION_CC_H
 #define INCLUDED_DTV_DVBT2_P1INSERTION_CC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
index 6fd40f5579b..b79fdb14c41 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT2_PILOTGENERATOR_CC_H
 #define INCLUDED_DTV_DVBT2_PILOTGENERATOR_CC_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt2_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h
index 7b3a517c757..2f060c4fa8d 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_BIT_INNER_DEINTERLEVER_H
 #define INCLUDED_DTV_DVBT_BIT_INNER_DEINTERLEVER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h
index 3f06a9d2a39..5b4809f9c2c 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_BIT_INNER_INTERLEAVER_H
 #define INCLUDED_DTV_DVBT_BIT_INNER_INTERLEAVER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h
index 15d7b7e2b2b..65c25cff967 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_CONVOLUTIONAL_DEINTERLEAVER_H
 #define INCLUDED_DTV_DVBT_CONVOLUTIONAL_DEINTERLEAVER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_demap.h b/gr-dtv/include/gnuradio/dtv/dvbt_demap.h
index e6763bee975..bffbac7414a 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_demap.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_demap.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_DVBT_DEMAP_H
 #define INCLUDED_DTV_DVBT_DVBT_DEMAP_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h b/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h
index 1ed450f0aca..3e1eaf40f0b 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_DEMOD_REFERENCE_SIGNALS_H
 #define INCLUDED_DTV_DVBT_DEMOD_REFERENCE_SIGNALS_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h b/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h
index 2f97bbbc061..85050c30d16 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_ENERGY_DESCRAMBLE_H
 #define INCLUDED_DTV_DVBT_ENERGY_DESCRAMBLE_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h b/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h
index 051410fb791..9615a2f1a2e 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_ENERGY_DISPERSAL_H
 #define INCLUDED_DTV_DVBT_ENERGY_DISPERSAL_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h b/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h
index 6c030485429..401ffe42edb 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_INNER_CODER_H
 #define INCLUDED_DTV_DVBT_INNER_CODER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_map.h b/gr-dtv/include/gnuradio/dtv/dvbt_map.h
index 01325175240..cda09f3ff73 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_map.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_map.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT_MAP_H
 #define INCLUDED_DTV_DVBT_MAP_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h b/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h
index 55578a32973..608669559ce 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_OFDM_SYM_ACQUISITION_H
 #define INCLUDED_DTV_DVBT_OFDM_SYM_ACQUISITION_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h
index 8341ec00a31..f438b07f91b 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_REED_SOLOMON_DEC_H
 #define INCLUDED_DTV_DVBT_REED_SOLOMON_DEC_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h
index 4bb12b1f57b..f9e4d0c2442 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_REED_SOLOMON_ENC_H
 #define INCLUDED_DTV_DVBT_REED_SOLOMON_ENC_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h b/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h
index 64bcd8b1770..92c28adb7b1 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT_REFERENCE_SIGNALS_H
 #define INCLUDED_DTV_DVBT_REFERENCE_SIGNALS_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
index a2fe0f6fa38..6df0d2dccf8 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_SYMBOL_INNER_INTERLEAVER_H
 #define INCLUDED_DTV_DVBT_SYMBOL_INNER_INTERLEAVER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
 namespace gr {
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h b/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h
index 0a8c419a30f..f97f7bf21c2 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_VITERBI_DECODER_H
 #define INCLUDED_DTV_DVBT_VITERBI_DECODER_H
 
-#include <gnuradio/dtv/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
 #include <gnuradio/dtv/dvbt_config.h>
 
diff --git a/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h
index b9202e4f224..f52d66881ad 100644
--- a/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h
+++ b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DTV_ATSC_DEINTERLEAVER_IMPL_H
 #define INCLUDED_DTV_ATSC_DEINTERLEAVER_IMPL_H
 
-#include <gnuradio/dtv/atsc_deinterleaver.h>
 #include "atsc_types.h"
 #include "interleaver_fifo.h"
+#include <gnuradio/dtv/atsc_deinterleaver.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_depad_impl.h b/gr-dtv/lib/atsc/atsc_depad_impl.h
index b649f2f9d34..35f0bde6306 100644
--- a/gr-dtv/lib/atsc/atsc_depad_impl.h
+++ b/gr-dtv/lib/atsc/atsc_depad_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_DEPAD_IMPL_H
 #define INCLUDED_DTV_ATSC_DEPAD_IMPL_H
 
-#include <gnuradio/dtv/atsc_depad.h>
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_depad.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_derandomizer_impl.h b/gr-dtv/lib/atsc/atsc_derandomizer_impl.h
index f93f0895f3d..fee2033e5b8 100644
--- a/gr-dtv/lib/atsc/atsc_derandomizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_derandomizer_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_DERANDOMIZER_IMPL_H
 #define INCLUDED_DTV_ATSC_DERANDOMIZER_IMPL_H
 
-#include <gnuradio/dtv/atsc_derandomizer.h>
 #include "atsc_randomize.h"
+#include <gnuradio/dtv/atsc_derandomizer.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
index 6dba4f180ff..a40740c1aa5 100644
--- a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "atsc_equalizer_impl.h"
-#include "atsc_types.h"
 #include "atsc_pnXXX_impl.h"
+#include "atsc_types.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.h b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
index 86e1171a094..70bf046078d 100644
--- a/gr-dtv/lib/atsc/atsc_equalizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_DTV_ATSC_EQUALIZER_IMPL_H
 #define INCLUDED_DTV_ATSC_EQUALIZER_IMPL_H
 
-#include <gnuradio/dtv/atsc_equalizer.h>
-#include <gnuradio/dtv/atsc_consts.h>
 #include "atsc_syminfo_impl.h"
+#include <gnuradio/dtv/atsc_consts.h>
+#include <gnuradio/dtv/atsc_equalizer.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc
index 4d058718f6e..e173d4ba999 100644
--- a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc
@@ -22,9 +22,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "atsc_field_sync_mux_impl.h"
 #include "gnuradio/dtv/atsc_consts.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.h b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.h
index 9e3083e104b..8399252fa2b 100644
--- a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.h
+++ b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_ATSC_FIELD_SYNC_MUX_IMPL_H
 #define INCLUDED_DTV_ATSC_FIELD_SYNC_MUX_IMPL_H
 
-#include <gnuradio/dtv/atsc_field_sync_mux.h>
 #include "atsc_pnXXX_impl.h"
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_field_sync_mux.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_fpll_impl.h b/gr-dtv/lib/atsc/atsc_fpll_impl.h
index 1cc5bbd1274..a832866aa85 100644
--- a/gr-dtv/lib/atsc/atsc_fpll_impl.h
+++ b/gr-dtv/lib/atsc/atsc_fpll_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_DTV_ATSC_FPLL_IMPL_H
 #define INCLUDED_DTV_ATSC_FPLL_IMPL_H
 
+#include <gnuradio/analog/agc.h>
 #include <gnuradio/dtv/atsc_fpll.h>
-#include <gnuradio/nco.h>
 #include <gnuradio/filter/single_pole_iir.h>
-#include <gnuradio/analog/agc.h>
+#include <gnuradio/nco.h>
 #include <stdio.h>
 
 namespace gr {
diff --git a/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc
index 62976502278..29907404e2a 100644
--- a/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "atsc_fs_checker_impl.h"
-#include "atsc_types.h"
-#include "atsc_syminfo_impl.h"
 #include "atsc_pnXXX_impl.h"
+#include "atsc_syminfo_impl.h"
+#include "atsc_types.h"
 #include "gnuradio/dtv/atsc_consts.h"
 #include <gnuradio/io_signature.h>
 
diff --git a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h
index 544f6a4ba6a..2f8325277be 100644
--- a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h
+++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_FS_CHECKER_IMPL_H
 #define INCLUDED_DTV_ATSC_FS_CHECKER_IMPL_H
 
-#include <gnuradio/dtv/atsc_fs_checker.h>
 #include "atsc_syminfo_impl.h"
+#include <gnuradio/dtv/atsc_fs_checker.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_interleaver_impl.h b/gr-dtv/lib/atsc/atsc_interleaver_impl.h
index 884b6a4ccc9..782c3b227eb 100644
--- a/gr-dtv/lib/atsc/atsc_interleaver_impl.h
+++ b/gr-dtv/lib/atsc/atsc_interleaver_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_ATSC_INTERLEAVER_IMPL_H
 #define INCLUDED_DTV_ATSC_INTERLEAVER_IMPL_H
 
-#include <gnuradio/dtv/atsc_interleaver.h>
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_interleaver.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_pad_impl.h b/gr-dtv/lib/atsc/atsc_pad_impl.h
index 471bf2d8eef..fe914fa60d2 100644
--- a/gr-dtv/lib/atsc/atsc_pad_impl.h
+++ b/gr-dtv/lib/atsc/atsc_pad_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_ATSC_PAD_IMPL_H
 #define INCLUDED_DTV_ATSC_PAD_IMPL_H
 
-#include <gnuradio/dtv/atsc_pad.h>
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_pad.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_randomizer_impl.cc b/gr-dtv/lib/atsc/atsc_randomizer_impl.cc
index f77bb80f9d9..2cf2c0201e9 100644
--- a/gr-dtv/lib/atsc/atsc_randomizer_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_randomizer_impl.cc
@@ -22,9 +22,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "atsc_randomizer_impl.h"
 #include "gnuradio/dtv/atsc_consts.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_randomizer_impl.h b/gr-dtv/lib/atsc/atsc_randomizer_impl.h
index 6c90c1a99e6..c225151d6a4 100644
--- a/gr-dtv/lib/atsc/atsc_randomizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_randomizer_impl.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_ATSC_RANDOMIZER_IMPL_H
 #define INCLUDED_DTV_ATSC_RANDOMIZER_IMPL_H
 
-#include <gnuradio/dtv/atsc_randomizer.h>
 #include "atsc_randomize.h"
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_randomizer.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
index 926a9789e43..92bdd9b31a8 100644
--- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_DTV_ATSC_RS_DECODER_IMPL_H
 #define INCLUDED_DTV_ATSC_RS_DECODER_IMPL_H
 
-#include <gnuradio/dtv/atsc_rs_decoder.h>
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_rs_decoder.h>
 
 extern "C" {
 #include <gnuradio/fec/rs.h>
diff --git a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc
index 04a0c7c5a21..6b7100d9154 100644
--- a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "atsc_rs_encoder_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.h b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.h
index a6eb3ecd733..0912a13dce1 100644
--- a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_ATSC_RS_ENCODER_IMPL_H
 #define INCLUDED_DTV_ATSC_RS_ENCODER_IMPL_H
 
-#include <gnuradio/dtv/atsc_rs_encoder.h>
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_rs_encoder.h>
 
 extern "C" {
 #include <gnuradio/fec/rs.h>
diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.h b/gr-dtv/lib/atsc/atsc_sync_impl.h
index 544c554fc4d..654be77c5de 100644
--- a/gr-dtv/lib/atsc/atsc_sync_impl.h
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/dtv/atsc_consts.h>
 #include <gnuradio/dtv/atsc_sync.h>
-#include <gnuradio/filter/single_pole_iir.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/single_pole_iir.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc
index 1f474b73056..d8e2a1235dc 100644
--- a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc
@@ -22,9 +22,9 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
 #include "atsc_trellis_encoder_impl.h"
 #include "gnuradio/dtv/atsc_consts.h"
+#include <stdio.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.h b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.h
index 914d7b1ff38..31de4416f42 100644
--- a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.h
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_DTV_ATSC_TRELLIS_ENCODER_IMPL_H
 #define INCLUDED_DTV_ATSC_TRELLIS_ENCODER_IMPL_H
 
-#include <gnuradio/dtv/atsc_trellis_encoder.h>
 #include "atsc_basic_trellis_encoder.h"
 #include "atsc_types.h"
+#include <gnuradio/dtv/atsc_trellis_encoder.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_types.h b/gr-dtv/lib/atsc/atsc_types.h
index f1202d29e6e..c27ef1c451b 100644
--- a/gr-dtv/lib/atsc/atsc_types.h
+++ b/gr-dtv/lib/atsc/atsc_types.h
@@ -24,8 +24,8 @@
 #define DTV_INCLUDED_ATSC_TYPES_H
 
 #include <gnuradio/dtv/atsc_consts.h>
-#include <cstring>
 #include <cassert>
+#include <cstring>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc
index a30c5663d1b..43802b83991 100644
--- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc
@@ -24,10 +24,10 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include "atsc_viterbi_decoder_impl.h"
 #include "atsc_types.h"
+#include "atsc_viterbi_decoder_impl.h"
 #include "atsc_viterbi_mux.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
index f5420ef259a..07b15efa1f2 100644
--- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_DTV_ATSC_VITERBI_DECODER_IMPL_H
 #define INCLUDED_DTV_ATSC_VITERBI_DECODER_IMPL_H
 
-#include <gnuradio/dtv/atsc_viterbi_decoder.h>
-#include <gnuradio/dtv/atsc_consts.h>
-#include "atsc_syminfo_impl.h"
 #include "atsc_interleaver_fifo.h"
+#include "atsc_syminfo_impl.h"
+#include <gnuradio/dtv/atsc_consts.h>
+#include <gnuradio/dtv/atsc_viterbi_decoder.h>
 
 #define USE_SIMPLE_SLICER 0
 #define NCODERS 12
diff --git a/gr-dtv/lib/atsc/atsc_viterbi_gen.cc b/gr-dtv/lib/atsc/atsc_viterbi_gen.cc
index b19d2da0189..8b12d71ec24 100644
--- a/gr-dtv/lib/atsc/atsc_viterbi_gen.cc
+++ b/gr-dtv/lib/atsc/atsc_viterbi_gen.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <iostream>
 #include <stdio.h>
+#include <iostream>
 
 using std::cerr;
 
diff --git a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc
index 7d83efc4261..4e608d361fb 100644
--- a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc
+++ b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "catv_frame_sync_enc_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc b/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc
index 3d36ca1274e..3dfd81ba83a 100644
--- a/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc
+++ b/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "catv_randomizer_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc
index da05f8089bc..4f850dc2a19 100644
--- a/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc
+++ b/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "catv_reed_solomon_enc_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc
index 76ee79f2a2e..2eebb518989 100644
--- a/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc
+++ b/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "catv_transport_framing_enc_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc
index 5c718ffb02e..5a4bb56d5f8 100644
--- a/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc
+++ b/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "catv_trellis_enc_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
index d16c41e3792..51e91a152f6 100644
--- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvb_bbheader_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h
index fade8ff903c..26c98348054 100644
--- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h
+++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVB_BBHEADER_BB_IMPL_H
 #define INCLUDED_DTV_DVB_BBHEADER_BB_IMPL_H
 
-#include <gnuradio/dtv/dvb_bbheader_bb.h>
 #include "dvb_defines.h"
+#include <gnuradio/dtv/dvb_bbheader_bb.h>
 
 typedef struct {
     int ts_gs;
diff --git a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
index 4c2a9ecac90..b2ccde0df7c 100644
--- a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvb_bbscrambler_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.h b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.h
index 7483449980d..cdba98557e9 100644
--- a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.h
+++ b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVB_BBSCRAMBLER_BB_IMPL_H
 #define INCLUDED_DTV_DVB_BBSCRAMBLER_BB_IMPL_H
 
-#include <gnuradio/dtv/dvb_bbscrambler_bb.h>
 #include "dvb_defines.h"
+#include <gnuradio/dtv/dvb_bbscrambler_bb.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
index 9486c66e4f4..ae47278c962 100644
--- a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvb_bch_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvb/dvb_bch_bb_impl.h b/gr-dtv/lib/dvb/dvb_bch_bb_impl.h
index d6632a74061..dd40f816e92 100644
--- a/gr-dtv/lib/dvb/dvb_bch_bb_impl.h
+++ b/gr-dtv/lib/dvb/dvb_bch_bb_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVB_BCH_BB_IMPL_H
 #define INCLUDED_DTV_DVB_BCH_BB_IMPL_H
 
-#include <gnuradio/dtv/dvb_bch_bb.h>
 #include "dvb_defines.h"
+#include <gnuradio/dtv/dvb_bch_bb.h>
 #include <bitset>
 
 #define MAX_BCH_PARITY_BITS 192
diff --git a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
index dbcb5cbfde5..2b8e71e0272 100644
--- a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvb_ldpc_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc
index 05f9ee4a4b4..e056ef95968 100644
--- a/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc
+++ b/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbs2_interleaver_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
index b5687bd934b..af01a2c909d 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_bit_inner_deinterleaver_impl.h"
+#include <gnuradio/io_signature.h>
 
 #define MAX_MODULATION_ORDER 6
 #define INTERLEAVER_BLOCK_SIZE 126
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
index 6dbf2552020..31cde2005b5 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_BIT_INNER_DEINTERLEVER_IMPL_H
 #define INCLUDED_DTV_DVBT_BIT_INNER_DEINTERLEVER_IMPL_H
 
-#include <gnuradio/dtv/dvbt_bit_inner_deinterleaver.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_bit_inner_deinterleaver.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
index c82af1356cf..fb4c8f7afed 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_bit_inner_interleaver_impl.h"
+#include <gnuradio/io_signature.h>
 
 #define MAX_MODULATION_ORDER 6
 #define INTERLEAVER_BLOCK_SIZE 126
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
index b6d6d4203b6..cf92c7f8d3b 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_BIT_INNER_INTERLEAVER_IMPL_H
 #define INCLUDED_DTV_DVBT_BIT_INNER_INTERLEAVER_IMPL_H
 
-#include <gnuradio/dtv/dvbt_bit_inner_interleaver.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_bit_inner_interleaver.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_configure.cc b/gr-dtv/lib/dvbt/dvbt_configure.cc
index 7f47961267c..d3cda70772e 100644
--- a/gr-dtv/lib/dvbt/dvbt_configure.cc
+++ b/gr-dtv/lib/dvbt/dvbt_configure.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_configure.h"
+#include <gnuradio/io_signature.h>
 #include <iostream>
 
 namespace gr {
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc
index 0c22744de33..4e373ff1b87 100644
--- a/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_convolutional_deinterleaver_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
index 69127cb2717..e13af277f42 100644
--- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_convolutional_interleaver_impl.h"
+#include <gnuradio/io_signature.h>
 #include <deque>
 
 namespace gr {
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
index f5094bc321a..dcbfe941fb0 100644
--- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
@@ -22,8 +22,8 @@
 #define INCLUDED_DTV_DVBT_CONVOLUTIONAL_INTERLEAVER_IMPL_H
 
 #include <gnuradio/dtv/dvbt_convolutional_interleaver.h>
-#include <vector>
 #include <deque>
+#include <vector>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
index 77e6aa08ca7..847d9c84664 100644
--- a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_demap_impl.h"
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 namespace gr {
diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.h b/gr-dtv/lib/dvbt/dvbt_demap_impl.h
index ec65eb7fc11..733cc689072 100644
--- a/gr-dtv/lib/dvbt/dvbt_demap_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_DVBT_DEMAP_IMPL_H
 #define INCLUDED_DTV_DVBT_DVBT_DEMAP_IMPL_H
 
-#include <gnuradio/dtv/dvbt_demap.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_demap.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc
index 54acac43be7..7a494e3b8f1 100644
--- a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_demod_reference_signals_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.h b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.h
index e80d87fa21a..c772730ce59 100644
--- a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_DEMOD_REFERENCE_SIGNALS_IMPL_H
 #define INCLUDED_DTV_DVBT_DEMOD_REFERENCE_SIGNALS_IMPL_H
 
-#include <gnuradio/dtv/dvbt_demod_reference_signals.h>
 #include "dvbt_reference_signals_impl.h"
+#include <gnuradio/dtv/dvbt_demod_reference_signals.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc b/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc
index 42d0b952bd9..074f76c2afb 100644
--- a/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_energy_descramble_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
index 3cebb460783..d79e0691cfb 100644
--- a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_energy_dispersal_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
index 1b2129b1f2c..970519cdf3a 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_inner_coder_impl.h"
+#include <gnuradio/io_signature.h>
 #include <assert.h>
 
 namespace gr {
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
index 7da206d3bcf..25b9d73dab9 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_INNER_CODER_IMPL_H
 #define INCLUDED_DTV_DVBT_INNER_CODER_IMPL_H
 
-#include <gnuradio/dtv/dvbt_inner_coder.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_inner_coder.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.cc b/gr-dtv/lib/dvbt/dvbt_map_impl.cc
index 2a8ee5af314..4d7aeb0307c 100644
--- a/gr-dtv/lib/dvbt/dvbt_map_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_map_impl.cc
@@ -22,10 +22,10 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include <complex>
 #include "dvbt_map_impl.h"
+#include <gnuradio/io_signature.h>
 #include <math.h>
+#include <complex>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.h b/gr-dtv/lib/dvbt/dvbt_map_impl.h
index 7974dec6269..2fba6db22b5 100644
--- a/gr-dtv/lib/dvbt/dvbt_map_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_map_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_MAP_IMPL_H
 #define INCLUDED_DTV_DVBT_MAP_IMPL_H
 
-#include <gnuradio/dtv/dvbt_map.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_map.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
index fc2d7de33bb..7f9dac65159 100644
--- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
@@ -23,9 +23,9 @@
 #endif
 
 #include "dvbt_ofdm_sym_acquisition_impl.h"
+#include <gnuradio/expj.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <gnuradio/expj.h>
 #include <volk/volk.h>
 #include <complex>
 #include <limits>
diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
index f6d59ba2c19..a6d9267aff0 100644
--- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_reed_solomon_dec_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
index 8bf8794ec30..3d6f039b0f8 100644
--- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_reed_solomon_enc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
index 9b4e92b3096..f7eedcd4d7a 100644
--- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
@@ -23,11 +23,11 @@
 #endif
 
 #include "dvbt_reference_signals_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <complex>
 #include <algorithm>
+#include <complex>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h
index 0ab7193a264..e5c784b8055 100644
--- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_DTV_DVBT_REFERENCE_SIGNALS_IMPL_H
 #define INCLUDED_DTV_DVBT_REFERENCE_SIGNALS_IMPL_H
 
-#include <gnuradio/dtv/dvbt_reference_signals.h>
 #include "dvbt_configure.h"
-#include <vector>
+#include <gnuradio/dtv/dvbt_reference_signals.h>
 #include <deque>
+#include <vector>
 
 // This should eventually go into a const file
 const int SYMBOLS_PER_FRAME = 68;
diff --git a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
index 99d8d634f2e..062661bfedb 100644
--- a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_symbol_inner_interleaver_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.h
index 8ccc68167bb..f223eda4c78 100644
--- a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_SYMBOL_INNER_INTERLEAVER_IMPL_H
 #define INCLUDED_DTV_DVBT_SYMBOL_INNER_INTERLEAVER_IMPL_H
 
-#include <gnuradio/dtv/dvbt_symbol_inner_interleaver.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_symbol_inner_interleaver.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
index e2acf1180e6..a2e12b3d2a7 100644
--- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt_viterbi_decoder_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h
index 607e5bda8f6..81b667a08f8 100644
--- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_DTV_DVBT_VITERBI_DECODER_IMPL_H
 #define INCLUDED_DTV_DVBT_VITERBI_DECODER_IMPL_H
 
-#include <gnuradio/dtv/dvbt_viterbi_decoder.h>
 #include "dvbt_configure.h"
+#include <gnuradio/dtv/dvbt_viterbi_decoder.h>
 
 #ifdef DTV_SSE2
 #include <xmmintrin.h>
diff --git a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
index 1e04e6c0785..dbc81474f68 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_cellinterleaver_cc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index a567ec79297..3f1ceabe262 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_framemapper_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <algorithm>
 
 namespace gr {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
index aee87937205..2ebd67c07c1 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_freqinterleaver_cc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
index 74f49d30ae2..971fbb3bdaa 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_interleaver_bb_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
index 626fba28159..44bc698d60c 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_miso_cc_impl.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace dtv {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
index 9fda59a4682..5d2788020d1 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
@@ -22,8 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "dvbt2_p1insertion_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdio.h>
 #include <algorithm>
 
diff --git a/gr-fec/include/gnuradio/fec/alist.h b/gr-fec/include/gnuradio/fec/alist.h
index 5e4ed54e94c..7a0d65c08b0 100644
--- a/gr-fec/include/gnuradio/fec/alist.h
+++ b/gr-fec/include/gnuradio/fec/alist.h
@@ -34,12 +34,12 @@
 #ifndef ALIST_H
 #define ALIST_H
 
-#include <iostream>
+#include <gnuradio/fec/api.h>
+#include <stdlib.h>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <vector>
-#include <stdlib.h>
-#include <gnuradio/fec/api.h>
 
 class FEC_API alist
 {
diff --git a/gr-fec/include/gnuradio/fec/async_decoder.h b/gr-fec/include/gnuradio/fec/async_decoder.h
index fa14641e016..dd4c660ff98 100644
--- a/gr-fec/include/gnuradio/fec/async_decoder.h
+++ b/gr-fec/include/gnuradio/fec/async_decoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_ASYNC_DECODER_H
 #define INCLUDED_FEC_ASYNC_DECODER_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/generic_decoder.h>
-#include <gnuradio/block.h>
 #include <boost/shared_ptr.hpp>
 
 namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/async_encoder.h b/gr-fec/include/gnuradio/fec/async_encoder.h
index ed320addee4..8e143ea7428 100644
--- a/gr-fec/include/gnuradio/fec/async_encoder.h
+++ b/gr-fec/include/gnuradio/fec/async_encoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_ASYNC_ENCODER_H
 #define INCLUDED_FEC_ASYNC_ENCODER_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/block.h>
 #include <boost/shared_ptr.hpp>
 
 namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/awgn_bp.h b/gr-fec/include/gnuradio/fec/awgn_bp.h
index bbe9ba889c2..a7e0ff19591 100644
--- a/gr-fec/include/gnuradio/fec/awgn_bp.h
+++ b/gr-fec/include/gnuradio/fec/awgn_bp.h
@@ -36,12 +36,12 @@
 #ifndef AWGN_BP_H
 #define AWGN_BP_H
 
-#include <vector>
-#include <cmath>
-#include <iostream>
-#include "gf2mat.h"
 #include "alist.h"
+#include "gf2mat.h"
 #include <gnuradio/fec/api.h>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 class FEC_API awgn_bp
 {
diff --git a/gr-fec/include/gnuradio/fec/ber_bf.h b/gr-fec/include/gnuradio/fec/ber_bf.h
index a8e78c0fc5a..381d976e29c 100644
--- a/gr-fec/include/gnuradio/fec/ber_bf.h
+++ b/gr-fec/include/gnuradio/fec/ber_bf.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_BER_BF_H
 #define INCLUDED_FEC_BER_BF_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/cc_decoder.h b/gr-fec/include/gnuradio/fec/cc_decoder.h
index c426749da5b..8b59d7bbc5b 100644
--- a/gr-fec/include/gnuradio/fec/cc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/cc_decoder.h
@@ -24,8 +24,8 @@
 #define INCLUDED_FEC_CC_DECODER_H
 
 #include <gnuradio/fec/api.h>
-#include <gnuradio/fec/generic_decoder.h>
 #include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/generic_decoder.h>
 #include <map>
 #include <string>
 
diff --git a/gr-fec/include/gnuradio/fec/cc_encoder.h b/gr-fec/include/gnuradio/fec/cc_encoder.h
index fcaf6dcf27c..26f3a4a85a6 100644
--- a/gr-fec/include/gnuradio/fec/cc_encoder.h
+++ b/gr-fec/include/gnuradio/fec/cc_encoder.h
@@ -24,8 +24,8 @@
 #define INCLUDED_FEC_CC_ENCODER_H
 
 #include <gnuradio/fec/api.h>
-#include <gnuradio/fec/encoder.h>
 #include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/encoder.h>
 #include <map>
 #include <string>
 
diff --git a/gr-fec/include/gnuradio/fec/ccsds_encoder.h b/gr-fec/include/gnuradio/fec/ccsds_encoder.h
index 4eca78084e0..b45c62ee1b9 100644
--- a/gr-fec/include/gnuradio/fec/ccsds_encoder.h
+++ b/gr-fec/include/gnuradio/fec/ccsds_encoder.h
@@ -24,8 +24,8 @@
 #define INCLUDED_FEC_CCSDS_ENCODER_H
 
 #include <gnuradio/fec/api.h>
-#include <gnuradio/fec/encoder.h>
 #include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/encoder.h>
 #include <map>
 #include <string>
 
diff --git a/gr-fec/include/gnuradio/fec/cldpc.h b/gr-fec/include/gnuradio/fec/cldpc.h
index 758594d3e79..cb285da85f6 100644
--- a/gr-fec/include/gnuradio/fec/cldpc.h
+++ b/gr-fec/include/gnuradio/fec/cldpc.h
@@ -26,9 +26,9 @@
 #include <iostream>
 #include <vector>
 
-#include "gnuradio/fec/gf2vec.h"
-#include "gnuradio/fec/gf2mat.h"
 #include "gnuradio/fec/alist.h"
+#include "gnuradio/fec/gf2mat.h"
+#include "gnuradio/fec/gf2vec.h"
 
 
 #include <gnuradio/fec/api.h>
diff --git a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
index a4a23490a5e..fc362379d2e 100644
--- a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
+++ b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_CONV_BIT_CORR_BB_H
 #define INCLUDED_FEC_CONV_BIT_CORR_BB_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/decoder.h b/gr-fec/include/gnuradio/fec/decoder.h
index 38946deef3e..6bc7260b312 100644
--- a/gr-fec/include/gnuradio/fec/decoder.h
+++ b/gr-fec/include/gnuradio/fec/decoder.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_FEC_DECODER_H
 #define INCLUDED_FEC_DECODER_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/generic_decoder.h>
-#include <gnuradio/block.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
 #include <boost/format.hpp>
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/depuncture_bb.h b/gr-fec/include/gnuradio/fec/depuncture_bb.h
index 3d085286b71..76a866a3f74 100644
--- a/gr-fec/include/gnuradio/fec/depuncture_bb.h
+++ b/gr-fec/include/gnuradio/fec/depuncture_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_DEPUNCTURE_BB_H
 #define INCLUDED_FEC_DEPUNCTURE_BB_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/encoder.h b/gr-fec/include/gnuradio/fec/encoder.h
index 084e4ff450c..2e0e58c1a5a 100644
--- a/gr-fec/include/gnuradio/fec/encoder.h
+++ b/gr-fec/include/gnuradio/fec/encoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_ENCODER_H
 #define INCLUDED_FEC_ENCODER_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/block.h>
 #include <boost/shared_ptr.hpp>
 
 namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/fec_mtrx.h b/gr-fec/include/gnuradio/fec/fec_mtrx.h
index 8aa2ee699ae..d337b8fa663 100644
--- a/gr-fec/include/gnuradio/fec/fec_mtrx.h
+++ b/gr-fec/include/gnuradio/fec/fec_mtrx.h
@@ -22,8 +22,8 @@
 #define INCLUDED_fec_mtrx_H
 
 #include <gnuradio/fec/api.h>
-#include <cstdlib>
 #include <boost/shared_ptr.hpp>
+#include <cstdlib>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/generic_decoder.h b/gr-fec/include/gnuradio/fec/generic_decoder.h
index 9356c85ce40..064c44e93ce 100644
--- a/gr-fec/include/gnuradio/fec/generic_decoder.h
+++ b/gr-fec/include/gnuradio/fec/generic_decoder.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/fec/api.h>
 #include <gnuradio/logger.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/format.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/generic_encoder.h b/gr-fec/include/gnuradio/fec/generic_encoder.h
index 597839eac33..6de99b35736 100644
--- a/gr-fec/include/gnuradio/fec/generic_encoder.h
+++ b/gr-fec/include/gnuradio/fec/generic_encoder.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_GENERIC_ENCODER_H
 #define INCLUDED_FEC_GENERIC_ENCODER_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 #include <gnuradio/logger.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/gr-fec/include/gnuradio/fec/gf2mat.h b/gr-fec/include/gnuradio/fec/gf2mat.h
index 460d1bbc2ff..e0ed8788949 100644
--- a/gr-fec/include/gnuradio/fec/gf2mat.h
+++ b/gr-fec/include/gnuradio/fec/gf2mat.h
@@ -22,9 +22,9 @@
 
 #ifndef GF2MAT_H
 #define GF2MAT_H
-#include <vector>
-#include "gf2vec.h"
 #include "alist.h"
+#include "gf2vec.h"
+#include <vector>
 
 class GF2Mat
 {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
index 95e8638bc5f..447a4169bdb 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
@@ -23,8 +23,8 @@
 
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/fec_mtrx.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
index 2ed35c6cdc5..4ffe5aaa8de 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
@@ -23,8 +23,8 @@
 
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/fec_mtrx.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_decoder.h b/gr-fec/include/gnuradio/fec/ldpc_decoder.h
index 309710036b8..7a1c734bb24 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_decoder.h
@@ -26,14 +26,14 @@
 typedef float INPUT_DATATYPE;
 typedef unsigned char OUTPUT_DATATYPE;
 
+#include <gnuradio/fec/decoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/decoder.h>
 #include <vector>
 
-#include <gnuradio/fec/cldpc.h>
 #include <gnuradio/fec/alist.h>
 #include <gnuradio/fec/awgn_bp.h>
+#include <gnuradio/fec/cldpc.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h b/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
index f1cf958e8e9..d4fd1f1c325 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
@@ -24,8 +24,8 @@
 #define INCLUDED_LDPC_PAR_MTRX_ENCODER_H
 
 #include <gnuradio/fec/encoder.h>
-#include <gnuradio/fec/ldpc_H_matrix.h>
 #include <gnuradio/fec/fec_mtrx.h>
+#include <gnuradio/fec/ldpc_H_matrix.h>
 #include <string>
 #include <vector>
 
diff --git a/gr-fec/include/gnuradio/fec/puncture_bb.h b/gr-fec/include/gnuradio/fec/puncture_bb.h
index 7b5dad7e481..90d3856444e 100644
--- a/gr-fec/include/gnuradio/fec/puncture_bb.h
+++ b/gr-fec/include/gnuradio/fec/puncture_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_PUNCTURE_BB_H
 #define INCLUDED_FEC_PUNCTURE_BB_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/puncture_ff.h b/gr-fec/include/gnuradio/fec/puncture_ff.h
index 5abb5042cda..df88bc6e7d9 100644
--- a/gr-fec/include/gnuradio/fec/puncture_ff.h
+++ b/gr-fec/include/gnuradio/fec/puncture_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_PUNCTURE_FF_H
 #define INCLUDED_FEC_PUNCTURE_FF_H
 
-#include <gnuradio/fec/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/tagged_decoder.h b/gr-fec/include/gnuradio/fec/tagged_decoder.h
index 5ee3fe8a918..da29c7e212a 100644
--- a/gr-fec/include/gnuradio/fec/tagged_decoder.h
+++ b/gr-fec/include/gnuradio/fec/tagged_decoder.h
@@ -26,8 +26,8 @@
 #include <gnuradio/fec/api.h>
 #include <gnuradio/fec/generic_decoder.h>
 #include <gnuradio/tagged_stream_block.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/tpc_decoder.h b/gr-fec/include/gnuradio/fec/tpc_decoder.h
index fd7579b3c4e..ff3d75622b4 100644
--- a/gr-fec/include/gnuradio/fec/tpc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_decoder.h
@@ -26,9 +26,9 @@
 typedef float INPUT_DATATYPE;
 typedef unsigned char OUTPUT_DATATYPE;
 
+#include <gnuradio/fec/decoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/decoder.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/tpc_encoder.h b/gr-fec/include/gnuradio/fec/tpc_encoder.h
index 5c0facda606..515658c7d68 100644
--- a/gr-fec/include/gnuradio/fec/tpc_encoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_encoder.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_TPC_ENCODER_H
 #define INCLUDED_TPC_ENCODER_H
 
-#include <map>
-#include <string>
 #include <gnuradio/fec/encoder.h>
 #include <gnuradio/fec/generic_encoder.h>
+#include <map>
+#include <string>
 #include <vector>
 
 
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
index c8db512068b..790cd58a4ba 100644
--- a/gr-fec/lib/async_decoder_impl.cc
+++ b/gr-fec/lib/async_decoder_impl.cc
@@ -26,8 +26,8 @@
 
 #include "async_decoder_impl.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
 #include <stdio.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/async_decoder_impl.h b/gr-fec/lib/async_decoder_impl.h
index d3bf0adb318..635321acadd 100644
--- a/gr-fec/lib/async_decoder_impl.h
+++ b/gr-fec/lib/async_decoder_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FEC_ASYNC_DECODER_IMPL_H
 #define INCLUDED_FEC_ASYNC_DECODER_IMPL_H
 
-#include <gnuradio/fec/async_decoder.h>
 #include <gnuradio/blocks/pack_k_bits.h>
+#include <gnuradio/fec/async_decoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index 5454388de12..811d55601f0 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -26,8 +26,8 @@
 
 #include "async_encoder_impl.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
 #include <stdio.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/async_encoder_impl.h b/gr-fec/lib/async_encoder_impl.h
index 80ae80b7d14..0a07cbabf0a 100644
--- a/gr-fec/lib/async_encoder_impl.h
+++ b/gr-fec/lib/async_encoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_ASYNC_ENCODER_IMPL_H
 #define INCLUDED_FEC_ASYNC_ENCODER_IMPL_H
 
-#include <gnuradio/fec/async_encoder.h>
-#include <gnuradio/blocks/unpack_k_bits.h>
 #include <gnuradio/blocks/pack_k_bits.h>
+#include <gnuradio/blocks/unpack_k_bits.h>
+#include <gnuradio/fec/async_encoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index 33127e43092..c38f6a83a00 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -26,8 +26,8 @@
 
 #include "ber_bf_impl.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
 #include <math.h>
+#include <volk/volk.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/cc_decoder_impl.cc b/gr-fec/lib/cc_decoder_impl.cc
index abe5ca59bcb..e60131c7a10 100644
--- a/gr-fec/lib/cc_decoder_impl.cc
+++ b/gr-fec/lib/cc_decoder_impl.cc
@@ -26,10 +26,10 @@
 
 #include "cc_decoder_impl.h"
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/lib/cc_decoder_impl.h b/gr-fec/lib/cc_decoder_impl.h
index 841c5f048c7..621b198a5d8 100644
--- a/gr-fec/lib/cc_decoder_impl.h
+++ b/gr-fec/lib/cc_decoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_CC_DECODER_IMPL_H
 #define INCLUDED_FEC_CC_DECODER_IMPL_H
 
+#include <gnuradio/fec/cc_decoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/cc_decoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/cc_encoder_impl.cc b/gr-fec/lib/cc_encoder_impl.cc
index 389a41c1c54..42015ed8754 100644
--- a/gr-fec/lib/cc_encoder_impl.cc
+++ b/gr-fec/lib/cc_encoder_impl.cc
@@ -25,15 +25,15 @@
 #endif
 
 #include "cc_encoder_impl.h"
+#include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/generic_encoder.h>
 #include <math.h>
-#include <boost/assign/list_of.hpp>
-#include <volk/volk_typedefs.h>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <volk/volk_typedefs.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
-#include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/fec/cc_common.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/cc_encoder_impl.h b/gr-fec/lib/cc_encoder_impl.h
index ce3f1020a0f..446a1874610 100644
--- a/gr-fec/lib/cc_encoder_impl.h
+++ b/gr-fec/lib/cc_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
 #ifndef INCLUDED_FEC_CC_ENCODER_IMPL_H
 #define INCLUDED_FEC_CC_ENCODER_IMPL_H
 
+#include <gnuradio/fec/cc_encoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/cc_encoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ccsds_encoder_impl.h b/gr-fec/lib/ccsds_encoder_impl.h
index f533afa878a..4b0e109de7e 100644
--- a/gr-fec/lib/ccsds_encoder_impl.h
+++ b/gr-fec/lib/ccsds_encoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_CCSDS_ENCODER_IMPL_H
 #define INCLUDED_FEC_CCSDS_ENCODER_IMPL_H
 
+#include <gnuradio/fec/ccsds_encoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/ccsds_encoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
index 0fa3ba94b04..27d00bb5bb8 100644
--- a/gr-fec/lib/depuncture_bb_impl.cc
+++ b/gr-fec/lib/depuncture_bb_impl.cc
@@ -26,11 +26,11 @@
 
 #include "depuncture_bb_impl.h"
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
 #include <volk/volk.h>
 #include <boost/bind.hpp>
-#include <pmt/pmt.h>
 #include <string>
-#include <stdio.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/dummy_decoder_impl.cc b/gr-fec/lib/dummy_decoder_impl.cc
index 4cf95b45e76..166cdcfcec6 100644
--- a/gr-fec/lib/dummy_decoder_impl.cc
+++ b/gr-fec/lib/dummy_decoder_impl.cc
@@ -26,10 +26,10 @@
 
 #include "dummy_decoder_impl.h"
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/lib/dummy_decoder_impl.h b/gr-fec/lib/dummy_decoder_impl.h
index 92860c22c75..1ead851c916 100644
--- a/gr-fec/lib/dummy_decoder_impl.h
+++ b/gr-fec/lib/dummy_decoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FEC_DUMMY_DECODER_IMPL_H
 #define INCLUDED_FEC_DUMMY_DECODER_IMPL_H
 
+#include <gnuradio/fec/dummy_decoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/dummy_decoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/dummy_encoder_impl.h b/gr-fec/lib/dummy_encoder_impl.h
index 4cd093d8d36..13602b3e5d8 100644
--- a/gr-fec/lib/dummy_encoder_impl.h
+++ b/gr-fec/lib/dummy_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
 #ifndef INCLUDED_FEC_DUMMY_ENCODER_IMPL_H
 #define INCLUDED_FEC_DUMMY_ENCODER_IMPL_H
 
+#include <gnuradio/fec/dummy_encoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/dummy_encoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/fec_mtrx_impl.cc b/gr-fec/lib/fec_mtrx_impl.cc
index 40705d6397c..10ed5f4f3f0 100644
--- a/gr-fec/lib/fec_mtrx_impl.cc
+++ b/gr-fec/lib/fec_mtrx_impl.cc
@@ -25,10 +25,10 @@
 #include "fec_mtrx_impl.h"
 #include <math.h>
 #include <fstream>
-#include <vector>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 #include <stdexcept>
+#include <vector>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/fec_mtrx_impl.h b/gr-fec/lib/fec_mtrx_impl.h
index 8b58864e612..0beda10b9eb 100644
--- a/gr-fec/lib/fec_mtrx_impl.h
+++ b/gr-fec/lib/fec_mtrx_impl.h
@@ -23,12 +23,12 @@
 
 #include <string>
 
+#include <gnuradio/fec/fec_mtrx.h>
+#include <gsl/gsl_blas.h>
+#include <gsl/gsl_linalg.h>
 #include <gsl/gsl_matrix.h>
-#include <gsl/gsl_randist.h>
 #include <gsl/gsl_permutation.h>
-#include <gsl/gsl_linalg.h>
-#include <gsl/gsl_blas.h>
-#include <gnuradio/fec/fec_mtrx.h>
+#include <gsl/gsl_randist.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ldpc_G_matrix_impl.cc b/gr-fec/lib/ldpc_G_matrix_impl.cc
index a17c571ec98..4a680cbdd27 100644
--- a/gr-fec/lib/ldpc_G_matrix_impl.cc
+++ b/gr-fec/lib/ldpc_G_matrix_impl.cc
@@ -24,9 +24,9 @@
 #include "ldpc_G_matrix_impl.h"
 #include <math.h>
 #include <fstream>
-#include <vector>
-#include <sstream>
 #include <iostream>
+#include <sstream>
+#include <vector>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ldpc_G_matrix_impl.h b/gr-fec/lib/ldpc_G_matrix_impl.h
index b42c1791c25..8a5de4faf13 100644
--- a/gr-fec/lib/ldpc_G_matrix_impl.h
+++ b/gr-fec/lib/ldpc_G_matrix_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_ldpc_G_matrix_impl_H
 #define INCLUDED_ldpc_G_matrix_impl_H
 
-#include <gsl/gsl_randist.h>
-#include <gsl/gsl_permutation.h>
-#include <gsl/gsl_linalg.h>
 #include <gsl/gsl_blas.h>
+#include <gsl/gsl_linalg.h>
+#include <gsl/gsl_permutation.h>
+#include <gsl/gsl_randist.h>
 
 #include "fec_mtrx_impl.h"
 #include <gnuradio/fec/ldpc_G_matrix.h>
diff --git a/gr-fec/lib/ldpc_H_matrix_impl.cc b/gr-fec/lib/ldpc_H_matrix_impl.cc
index 6b1b17e0f9d..333fdee0348 100644
--- a/gr-fec/lib/ldpc_H_matrix_impl.cc
+++ b/gr-fec/lib/ldpc_H_matrix_impl.cc
@@ -24,10 +24,10 @@
 #include "ldpc_H_matrix_impl.h"
 #include <math.h>
 #include <fstream>
-#include <vector>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 #include <stdexcept>
+#include <vector>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc b/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
index 286b7364f25..8c0f16adf88 100644
--- a/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
+++ b/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
@@ -24,10 +24,10 @@
 
 #include "ldpc_bit_flip_decoder_impl.h"
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/lib/ldpc_decoder.cc b/gr-fec/lib/ldpc_decoder.cc
index 26992066eb6..b8c25980f04 100644
--- a/gr-fec/lib/ldpc_decoder.cc
+++ b/gr-fec/lib/ldpc_decoder.cc
@@ -20,17 +20,17 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/fec/decoder.h>
 #include <gnuradio/fec/ldpc_decoder.h>
+#include <gnuradio/fec/maxstar.h>
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
+#include <string.h> // for memcpy
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
+#include <algorithm> // for std::reverse
 #include <sstream>
-#include <stdio.h>
 #include <vector>
-#include <gnuradio/fec/decoder.h>
-#include <algorithm> // for std::reverse
-#include <string.h>  // for memcpy
-#include <gnuradio/fec/maxstar.h>
 
 
 namespace gr {
diff --git a/gr-fec/lib/ldpc_encoder_impl.cc b/gr-fec/lib/ldpc_encoder_impl.cc
index 7adaf6b8860..44ca0dca968 100644
--- a/gr-fec/lib/ldpc_encoder_impl.cc
+++ b/gr-fec/lib/ldpc_encoder_impl.cc
@@ -21,12 +21,12 @@
  */
 
 #include "ldpc_encoder_impl.h"
-#include <boost/assign/list_of.hpp>
-#include <volk/volk.h>
-#include <sstream>
 #include <stdio.h>
+#include <string.h> // for memcpy
+#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <algorithm> // for std::reverse
-#include <string.h>  // for memcpy
+#include <sstream>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ldpc_encoder_impl.h b/gr-fec/lib/ldpc_encoder_impl.h
index 5889f116d22..b33928f9df5 100644
--- a/gr-fec/lib/ldpc_encoder_impl.h
+++ b/gr-fec/lib/ldpc_encoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_LDPC_ENCODER_IMPL_H
 #define INCLUDED_LDPC_ENCODER_IMPL_H
 
-#include <gnuradio/fec/ldpc_encoder.h>
-#include <gnuradio/fec/cldpc.h>
 #include <gnuradio/fec/alist.h>
+#include <gnuradio/fec/cldpc.h>
+#include <gnuradio/fec/ldpc_encoder.h>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
index ee73699e49f..10158c868d4 100644
--- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_FEC_LDPC_GEN_MTRX_ENCODER_IMPL_H
 #define INCLUDED_FEC_LDPC_GEN_MTRX_ENCODER_IMPL_H
 
+#include <gnuradio/fec/ldpc_G_matrix.h>
+#include <gnuradio/fec/ldpc_gen_mtrx_encoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/ldpc_gen_mtrx_encoder.h>
-#include <gnuradio/fec/ldpc_G_matrix.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
index 16c03574ee9..8a5ced19174 100644
--- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
@@ -22,13 +22,13 @@
 
 #include "ldpc_par_mtrx_encoder_impl.h"
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
+#include <string.h> // for memcpy
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
+#include <algorithm> // for std::reverse
 #include <sstream>
-#include <stdio.h>
 #include <vector>
-#include <algorithm> // for std::reverse
-#include <string.h>  // for memcpy
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/polar_common.cc b/gr-fec/lib/polar_common.cc
index 2207b69f376..b514e83829c 100644
--- a/gr-fec/lib/polar_common.cc
+++ b/gr-fec/lib/polar_common.cc
@@ -24,16 +24,16 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_common.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 #include <gnuradio/blocks/pack_k_bits.h>
 #include <gnuradio/blocks/unpack_k_bits.h>
 
 #include <cmath>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/lib/polar_decoder_common.cc b/gr-fec/lib/polar_decoder_common.cc
index 1712350172e..1860c0fc330 100644
--- a/gr-fec/lib/polar_decoder_common.cc
+++ b/gr-fec/lib/polar_decoder_common.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_decoder_common.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 #include <cstdio>
diff --git a/gr-fec/lib/polar_decoder_sc.cc b/gr-fec/lib/polar_decoder_sc.cc
index 731648f4f46..4d15ca20e51 100644
--- a/gr-fec/lib/polar_decoder_sc.cc
+++ b/gr-fec/lib/polar_decoder_sc.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_decoder_sc.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 #include <cmath>
diff --git a/gr-fec/lib/polar_decoder_sc_list.cc b/gr-fec/lib/polar_decoder_sc_list.cc
index 8b922d20441..9395d6e9fec 100644
--- a/gr-fec/lib/polar_decoder_sc_list.cc
+++ b/gr-fec/lib/polar_decoder_sc_list.cc
@@ -24,13 +24,13 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/fec/polar_decoder_sc_list.h>
 #include "scl_list.h"
+#include <gnuradio/fec/polar_decoder_sc_list.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/polar_decoder_sc_systematic.cc b/gr-fec/lib/polar_decoder_sc_systematic.cc
index cb51d8b2279..486d6df5482 100644
--- a/gr-fec/lib/polar_decoder_sc_systematic.cc
+++ b/gr-fec/lib/polar_decoder_sc_systematic.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_decoder_sc_systematic.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 namespace gr {
diff --git a/gr-fec/lib/polar_encoder.cc b/gr-fec/lib/polar_encoder.cc
index 07df87f17cf..073e595cb5c 100644
--- a/gr-fec/lib/polar_encoder.cc
+++ b/gr-fec/lib/polar_encoder.cc
@@ -24,11 +24,11 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_encoder.h>
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
 #include <cmath>
 #include <stdexcept>
-#include <volk/volk.h>
 
 #include <gnuradio/blocks/pack_k_bits.h>
 #include <gnuradio/blocks/unpack_k_bits.h>
diff --git a/gr-fec/lib/polar_encoder_systematic.cc b/gr-fec/lib/polar_encoder_systematic.cc
index 05b1472aa78..9c5607d4eb3 100644
--- a/gr-fec/lib/polar_encoder_systematic.cc
+++ b/gr-fec/lib/polar_encoder_systematic.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fec/polar_encoder_systematic.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 
 namespace gr {
diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc
index 14995b84c41..a365d6a69fd 100644
--- a/gr-fec/lib/puncture_bb_impl.cc
+++ b/gr-fec/lib/puncture_bb_impl.cc
@@ -26,11 +26,11 @@
 
 #include "puncture_bb_impl.h"
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
 #include <volk/volk.h>
 #include <boost/bind.hpp>
-#include <pmt/pmt.h>
 #include <string>
-#include <stdio.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc
index d4c1c057235..c95288d6911 100644
--- a/gr-fec/lib/puncture_ff_impl.cc
+++ b/gr-fec/lib/puncture_ff_impl.cc
@@ -26,11 +26,11 @@
 
 #include "puncture_ff_impl.h"
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
 #include <volk/volk.h>
 #include <boost/bind.hpp>
-#include <pmt/pmt.h>
 #include <string>
-#include <stdio.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/reed-solomon/decode_rs.c b/gr-fec/lib/reed-solomon/decode_rs.c
index df055274946..28c42d2401f 100644
--- a/gr-fec/lib/reed-solomon/decode_rs.c
+++ b/gr-fec/lib/reed-solomon/decode_rs.c
@@ -200,7 +200,7 @@ int DECODE_RS(
         }
         if (q != 0)
             continue; /* Not a root */
-            /* store root (index-form) and error location number */
+                      /* store root (index-form) and error location number */
 #if DEBUG >= 2
         printf("count %d root %d loc %d\n", count, i, k);
 #endif
diff --git a/gr-fec/lib/reed-solomon/decode_rs_ccsds.c b/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
index e842bfaf845..be6e2018e37 100644
--- a/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
+++ b/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
@@ -5,8 +5,8 @@
  * May be used under the terms of the GNU General Public License (GPL)
  */
 #define FIXED 1
-#include "fixed.h"
 #include "ccsds.h"
+#include "fixed.h"
 
 int decode_rs_ccsds(unsigned char* data, int* eras_pos, int no_eras)
 {
diff --git a/gr-fec/lib/reed-solomon/encode_rs_ccsds.c b/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
index aae16ae37d3..7080b3f4196 100644
--- a/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
+++ b/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
@@ -5,8 +5,8 @@
  * May be used under the terms of the GNU General Public License (GPL)
  */
 #define FIXED
-#include "fixed.h"
 #include "ccsds.h"
+#include "fixed.h"
 
 void encode_rs_ccsds(unsigned char* data, unsigned char* parity)
 {
diff --git a/gr-fec/lib/reed-solomon/exercise.c b/gr-fec/lib/reed-solomon/exercise.c
index 562a051f17c..598f485fed8 100644
--- a/gr-fec/lib/reed-solomon/exercise.c
+++ b/gr-fec/lib/reed-solomon/exercise.c
@@ -18,8 +18,8 @@
 #include "fixed.h"
 #define EXERCISE exercise_8
 #elif defined(CCSDS)
-#include "fixed.h"
 #include "ccsds.h"
+#include "fixed.h"
 #define EXERCISE exercise_ccsds
 #elif defined(BIGSYM)
 #include "int.h"
diff --git a/gr-fec/lib/reed-solomon/gen_ccsds.c b/gr-fec/lib/reed-solomon/gen_ccsds.c
index a069834346d..8073278d816 100644
--- a/gr-fec/lib/reed-solomon/gen_ccsds.c
+++ b/gr-fec/lib/reed-solomon/gen_ccsds.c
@@ -2,8 +2,8 @@
  * Copyright 2002 Phil Karn, KA9Q
  * May be used under the terms of the GNU General Public License (GPL)
  */
-#include <stdio.h>
 #include "char.h"
+#include <stdio.h>
 
 int main()
 {
diff --git a/gr-fec/lib/reed-solomon/rstest.c b/gr-fec/lib/reed-solomon/rstest.c
index c8fc0007002..cfc2d62bc20 100644
--- a/gr-fec/lib/reed-solomon/rstest.c
+++ b/gr-fec/lib/reed-solomon/rstest.c
@@ -9,10 +9,10 @@
 #include <config.h>
 #endif
 
+#include <gnuradio/fec/rs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gnuradio/fec/rs.h>
 
 int exercise_char(void*, int);
 
diff --git a/gr-fec/lib/repetition_decoder_impl.cc b/gr-fec/lib/repetition_decoder_impl.cc
index ed8ba11eee3..61b1ed5ba96 100644
--- a/gr-fec/lib/repetition_decoder_impl.cc
+++ b/gr-fec/lib/repetition_decoder_impl.cc
@@ -26,10 +26,10 @@
 
 #include "repetition_decoder_impl.h"
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-fec/lib/repetition_decoder_impl.h b/gr-fec/lib/repetition_decoder_impl.h
index 2a058a0894c..9eaad143c96 100644
--- a/gr-fec/lib/repetition_decoder_impl.h
+++ b/gr-fec/lib/repetition_decoder_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_FEC_REPETITION_DECODER_IMPL_H
 #define INCLUDED_FEC_REPETITION_DECODER_IMPL_H
 
-#include <vector>
+#include <gnuradio/fec/repetition_decoder.h>
 #include <algorithm>
 #include <string>
-#include <gnuradio/fec/repetition_decoder.h>
+#include <vector>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/repetition_encoder_impl.h b/gr-fec/lib/repetition_encoder_impl.h
index 278b585f3a2..bf76304f439 100644
--- a/gr-fec/lib/repetition_encoder_impl.h
+++ b/gr-fec/lib/repetition_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
 #ifndef INCLUDED_FEC_REPETITION_ENCODER_IMPL_H
 #define INCLUDED_FEC_REPETITION_ENCODER_IMPL_H
 
+#include <gnuradio/fec/repetition_encoder.h>
 #include <map>
 #include <string>
-#include <gnuradio/fec/repetition_encoder.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/scl_list.cc b/gr-fec/lib/scl_list.cc
index 2b126358ecb..aff5a87507c 100644
--- a/gr-fec/lib/scl_list.cc
+++ b/gr-fec/lib/scl_list.cc
@@ -21,10 +21,10 @@
  */
 
 #include "scl_list.h"
+#include <volk/volk.h>
+#include <algorithm>
 #include <cstring>
 #include <iostream>
-#include <algorithm>
-#include <volk/volk.h>
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/tpc_decoder.cc b/gr-fec/lib/tpc_decoder.cc
index 3477e30aaba..b8a1e74e827 100644
--- a/gr-fec/lib/tpc_decoder.cc
+++ b/gr-fec/lib/tpc_decoder.cc
@@ -20,18 +20,18 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/fec/tpc_decoder.h>
 #include <gnuradio/fec/tpc_common.h>
+#include <gnuradio/fec/tpc_decoder.h>
 #include <volk/volk.h>
 
 #include <math.h>
+#include <stdio.h>
 #include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
-#include <algorithm> // for std::reverse
 #include <string.h>  // for memcpy
+#include <algorithm> // for std::reverse
 
 #include <gnuradio/fec/maxstar.h>
 
diff --git a/gr-fec/lib/tpc_encoder.cc b/gr-fec/lib/tpc_encoder.cc
index 381235c62c4..44862a02d4d 100644
--- a/gr-fec/lib/tpc_encoder.cc
+++ b/gr-fec/lib/tpc_encoder.cc
@@ -20,19 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/fec/tpc_encoder.h>
-#include <gnuradio/fec/tpc_common.h>
 #include <gnuradio/fec/generic_encoder.h>
+#include <gnuradio/fec/tpc_common.h>
+#include <gnuradio/fec/tpc_encoder.h>
 
 #include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
 #include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
-#include <algorithm> // for std::reverse
 #include <string.h>  // for memcpy
+#include <algorithm> // for std::reverse
 
 namespace gr {
 namespace fec {
diff --git a/gr-fec/lib/viterbi/decode.cc b/gr-fec/lib/viterbi/decode.cc
index 98d2644f894..67605cec2a7 100644
--- a/gr-fec/lib/viterbi/decode.cc
+++ b/gr-fec/lib/viterbi/decode.cc
@@ -29,8 +29,8 @@
 
 #include <gnuradio/fec/viterbi.h>
 
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
 
 #define MAXCHUNKSIZE 4096
 #define MAXENCSIZE MAXCHUNKSIZE * 16
diff --git a/gr-fec/lib/viterbi/metrics.cc b/gr-fec/lib/viterbi/metrics.cc
index 9ec2f37e176..b0fd52096bb 100644
--- a/gr-fec/lib/viterbi/metrics.cc
+++ b/gr-fec/lib/viterbi/metrics.cc
@@ -41,8 +41,8 @@
 
 #include <gnuradio/math.h>
 
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 
 /* Normal function integrated from -Inf to x. Range: 0-1 */
 #define normal(x) (0.5 + 0.5 * erf((x) / GR_M_SQRT2))
diff --git a/gr-fft/include/gnuradio/fft/window.h b/gr-fft/include/gnuradio/fft/window.h
index d6ccf9ff7cf..6173b9f975e 100644
--- a/gr-fft/include/gnuradio/fft/window.h
+++ b/gr-fft/include/gnuradio/fft/window.h
@@ -24,9 +24,9 @@
 #define INCLUDED_FFT_WINDOW_H
 
 #include <gnuradio/fft/api.h>
-#include <vector>
-#include <cmath>
 #include <gnuradio/gr_complex.h>
+#include <cmath>
+#include <vector>
 
 namespace gr {
 namespace fft {
diff --git a/gr-fft/lib/ctrlport_probe_psd_impl.h b/gr-fft/lib/ctrlport_probe_psd_impl.h
index 58b1f104149..4b1e2ad98f6 100644
--- a/gr-fft/lib/ctrlport_probe_psd_impl.h
+++ b/gr-fft/lib/ctrlport_probe_psd_impl.h
@@ -24,9 +24,9 @@
 #define INCLUDED_CTRLPORT_PROBE_PSD_IMPL_H
 
 #include <gnuradio/fft/ctrlport_probe_psd.h>
+#include <gnuradio/fft/fft.h>
 #include <gnuradio/rpcregisterhelpers.h>
 #include <boost/thread/shared_mutex.hpp>
-#include <gnuradio/fft/fft.h>
 
 namespace gr {
 namespace fft {
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index 68070d2399d..bc73e31b2fa 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -21,10 +21,10 @@
  */
 
 #include <gnuradio/fft/fft.h>
-#include <gnuradio/sys_paths.h>
 #include <gnuradio/gr_complex.h>
-#include <volk/volk.h>
+#include <gnuradio/sys_paths.h>
 #include <fftw3.h>
+#include <volk/volk.h>
 
 #ifdef _WIN32 // http://www.fftw.org/install/windows.html#DLLwisdom
 static void my_fftw_write_char(char c, void* f) { fputc(c, (FILE*)f); }
@@ -44,9 +44,9 @@ static int my_fftw_read_char(void* f) { return fgetc((FILE*)f); }
 #define O_NONBLOCK 0
 #endif //_WIN32
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <cassert>
 #include <stdexcept>
 
diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h
index 45afdd024f5..631e41d9ca3 100644
--- a/gr-fft/lib/fft_vcc_fftw.h
+++ b/gr-fft/lib/fft_vcc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 
-#include <gnuradio/fft/fft_vcc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/fft/fft_vcc.h>
 
 namespace gr {
 namespace fft {
diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h
index 4b0e9056438..47c1ca529cc 100644
--- a/gr-fft/lib/fft_vfc_fftw.h
+++ b/gr-fft/lib/fft_vfc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 
-#include <gnuradio/fft/fft_vfc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/fft/fft_vfc.h>
 
 namespace gr {
 namespace fft {
diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h
index 607e7e1f95c..c84512b5862 100644
--- a/gr-fft/lib/goertzel_fc_impl.h
+++ b/gr-fft/lib/goertzel_fc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 #define INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 
-#include <gnuradio/fft/goertzel_fc.h>
 #include <gnuradio/fft/goertzel.h>
+#include <gnuradio/fft/goertzel_fc.h>
 
 namespace gr {
 namespace fft {
diff --git a/gr-filter/include/gnuradio/filter/fft_filter.h b/gr-filter/include/gnuradio/filter/fft_filter.h
index c050d84b7d5..c58d05252be 100644
--- a/gr-filter/include/gnuradio/filter/fft_filter.h
+++ b/gr-filter/include/gnuradio/filter/fft_filter.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_FILTER_FFT_FILTER_H
 #define INCLUDED_FILTER_FFT_FILTER_H
 
+#include <gnuradio/fft/fft.h>
 #include <gnuradio/filter/api.h>
-#include <vector>
 #include <gnuradio/gr_complex.h>
-#include <gnuradio/fft/fft.h>
+#include <vector>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h
index 2bb7b44dd5c..724bd450381 100644
--- a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h
+++ b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_FILTER_FILTERBANK_CHANNELIZER_VCVCF_H
 #define INCLUDED_FILTER_FILTERBANK_CHANNELIZER_VCVCF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/fir_filter.h b/gr-filter/include/gnuradio/filter/fir_filter.h
index 9a4e29457de..972b65ef827 100644
--- a/gr-filter/include/gnuradio/filter/fir_filter.h
+++ b/gr-filter/include/gnuradio/filter/fir_filter.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_FILTER_FIR_FILTER_H
 #define INCLUDED_FILTER_FIR_FILTER_H
 
-#include <cstdint>
 #include <gnuradio/filter/api.h>
 #include <gnuradio/gr_complex.h>
+#include <cstdint>
 #include <vector>
 
 namespace gr {
diff --git a/gr-filter/include/gnuradio/filter/fir_filter_with_buffer.h b/gr-filter/include/gnuradio/filter/fir_filter_with_buffer.h
index f982c95e6db..d45c088e384 100644
--- a/gr-filter/include/gnuradio/filter/fir_filter_with_buffer.h
+++ b/gr-filter/include/gnuradio/filter/fir_filter_with_buffer.h
@@ -24,8 +24,8 @@
 #define INCLUDED_FILTER_FIR_FILTER_WITH_BUFFER_H
 
 #include <gnuradio/filter/api.h>
-#include <vector>
 #include <gnuradio/gr_complex.h>
+#include <vector>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/firdes.h b/gr-filter/include/gnuradio/filter/firdes.h
index c6bd59eec11..deb44bf9d99 100644
--- a/gr-filter/include/gnuradio/filter/firdes.h
+++ b/gr-filter/include/gnuradio/filter/firdes.h
@@ -23,11 +23,11 @@
 #ifndef _FILTER_FIRDES_H_
 #define _FILTER_FIRDES_H_
 
+#include <gnuradio/fft/window.h>
 #include <gnuradio/filter/api.h>
-#include <vector>
-#include <cmath>
 #include <gnuradio/gr_complex.h>
-#include <gnuradio/fft/window.h>
+#include <cmath>
+#include <vector>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/iir_filter.h b/gr-filter/include/gnuradio/filter/iir_filter.h
index 386b4b7a0ab..178c54c7144 100644
--- a/gr-filter/include/gnuradio/filter/iir_filter.h
+++ b/gr-filter/include/gnuradio/filter/iir_filter.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/api.h>
 #include <gnuradio/gr_complex.h>
-#include <vector>
 #include <stdexcept>
+#include <vector>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h
index a2e90d72eac..735f6ea841c 100644
--- a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h
+++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_CC_H
 #define INCLUDED_MMSE_INTERPOLATOR_CC_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h
index 9cb20552684..7ae28d71845 100644
--- a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h
+++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_FF_H
 #define INCLUDED_MMSE_INTERPOLATOR_FF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h
index 25733bfd6b4..9f4ddc8c213 100644
--- a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h
+++ b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_CC_H
 #define INCLUDED_MMSE_RESAMPLER_CC_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h
index 3563a3e1c98..c816c31ed26 100644
--- a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h
+++ b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_FF_H
 #define INCLUDED_MMSE_RESAMPLER_FF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h
index 0d91fcddbee..342c0b0ef42 100644
--- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h
+++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCC_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCC_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h
index 9a82efd69d7..0b1f39a4594 100644
--- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h
+++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCF_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
index 54fc3212eda..56ea81b8bce 100644
--- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
+++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_FFF_H
 #define INCLUDED_PFB_ARB_RESAMPLER_FFF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
index ce9bafc2755..bba24badd85 100644
--- a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
+++ b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_FILTER_PFB_CHANNELIZER_CCF_H
 #define INCLUDED_FILTER_PFB_CHANNELIZER_CCF_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/pm_remez.h b/gr-filter/include/gnuradio/filter/pm_remez.h
index d0b56858318..4dca2359c08 100644
--- a/gr-filter/include/gnuradio/filter/pm_remez.h
+++ b/gr-filter/include/gnuradio/filter/pm_remez.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/api.h>
 #include <gnuradio/types.h>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/polyphase_filterbank.h b/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
index e99990022d0..e565261940e 100644
--- a/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
+++ b/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
@@ -24,10 +24,10 @@
 #ifndef INCLUDED_FILTER_POLYPHASE_FILTERBANK_H
 #define INCLUDED_FILTER_POLYPHASE_FILTERBANK_H
 
+#include <gnuradio/fft/fft.h>
 #include <gnuradio/filter/api.h>
-#include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/fft_filter.h>
-#include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/rational_resampler_base.h b/gr-filter/include/gnuradio/filter/rational_resampler_base.h
index 7be333d3150..faccc4a6f11 100644
--- a/gr-filter/include/gnuradio/filter/rational_resampler_base.h
+++ b/gr-filter/include/gnuradio/filter/rational_resampler_base.h
@@ -23,8 +23,8 @@
 #ifndef RATIONAL_RESAMPLER_BASE_H
 #define RATIONAL_RESAMPLER_BASE_H
 
-#include <gnuradio/filter/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/filter/api.h>
 
 
 namespace gr {
diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir.h b/gr-filter/include/gnuradio/filter/single_pole_iir.h
index 5f7bf4c20d0..71ce3179392 100644
--- a/gr-filter/include/gnuradio/filter/single_pole_iir.h
+++ b/gr-filter/include/gnuradio/filter/single_pole_iir.h
@@ -24,8 +24,8 @@
 #define INCLUDED_SINGLE_POLE_IIR_H
 
 #include <gnuradio/filter/api.h>
-#include <stdexcept>
 #include <gnuradio/gr_complex.h>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h
index ccf2837ebd4..4a0d718c0fb 100644
--- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h
+++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/api.h>
 #include <gnuradio/filter/single_pole_iir.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h
index 516a59dd8ca..566784317ac 100644
--- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h
+++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/api.h>
 #include <gnuradio/filter/single_pole_iir.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/fft_filter.cc b/gr-filter/lib/fft_filter.cc
index 344114e0a30..2146aea525c 100644
--- a/gr-filter/lib/fft_filter.cc
+++ b/gr-filter/lib/fft_filter.cc
@@ -26,8 +26,8 @@
 
 #include <gnuradio/filter/fft_filter.h>
 #include <volk/volk.h>
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc
index a277fc1450f..78b91b40074 100644
--- a/gr-filter/lib/fft_filter_ccc_impl.cc
+++ b/gr-filter/lib/fft_filter_ccc_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_ccc_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/fft_filter_ccf_impl.cc b/gr-filter/lib/fft_filter_ccf_impl.cc
index 17d03acd932..3d614a5034a 100644
--- a/gr-filter/lib/fft_filter_ccf_impl.cc
+++ b/gr-filter/lib/fft_filter_ccf_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_ccf_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc
index 6f3a9de48e2..8100beba0f0 100644
--- a/gr-filter/lib/fft_filter_fff_impl.cc
+++ b/gr-filter/lib/fft_filter_fff_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_fff_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/filterbank_vcvcf_impl.h b/gr-filter/lib/filterbank_vcvcf_impl.h
index dc6e3e5d14f..2d5a1313f0d 100644
--- a/gr-filter/lib/filterbank_vcvcf_impl.h
+++ b/gr-filter/lib/filterbank_vcvcf_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
 #define INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
 
-#include <gnuradio/filter/filterbank_vcvcf.h>
 #include <gnuradio/filter/filterbank.h>
+#include <gnuradio/filter/filterbank_vcvcf.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/thread/thread.h>
 
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc
index 940d59d595c..0656068c773 100644
--- a/gr-filter/lib/fir_filter.cc
+++ b/gr-filter/lib/fir_filter.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <cstdio>
-#include <cstring>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <volk/volk.h>
+#include <cstdio>
+#include <cstring>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
index f3e3cf66ed7..879fcf0fb72 100644
--- a/gr-filter/lib/fir_filter_with_buffer.cc
+++ b/gr-filter/lib/fir_filter_with_buffer.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <volk/volk.h>
 #include <algorithm>
 #include <cstdio>
diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.h b/gr-filter/lib/freq_xlating_fir_filter_impl.h
index c58bb81ac94..73b83a25675 100644
--- a/gr-filter/lib/freq_xlating_fir_filter_impl.h
+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.h
@@ -23,10 +23,10 @@
 #ifndef FREQ_XLATING_FIR_FILTER_IMPL_H
 #define FREQ_XLATING_FIR_FILTER_IMPL_H
 
+#include <gnuradio/blocks/rotator.h>
 #include <gnuradio/filter/api.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/freq_xlating_fir_filter.h>
-#include <gnuradio/blocks/rotator.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c b/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
index c922c02bbca..8de29f08c7e 100644
--- a/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
+++ b/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
@@ -24,9 +24,9 @@
  * generate MMSE interpolating differentiator FIR table values
  */
 
-#include <math.h>
 #include <assert.h>
 #include <gsl/gsl_integration.h>
+#include <math.h>
 
 #define MU 0.5 /* the MU for which we're computing coeffs */
 
diff --git a/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c b/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
index df4e1cc4973..aadd8011499 100644
--- a/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
+++ b/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gsl/gsl_integration.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <gsl/gsl_integration.h>
+#include <unistd.h>
 
 #define NSTEPS 10 // how many steps of mu are in the generated table
 #define MAX_NSTEPS 256
diff --git a/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c b/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
index 6069e7bd0ed..3b22c74c2bf 100644
--- a/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
+++ b/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gsl/gsl_integration.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <gsl/gsl_integration.h>
+#include <unistd.h>
 
 #define NSTEPS 10 // how many steps of mu are in the generated table
 #define MAX_NSTEPS 256
diff --git a/gr-filter/lib/gen_interpolator_taps/objective_fct.c b/gr-filter/lib/gen_interpolator_taps/objective_fct.c
index ea36f4957f8..bee649533e2 100644
--- a/gr-filter/lib/gen_interpolator_taps/objective_fct.c
+++ b/gr-filter/lib/gen_interpolator_taps/objective_fct.c
@@ -24,9 +24,9 @@
  * generate MMSE FIR interpolation table values
  */
 
-#include <math.h>
 #include <assert.h>
 #include <gsl/gsl_integration.h>
+#include <math.h>
 
 #define MU 0.5 /* the MU for which we're computing coeffs */
 
diff --git a/gr-filter/lib/hilbert_fc_impl.h b/gr-filter/lib/hilbert_fc_impl.h
index 22fd475b596..998179f258e 100644
--- a/gr-filter/lib/hilbert_fc_impl.h
+++ b/gr-filter/lib/hilbert_fc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FILTER_HILBERT_FC_IMPL_H
 #define INCLUDED_FILTER_HILBERT_FC_IMPL_H
 
-#include <gnuradio/filter/hilbert_fc.h>
 #include <gnuradio/filter/fir_filter.h>
+#include <gnuradio/filter/hilbert_fc.h>
 #include <gnuradio/types.h>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_fir_interpolator_cc.cc b/gr-filter/lib/mmse_fir_interpolator_cc.cc
index 6e423d3bd2d..9c393a433b6 100644
--- a/gr-filter/lib/mmse_fir_interpolator_cc.cc
+++ b/gr-filter/lib/mmse_fir_interpolator_cc.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/filter/interpolator_taps.h>
+#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_fir_interpolator_ff.cc b/gr-filter/lib/mmse_fir_interpolator_ff.cc
index 327934c75a5..b1e3ec43e79 100644
--- a/gr-filter/lib/mmse_fir_interpolator_ff.cc
+++ b/gr-filter/lib/mmse_fir_interpolator_ff.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/filter/interpolator_taps.h>
+#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interp_differentiator_cc.cc b/gr-filter/lib/mmse_interp_differentiator_cc.cc
index d15f9106c09..3d81b5253f7 100644
--- a/gr-filter/lib/mmse_interp_differentiator_cc.cc
+++ b/gr-filter/lib/mmse_interp_differentiator_cc.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include "gnuradio/filter/interp_differentiator_taps.h"
+#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interp_differentiator_ff.cc b/gr-filter/lib/mmse_interp_differentiator_ff.cc
index 4566e8e6c0b..431eff630c8 100644
--- a/gr-filter/lib/mmse_interp_differentiator_ff.cc
+++ b/gr-filter/lib/mmse_interp_differentiator_ff.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include "gnuradio/filter/interp_differentiator_taps.h"
+#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.cc b/gr-filter/lib/mmse_interpolator_cc_impl.cc
index caf00fb06f9..1d80a635dcc 100644
--- a/gr-filter/lib/mmse_interpolator_cc_impl.cc
+++ b/gr-filter/lib/mmse_interpolator_cc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_interpolator_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.h b/gr-filter/lib/mmse_interpolator_cc_impl.h
index e1fa1dc6c19..fe316ad4ecb 100644
--- a/gr-filter/lib/mmse_interpolator_cc_impl.h
+++ b/gr-filter/lib/mmse_interpolator_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H
 #define INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H
 
-#include <gnuradio/filter/mmse_interpolator_cc.h>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
+#include <gnuradio/filter/mmse_interpolator_cc.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.cc b/gr-filter/lib/mmse_interpolator_ff_impl.cc
index 0b696fbeb69..49c5543750e 100644
--- a/gr-filter/lib/mmse_interpolator_ff_impl.cc
+++ b/gr-filter/lib/mmse_interpolator_ff_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_interpolator_ff_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.h b/gr-filter/lib/mmse_interpolator_ff_impl.h
index efdf96e9a0b..193fcecee4c 100644
--- a/gr-filter/lib/mmse_interpolator_ff_impl.h
+++ b/gr-filter/lib/mmse_interpolator_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H
 #define INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H
 
-#include <gnuradio/filter/mmse_interpolator_ff.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/mmse_interpolator_ff.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc
index 4892556dc12..59f9eacfab9 100644
--- a/gr-filter/lib/mmse_resampler_cc_impl.cc
+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_resampler_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_resampler_cc_impl.h b/gr-filter/lib/mmse_resampler_cc_impl.h
index ce41fd35848..58420f2f2f2 100644
--- a/gr-filter/lib/mmse_resampler_cc_impl.h
+++ b/gr-filter/lib/mmse_resampler_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_CC_IMPL_H
 #define INCLUDED_MMSE_RESAMPLER_CC_IMPL_H
 
-#include <gnuradio/filter/mmse_resampler_cc.h>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
+#include <gnuradio/filter/mmse_resampler_cc.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc
index 0a7bc9ee5b8..342d9f7678f 100644
--- a/gr-filter/lib/mmse_resampler_ff_impl.cc
+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_resampler_ff_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_resampler_ff_impl.h b/gr-filter/lib/mmse_resampler_ff_impl.h
index aad2f2fc3fb..5632f8a81e3 100644
--- a/gr-filter/lib/mmse_resampler_ff_impl.h
+++ b/gr-filter/lib/mmse_resampler_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_FF_IMPL_H
 #define INCLUDED_MMSE_RESAMPLER_FF_IMPL_H
 
-#include <gnuradio/filter/mmse_resampler_ff.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/mmse_resampler_ff.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/pfb_arb_resampler_ccc_impl.h b/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
index aa30eee4d11..b41eae2e650 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCC_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCC_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_ccc.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_ccc.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
index b611de0a53a..b339a94fc52 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCF_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCF_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_ccf.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_ccf.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_arb_resampler_fff_impl.h b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
index 78598dde0e0..c63b1a377d7 100644
--- a/gr-filter/lib/pfb_arb_resampler_fff_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_FFF_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_FFF_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_fff.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_fff.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.h b/gr-filter/lib/pfb_channelizer_ccf_impl.h
index 1eecdd356cb..5f67b70ca5a 100644
--- a/gr-filter/lib/pfb_channelizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_channelizer_ccf_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_FILTER_PFB_CHANNELIZER_CCF_IMPL_H
 #define INCLUDED_FILTER_PFB_CHANNELIZER_CCF_IMPL_H
 
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/pfb_channelizer_ccf.h>
 #include <gnuradio/filter/polyphase_filterbank.h>
-#include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/fft/fft.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc
index 503513a080c..7f845596d51 100644
--- a/gr-filter/lib/pfb_decimator_ccf_impl.cc
+++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pfb_decimator_ccf_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 
diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.h b/gr-filter/lib/pfb_interpolator_ccf_impl.h
index 103b44a07bb..86e5e2ee5e3 100644
--- a/gr-filter/lib/pfb_interpolator_ccf_impl.h
+++ b/gr-filter/lib/pfb_interpolator_ccf_impl.h
@@ -24,10 +24,10 @@
 #ifndef INCLUDED_PFB_INTERPOLATOR_CCF_IMPL_H
 #define INCLUDED_PFB_INTERPOLATOR_CCF_IMPL_H
 
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/pfb_interpolator_ccf.h>
 #include <gnuradio/filter/polyphase_filterbank.h>
-#include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/fft/fft.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.h b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
index 7cce3019a4c..9e54a3b93d2 100644
--- a/gr-filter/lib/pfb_synthesizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
@@ -24,9 +24,9 @@
 #ifndef INCLUDED_PFB_SYNTHESIZER_CCF_IMPL_H
 #define INCLUDED_PFB_SYNTHESIZER_CCF_IMPL_H
 
-#include <gnuradio/filter/pfb_synthesizer_ccf.h>
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
+#include <gnuradio/filter/pfb_synthesizer_ccf.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pm_remez.cc b/gr-filter/lib/pm_remez.cc
index 45a33ea6afa..cc952bfba32 100644
--- a/gr-filter/lib/pm_remez.cc
+++ b/gr-filter/lib/pm_remez.cc
@@ -42,8 +42,8 @@
 #endif
 
 #include <gnuradio/filter/pm_remez.h>
-#include <cmath>
 #include <assert.h>
+#include <cmath>
 #include <iostream>
 
 #ifndef LOCAL_BUFFER
diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
index fdd57f416b0..0c93bc24767 100644
--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
+++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
@@ -24,10 +24,10 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/types.h>
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/random.h>
+#include <gnuradio/types.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
 #include <cmath>
diff --git a/gr-filter/lib/qa_firdes.cc b/gr-filter/lib/qa_firdes.cc
index ad1d08f1547..3f80a2f202e 100644
--- a/gr-filter/lib/qa_firdes.cc
+++ b/gr-filter/lib/qa_firdes.cc
@@ -22,11 +22,11 @@
 
 #include <gnuradio/filter/firdes.h>
 #include <gnuradio/gr_complex.h>
-#include <boost/test/unit_test.hpp>
+#include <stdio.h>
 #include <string.h>
-#include <iostream>
+#include <boost/test/unit_test.hpp>
 #include <iomanip>
-#include <stdio.h>
+#include <iostream>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
index 2b2dba1f626..42071727526 100644
--- a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
+++ b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
index c7cec03c29b..40bcf441789 100644
--- a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
+++ b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
@@ -24,13 +24,13 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
index e769351f646..fd88fcc5dcf 100644
--- a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
+++ b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
index 5be4e995c79..53d0f27255d 100644
--- a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
+++ b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/single_pole_iir_filter_cc_impl.h b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
index 05bdeb49623..e181f8f0047 100644
--- a/gr-filter/lib/single_pole_iir_filter_cc_impl.h
+++ b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/single_pole_iir.h>
 #include <gnuradio/filter/single_pole_iir_filter_cc.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/sync_block.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-qtgui/examples/c++/display_qt.h b/gr-qtgui/examples/c++/display_qt.h
index 18e5c4b470b..819b24407a2 100644
--- a/gr-qtgui/examples/c++/display_qt.h
+++ b/gr-qtgui/examples/c++/display_qt.h
@@ -21,21 +21,21 @@
 
 // Q_MOC_RUN is a workaround for a QT4 + Boost version issue
 #ifndef Q_MOC_RUN
-#include <gnuradio/top_block.h>
-#include <gnuradio/analog/sig_source.h>
 #include <gnuradio/analog/noise_source.h>
+#include <gnuradio/analog/sig_source.h>
 #include <gnuradio/blocks/add_blk.h>
 #include <gnuradio/blocks/throttle.h>
-#include <gnuradio/qtgui/time_sink_f.h>
+#include <gnuradio/fft/window.h>
 #include <gnuradio/qtgui/freq_sink_f.h>
-#include <gnuradio/qtgui/waterfall_sink_f.h>
 #include <gnuradio/qtgui/histogram_sink_f.h>
-#include <gnuradio/fft/window.h>
+#include <gnuradio/qtgui/time_sink_f.h>
+#include <gnuradio/qtgui/waterfall_sink_f.h>
+#include <gnuradio/top_block.h>
 #endif
 
-#include <QWidget>
 #include <QHBoxLayout>
 #include <QTabWidget>
+#include <QWidget>
 
 using namespace gr;
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h
index bca8c6385e1..1b9f8b643a5 100644
--- a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h
@@ -23,10 +23,10 @@
 #ifndef CONSTELLATION_DISPLAY_PLOT_H
 #define CONSTELLATION_DISPLAY_PLOT_H
 
+#include <gnuradio/qtgui/DisplayPlot.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying constellaton (I&Q) plots.
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index bb523c0c2d5..d1cf806f5f3 100644
--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -23,22 +23,22 @@
 #ifndef DOMAIN_DISPLAY_PLOT_H
 #define DOMAIN_DISPLAY_PLOT_H
 
-#include <stdint.h>
-#include <cstdio>
-#include <vector>
-#include <qwt_plot.h>
+#include <gnuradio/qtgui/utils.h>
+#include <qwt_legend.h>
 #include <qwt_painter.h>
+#include <qwt_plot.h>
 #include <qwt_plot_canvas.h>
 #include <qwt_plot_curve.h>
-#include <qwt_scale_engine.h>
-#include <qwt_scale_widget.h>
-#include <qwt_plot_zoomer.h>
-#include <qwt_plot_panner.h>
 #include <qwt_plot_magnifier.h>
 #include <qwt_plot_marker.h>
+#include <qwt_plot_panner.h>
+#include <qwt_plot_zoomer.h>
+#include <qwt_scale_engine.h>
+#include <qwt_scale_widget.h>
 #include <qwt_symbol.h>
-#include <qwt_legend.h>
-#include <gnuradio/qtgui/utils.h>
+#include <stdint.h>
+#include <cstdio>
+#include <vector>
 
 #if QWT_VERSION >= 0x060000
 #include <qwt_compat.h>
diff --git a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h
index 7c6f2db3d27..ebb6b2e480d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h
@@ -23,10 +23,10 @@
 #ifndef FREQUENCY_DISPLAY_PLOT_HPP
 #define FREQUENCY_DISPLAY_PLOT_HPP
 
+#include <gnuradio/qtgui/DisplayPlot.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying frequency domain (PSD) plots.
diff --git a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h
index 0b342a0edf7..5c660989b9d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h
@@ -23,10 +23,10 @@
 #ifndef HISTOGRAM_DISPLAY_PLOT_H
 #define HISTOGRAM_DISPLAY_PLOT_H
 
+#include <gnuradio/qtgui/DisplayPlot.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying time domain plots.
diff --git a/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h
index 1e3402b043c..adca221876d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h
+++ b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h
@@ -23,12 +23,12 @@
 #ifndef SPECTRUM_GUI_CLASS_HPP
 #define SPECTRUM_GUI_CLASS_HPP
 
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/thread/thread.h>
-#include <qwidget.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qslider.h>
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <qwidget.h>
 
 class SpectrumDisplayForm;
 #include <gnuradio/qtgui/spectrumdisplayform.h>
@@ -36,8 +36,8 @@ class SpectrumDisplayForm;
 #include <cmath>
 
 #include <complex>
-#include <vector>
 #include <string>
+#include <vector>
 
 /*!
  * \brief QWidget class for controlling plotting.
diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h
index ab1402cd24c..3af3bd8bc69 100644
--- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h
@@ -23,11 +23,11 @@
 #ifndef TIME_DOMAIN_DISPLAY_PLOT_H
 #define TIME_DOMAIN_DISPLAY_PLOT_H
 
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/tags.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <gnuradio/qtgui/DisplayPlot.h>
-#include <gnuradio/tags.h>
 
 /*!
  * \brief QWidget for displaying time domain plots.
diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
index 62bab308393..20047ac311c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
@@ -23,14 +23,14 @@
 #ifndef TIMERASTER_DISPLAY_PLOT_H
 #define TIMERASTER_DISPLAY_PLOT_H
 
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/plot_raster.h>
+#include <gnuradio/qtgui/timeRasterGlobalData.h>
+#include <qwt_plot_rasteritem.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qwt_plot_rasteritem.h>
-#include <gnuradio/qtgui/DisplayPlot.h>
-#include <gnuradio/qtgui/timeRasterGlobalData.h>
-#include <gnuradio/qtgui/plot_raster.h>
-#include <gnuradio/high_res_timer.h>
 
 #if QWT_VERSION < 0x060000
 #include <gnuradio/qtgui/plot_waterfall.h>
diff --git a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h
index 413a9298094..df58d6ba5ed 100644
--- a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h
@@ -23,10 +23,10 @@
 #ifndef VECTOR_DISPLAY_PLOT_HPP
 #define VECTOR_DISPLAY_PLOT_HPP
 
+#include <gnuradio/qtgui/DisplayPlot.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying 1D-vector plots.
diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
index ccb02dae516..3c53906cbfe 100644
--- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
@@ -23,13 +23,13 @@
 #ifndef WATERFALL_DISPLAY_PLOT_H
 #define WATERFALL_DISPLAY_PLOT_H
 
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/waterfallGlobalData.h>
+#include <qwt_plot_spectrogram.h>
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qwt_plot_spectrogram.h>
-#include <gnuradio/qtgui/DisplayPlot.h>
-#include <gnuradio/qtgui/waterfallGlobalData.h>
-#include <gnuradio/high_res_timer.h>
 
 #if QWT_VERSION < 0x060000
 #include <gnuradio/qtgui/plot_waterfall.h>
diff --git a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h
index e1f6516e41b..c39e81a9d85 100644
--- a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h
+++ b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h
@@ -27,8 +27,8 @@
 #include <Python.h>
 #endif
 
-#include <gnuradio/qtgui/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/qtgui/api.h>
 #include <qapplication.h>
 
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index 263a982ee78..7a481b51325 100644
--- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -27,11 +27,11 @@
 #include <Python.h>
 #endif
 
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/qtgui/trigger_mode.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h
index ac37867be65..955bec2bc12 100644
--- a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h
@@ -23,9 +23,9 @@
 #ifndef CONSTELLATION_DISPLAY_FORM_H
 #define CONSTELLATION_DISPLAY_FORM_H
 
+#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/qtgui/spectrumUpdateEvents.h>
-#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h
index 1142b95955b..d19ea8f6923 100644
--- a/gr-qtgui/include/gnuradio/qtgui/displayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h
@@ -23,8 +23,8 @@
 #ifndef DISPLAY_FORM_H
 #define DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/qtgui/api.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h
index b8ae1e75532..4299bbb94c3 100644
--- a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h
+++ b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h
@@ -27,9 +27,9 @@
 #include <Python.h>
 #endif
 
-#include <gnuradio/qtgui/qtgui_types.h>
-#include <gnuradio/qtgui/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/qtgui/qtgui_types.h>
 #include <qapplication.h>
 
 namespace gr {
diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
index b2a70dcec6d..dcb32fbc426 100644
--- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h
+++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
@@ -23,20 +23,20 @@
 #ifndef FORM_MENUS_H
 #define FORM_MENUS_H
 
+#include <QtGui/QDoubleValidator>
+#include <QtGui/QIntValidator>
+#include <QtGui/QtGui>
 #include <stdexcept>
 #include <vector>
-#include <QtGui/QtGui>
-#include <QtGui/QIntValidator>
-#include <QtGui/QDoubleValidator>
 
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
 
-#include <qwt_symbol.h>
 #include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/qtgui_types.h>
 #include <gnuradio/qtgui/trigger_mode.h>
+#include <qwt_symbol.h>
 
 class LineColorMenu : public QMenu
 {
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index 93bacfbc118..d172e495994 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -27,11 +27,11 @@
 #include <Python.h>
 #endif
 
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/qtgui/trigger_mode.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index 3df7ba1317d..81be9a68742 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -27,11 +27,11 @@
 #include <Python.h>
 #endif
 
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/qtgui/trigger_mode.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
index 907e2ff72a6..bd4a6e88206 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
@@ -23,16 +23,16 @@
 #ifndef FREQ_CONTROL_PANEL_H
 #define FREQ_CONTROL_PANEL_H
 
+#include <gnuradio/qtgui/displayform.h>
+#include <gnuradio/qtgui/freqdisplayform.h>
 #include <QtGui/QtGui>
-#include <vector>
-#include <QSlider>
-#include <QComboBox>
 #include <QCheckBox>
-#include <QPushButton>
-#include <QLabel>
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <gnuradio/qtgui/displayform.h>
-#include <gnuradio/qtgui/freqdisplayform.h>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+#include <vector>
 
 class FreqControlPanel : public QVBoxLayout
 {
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
index b3350a41412..5c09e152020 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
@@ -23,11 +23,11 @@
 #ifndef FREQ_DISPLAY_FORM_H
 #define FREQ_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/FrequencyDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <gnuradio/filter/firdes.h>
 
 #include <gnuradio/qtgui/displayform.h>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
index 18f400578b5..f4eb22ec18c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
@@ -23,8 +23,8 @@
 #ifndef HISTOGRAM_DISPLAY_FORM_H
 #define HISTOGRAM_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/qtgui/HistogramDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
index 1030bdef7d6..a457462c13b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h
+++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
@@ -28,8 +28,8 @@
 #endif
 
 #include <gnuradio/qtgui/api.h>
-#include <gnuradio/qtgui/trigger_mode.h>
 #include <gnuradio/qtgui/qtgui_types.h>
+#include <gnuradio/qtgui/trigger_mode.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
index 05f6aaa94e0..0386ed1bead 100644
--- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
@@ -23,8 +23,8 @@
 #ifndef NUMBER_DISPLAY_FORM_H
 #define NUMBER_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/qtgui/form_menus.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <qwt_thermo.h>
 #include <vector>
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
index 9705aabbc65..83165619b8d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
@@ -23,13 +23,13 @@
 #ifndef PLOT_TIMERASTER_H
 #define PLOT_TIMERASTER_H
 
-#include <qglobal.h>
 #include <gnuradio/qtgui/timeRasterGlobalData.h>
+#include <qglobal.h>
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #include <qwt_compat.h>
+#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #endif
 
 class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
index c7c626413d0..22cd708353c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
@@ -23,13 +23,13 @@
 #ifndef PLOT_WATERFALL_H
 #define PLOT_WATERFALL_H
 
-#include <qglobal.h>
 #include <gnuradio/qtgui/waterfallGlobalData.h>
+#include <qglobal.h>
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #include <qwt_compat.h>
+#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #endif
 
 class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
index 1d21e68e0d0..90bad89eb99 100644
--- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -23,9 +23,9 @@
 #ifndef QTGUI_TYPES_H
 #define QTGUI_TYPES_H
 
+#include <gnuradio/high_res_timer.h>
 #include <qwt_color_map.h>
 #include <qwt_scale_draw.h>
-#include <gnuradio/high_res_timer.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
index 4dcf7f1528b..3ad02a1e065 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
@@ -27,8 +27,8 @@
 #include <Python.h>
 #endif
 
-#include <gnuradio/qtgui/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/qtgui/api.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
index 36759c15b98..c5d8973385d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
@@ -27,8 +27,8 @@
 #include <Python.h>
 #endif
 
-#include <gnuradio/qtgui/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/qtgui/api.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
index 4a85b44c8a9..5eec015a8c5 100644
--- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
@@ -23,14 +23,14 @@
 #ifndef SPECTRUM_UPDATE_EVENTS_H
 #define SPECTRUM_UPDATE_EVENTS_H
 
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/tags.h>
 #include <stdint.h>
 #include <QEvent>
 #include <QString>
 #include <complex>
 #include <vector>
-#include <gnuradio/high_res_timer.h>
-#include <gnuradio/qtgui/api.h>
-#include <gnuradio/tags.h>
 
 static const int SpectrumUpdateEventType = 10005;
 static const int SpectrumWindowCaptionEventType = 10008;
diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h
index 6acdde73940..53226986316 100644
--- a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h
@@ -28,13 +28,13 @@
 class SpectrumGUIClass;
 #include <gnuradio/qtgui/SpectrumGUIClass.h>
 
-#include <gnuradio/qtgui/SpectrumGUIClass.h>
+#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 #include <gnuradio/qtgui/FrequencyDisplayPlot.h>
-#include <gnuradio/qtgui/WaterfallDisplayPlot.h>
+#include <gnuradio/qtgui/SpectrumGUIClass.h>
 #include <gnuradio/qtgui/TimeDomainDisplayPlot.h>
-#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
-#include <QValidator>
+#include <gnuradio/qtgui/WaterfallDisplayPlot.h>
 #include <QTimer>
+#include <QValidator>
 #include <vector>
 
 class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm
diff --git a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
index dd57a8c2ee3..0a7fb1e10ab 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
@@ -23,12 +23,12 @@
 #ifndef TIMERASTER_GLOBAL_DATA_HPP
 #define TIMERASTER_GLOBAL_DATA_HPP
 
-#include <qwt_raster_data.h>
 #include <inttypes.h>
+#include <qwt_raster_data.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #include <qwt_compat.h>
+#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #endif
 
 class TimeRasterData : public QwtRasterData
diff --git a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
index 1629b163581..602cebedd3f 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
@@ -23,16 +23,16 @@
 #ifndef TIME_CONTROL_PANEL_H
 #define TIME_CONTROL_PANEL_H
 
+#include <gnuradio/qtgui/displayform.h>
+#include <gnuradio/qtgui/timedisplayform.h>
 #include <QtGui/QtGui>
-#include <vector>
-#include <QSlider>
-#include <QComboBox>
 #include <QCheckBox>
-#include <QPushButton>
-#include <QLabel>
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <gnuradio/qtgui/displayform.h>
-#include <gnuradio/qtgui/timedisplayform.h>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+#include <vector>
 
 class TimeControlPanel : public QVBoxLayout
 {
diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
index 71ef2bd1a54..0f67b0a5893 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
@@ -23,9 +23,9 @@
 #ifndef TIME_DISPLAY_FORM_H
 #define TIME_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/qtgui/TimeDomainDisplayPlot.h>
 #include <gnuradio/qtgui/displayform.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h
index f9d9141db36..bf685d8b333 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h
@@ -23,11 +23,11 @@
 #ifndef TIMERASTER_DISPLAY_FORM_H
 #define TIMERASTER_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/TimeRasterDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <gnuradio/filter/firdes.h>
 
 #include <gnuradio/qtgui/displayform.h>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h
index fb4431ef8b1..5a75ef8a91b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/utils.h
+++ b/gr-qtgui/include/gnuradio/qtgui/utils.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_QTGUI_UTILS_H
 #define INCLUDED_QTGUI_UTILS_H
 
-#include <qevent.h>
 #include <gnuradio/qtgui/api.h>
-#include <qwt_plot_picker.h>
+#include <qevent.h>
 #include <qwt_picker_machine.h>
-#include <QString>
+#include <qwt_plot_picker.h>
 #include <QCoreApplication>
+#include <QString>
 
 /*!
  * From QSS file name, extracts the file contents and returns a
diff --git a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h
index bafdb911cf8..78e93b4c083 100644
--- a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h
@@ -23,8 +23,8 @@
 #ifndef VECTOR_DISPLAY_FORM_H
 #define VECTOR_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <gnuradio/qtgui/VectorDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
index fb21485d383..2996405990c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
@@ -23,12 +23,12 @@
 #ifndef WATERFALL_GLOBAL_DATA_HPP
 #define WATERFALL_GLOBAL_DATA_HPP
 
-#include <qwt_raster_data.h>
 #include <inttypes.h>
+#include <qwt_raster_data.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #include <qwt_compat.h>
+#include <qwt_point_3d.h> // doesn't seem necessary, but is...
 #endif
 
 class WaterfallData : public QwtRasterData
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index a41281af6ff..774ac663fec 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -27,10 +27,10 @@
 #include <Python.h>
 #endif
 
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index bbb9538da66..2a01e603b9b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -27,10 +27,10 @@
 #include <Python.h>
 #endif
 
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <gnuradio/filter/firdes.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
index 44b8a8a0840..2ddecd77e64 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
@@ -23,11 +23,11 @@
 #ifndef WATERFALL_DISPLAY_FORM_H
 #define WATERFALL_DISPLAY_FORM_H
 
-#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/WaterfallDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <gnuradio/filter/firdes.h>
 
 #include <gnuradio/qtgui/displayform.h>
 
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index 5400b341d32..6358b6ac19f 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
+#include <qwt_scale_draw.h>
 #include <QColor>
 #include <iostream>
 
diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc
index b14021e3154..2989b1aaf83 100644
--- a/gr-qtgui/lib/DisplayPlot.cc
+++ b/gr-qtgui/lib/DisplayPlot.cc
@@ -22,13 +22,13 @@
 
 #include <gnuradio/qtgui/DisplayPlot.h>
 
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
+#include <qwt_scale_draw.h>
 #include <QColor>
+#include <QDebug>
 #include <cmath>
 #include <iostream>
 #include <stdexcept>
-#include <QDebug>
 
 DisplayPlot::DisplayPlot(int nplots, QWidget* parent)
     : QwtPlot(parent), d_nplots(nplots), d_stop(false)
diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc
index e57557f9549..17a9faca7b4 100644
--- a/gr-qtgui/lib/HistogramDisplayPlot.cc
+++ b/gr-qtgui/lib/HistogramDisplayPlot.cc
@@ -25,14 +25,14 @@
 
 #include <gnuradio/qtgui/HistogramDisplayPlot.h>
 
-#include <qwt_scale_draw.h>
+#include <gnuradio/math.h>
 #include <qwt_legend.h>
+#include <qwt_scale_draw.h>
+#include <volk/volk.h>
+#include <boost/math/special_functions/round.hpp>
 #include <QColor>
 #include <cmath>
 #include <iostream>
-#include <volk/volk.h>
-#include <gnuradio/math.h>
-#include <boost/math/special_functions/round.hpp>
 
 #ifdef _MSC_VER
 #define copysign _copysign
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 442ff6a4f9d..e5be0ec7ede 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -26,8 +26,8 @@
 #include <gnuradio/qtgui/SpectrumGUIClass.h>
 
 // Added by qt3to4:
-#include <QEvent>
 #include <volk/volk.h>
+#include <QEvent>
 
 const long SpectrumGUIClass::MAX_FFT_SIZE = 32768;
 const long SpectrumGUIClass::MIN_FFT_SIZE = 256;
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
index ad8a300abfd..73796b54b30 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
@@ -25,12 +25,12 @@
 
 #include <gnuradio/qtgui/TimeDomainDisplayPlot.h>
 
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
+#include <qwt_scale_draw.h>
+#include <volk/volk.h>
 #include <QColor>
 #include <cmath>
 #include <iostream>
-#include <volk/volk.h>
 
 class TimePrecisionClass
 {
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
index 5fc333c6b27..67e9fac6ee1 100644
--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
@@ -27,9 +27,9 @@
 
 #include <gnuradio/qtgui/qtgui_types.h>
 #include <qwt_color_map.h>
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
 #include <qwt_plot_layout.h>
+#include <qwt_scale_draw.h>
 #include <QColor>
 #include <iostream>
 
diff --git a/gr-qtgui/lib/VectorDisplayPlot.cc b/gr-qtgui/lib/VectorDisplayPlot.cc
index dbc1209b507..3e91de071ab 100644
--- a/gr-qtgui/lib/VectorDisplayPlot.cc
+++ b/gr-qtgui/lib/VectorDisplayPlot.cc
@@ -26,8 +26,8 @@
 #include <gnuradio/qtgui/VectorDisplayPlot.h>
 
 #include <gnuradio/qtgui/qtgui_types.h>
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
+#include <qwt_scale_draw.h>
 #include <QColor>
 #include <iostream>
 
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index cd87fc965d5..af8e3b47f20 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -27,9 +27,9 @@
 
 #include <gnuradio/qtgui/qtgui_types.h>
 #include <qwt_color_map.h>
-#include <qwt_scale_draw.h>
 #include <qwt_legend.h>
 #include <qwt_plot_layout.h>
+#include <qwt_scale_draw.h>
 #include <QColor>
 #include <iostream>
 
diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc
index b2f98981ce3..3b8c6a9d89f 100644
--- a/gr-qtgui/lib/ber_sink_b_impl.cc
+++ b/gr-qtgui/lib/ber_sink_b_impl.cc
@@ -22,9 +22,9 @@
 
 #include "ber_sink_b_impl.h"
 
+#include <gnuradio/fft/fft.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <gnuradio/fft/fft.h>
 #include <volk/volk.h>
 #include <cmath>
 
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
index a6024bbed76..a2f2f3458c0 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -28,9 +28,9 @@
 
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
+#include <qwt_symbol.h>
 #include <string.h>
 #include <volk/volk.h>
-#include <qwt_symbol.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc
index b14a8a8fbd5..ecfc4cb238e 100644
--- a/gr-qtgui/lib/constellationdisplayform.cc
+++ b/gr-qtgui/lib/constellationdisplayform.cc
@@ -22,8 +22,8 @@
 
 #include <gnuradio/qtgui/constellationdisplayform.h>
 
-#include <cmath>
 #include <QMessageBox>
+#include <cmath>
 #include <iostream>
 
 ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent)
diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc
index 23329902fd4..85cfe9dd794 100644
--- a/gr-qtgui/lib/displayform.cc
+++ b/gr-qtgui/lib/displayform.cc
@@ -22,9 +22,9 @@
 
 #include <gnuradio/qtgui/displayform.h>
 
-#include <iostream>
-#include <QPixmap>
 #include <QFileDialog>
+#include <QPixmap>
+#include <iostream>
 
 DisplayForm::DisplayForm(int nplots, QWidget* parent)
     : QWidget(parent), d_nplots(nplots), d_system_specified_flag(false)
diff --git a/gr-qtgui/lib/edit_box_msg_impl.h b/gr-qtgui/lib/edit_box_msg_impl.h
index b53dbbc4f4d..7d71a7f41b7 100644
--- a/gr-qtgui/lib/edit_box_msg_impl.h
+++ b/gr-qtgui/lib/edit_box_msg_impl.h
@@ -25,12 +25,12 @@
 
 #include <gnuradio/qtgui/edit_box_msg.h>
 
+#include <QComboBox>
 #include <QGroupBox>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QLineEdit>
-#include <QComboBox>
 #include <QLabel>
+#include <QLineEdit>
+#include <QVBoxLayout>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 576c96a9184..8372ce4b35e 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -29,8 +29,8 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h
index ac619bbe312..c9c51e8e75b 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.h
+++ b/gr-qtgui/lib/freq_sink_c_impl.h
@@ -25,9 +25,9 @@
 
 #include <gnuradio/qtgui/freq_sink_c.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/fft/fft_shift.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/freqdisplayform.h>
 
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 54f40d24537..4f25ffb5220 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -29,8 +29,8 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h
index c529ca6d7b7..616069847a7 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.h
+++ b/gr-qtgui/lib/freq_sink_f_impl.h
@@ -25,9 +25,9 @@
 
 #include <gnuradio/qtgui/freq_sink_f.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/fft/fft_shift.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/freqdisplayform.h>
 
diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc
index 432d30729f2..2aafedd1156 100644
--- a/gr-qtgui/lib/freqdisplayform.cc
+++ b/gr-qtgui/lib/freqdisplayform.cc
@@ -22,10 +22,10 @@
 
 #include <gnuradio/qtgui/freqdisplayform.h>
 
-#include <cmath>
+#include <gnuradio/qtgui/freqcontrolpanel.h>
 #include <QMessageBox>
 #include <QSpacerItem>
-#include <gnuradio/qtgui/freqcontrolpanel.h>
+#include <cmath>
 #include <iostream>
 
 FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent)
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 133725abc02..d66676a9c3a 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -29,8 +29,8 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h
index a80cb3855c2..0d12dbc4e00 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.h
+++ b/gr-qtgui/lib/histogram_sink_f_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/histogram_sink_f.h>
 
-#include <gnuradio/qtgui/histogramdisplayform.h>
 #include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/histogramdisplayform.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc
index 05c8355554a..1222b90433c 100644
--- a/gr-qtgui/lib/number_sink_impl.cc
+++ b/gr-qtgui/lib/number_sink_impl.cc
@@ -26,11 +26,11 @@
 
 #include "number_sink_impl.h"
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/io_signature.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 #include <cmath>
diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h
index 8a1ba066359..717d7a6e2ac 100644
--- a/gr-qtgui/lib/number_sink_impl.h
+++ b/gr-qtgui/lib/number_sink_impl.h
@@ -25,9 +25,9 @@
 
 #include <gnuradio/qtgui/number_sink.h>
 
-#include <gnuradio/qtgui/numberdisplayform.h>
 #include <gnuradio/filter/single_pole_iir.h>
 #include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/numberdisplayform.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc
index 6fa0657546d..f0ae16c7ae0 100644
--- a/gr-qtgui/lib/numberdisplayform.cc
+++ b/gr-qtgui/lib/numberdisplayform.cc
@@ -23,8 +23,8 @@
 #include <gnuradio/qtgui/numberdisplayform.h>
 
 #include <qwt_color_map.h>
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 
 #include <cmath>
 #include <iostream>
diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc
index a339ec64bb1..8c5a33adbc3 100644
--- a/gr-qtgui/lib/plot_raster.cc
+++ b/gr-qtgui/lib/plot_raster.cc
@@ -22,12 +22,12 @@
 
 #include <gnuradio/qtgui/plot_raster.h>
 
-#include <qimage.h>
-#include <qpen.h>
-#include <qpainter.h>
+#include "qwt_color_map.h"
 #include "qwt_painter.h"
 #include "qwt_scale_map.h"
-#include "qwt_color_map.h"
+#include <qimage.h>
+#include <qpainter.h>
+#include <qpen.h>
 
 #include <iostream>
 
diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc
index 4f9ba9ecf2b..eaee2562897 100644
--- a/gr-qtgui/lib/plot_waterfall.cc
+++ b/gr-qtgui/lib/plot_waterfall.cc
@@ -22,12 +22,12 @@
 
 #include <gnuradio/qtgui/plot_waterfall.h>
 
-#include <qimage.h>
-#include <qpen.h>
-#include <qpainter.h>
+#include "qwt_color_map.h"
 #include "qwt_painter.h"
 #include "qwt_scale_map.h"
-#include "qwt_color_map.h"
+#include <qimage.h>
+#include <qpainter.h>
+#include <qpen.h>
 
 #if QWT_VERSION < 0x060000
 #include "qwt_double_interval.h"
diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc
index 3432ad302f2..75befcd5b03 100644
--- a/gr-qtgui/lib/qtgui_util.cc
+++ b/gr-qtgui/lib/qtgui_util.cc
@@ -24,10 +24,10 @@
 
 #include <gnuradio/prefs.h>
 
+#include <qapplication.h>
+#include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
-#include <QCoreApplication>
-#include <qapplication.h>
 
 QString get_qt_style_sheet(QString filename)
 {
diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h
index a016a1404fe..4a341ace58e 100644
--- a/gr-qtgui/lib/sink_c_impl.h
+++ b/gr-qtgui/lib/sink_c_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/sink_c.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/SpectrumGUIClass.h>
 
diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h
index ed37a703d2e..8fe0ef18630 100644
--- a/gr-qtgui/lib/sink_f_impl.h
+++ b/gr-qtgui/lib/sink_f_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/sink_f.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/SpectrumGUIClass.h>
 
diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc
index 5f9d097077f..caf9df9d97a 100644
--- a/gr-qtgui/lib/timeRasterGlobalData.cc
+++ b/gr-qtgui/lib/timeRasterGlobalData.cc
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/timeRasterGlobalData.h>
 
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
 #include <iostream>
 
 TimeRasterData::TimeRasterData(const double rows, const double cols)
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 71dda47b4d9..a6c73079f91 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/time_raster_sink_b.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/timerasterdisplayform.h>
 
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h
index b760907427a..e20204167ed 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/time_raster_sink_f.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/timerasterdisplayform.h>
 
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index c885b7290e3..95ac4c2f69d 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -26,12 +26,12 @@
 
 #include "time_sink_c_impl.h"
 
+#include <gnuradio/fft/fft.h>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
-#include <gnuradio/fft/fft.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h
index d927e4a973c..9db9bcb3900 100644
--- a/gr-qtgui/lib/time_sink_c_impl.h
+++ b/gr-qtgui/lib/time_sink_c_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/time_sink_c.h>
 
-#include <gnuradio/qtgui/timedisplayform.h>
 #include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/timedisplayform.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index 07bacc5581f..e834411e6a4 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -26,14 +26,14 @@
 
 #include "time_sink_f_impl.h"
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/block_detail.h>
 #include <gnuradio/buffer.h>
-#include <gnuradio/prefs.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h
index 1f608657a2c..9669be44700 100644
--- a/gr-qtgui/lib/time_sink_f_impl.h
+++ b/gr-qtgui/lib/time_sink_f_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/qtgui/time_sink_f.h>
 
-#include <gnuradio/qtgui/timedisplayform.h>
 #include <gnuradio/high_res_timer.h>
+#include <gnuradio/qtgui/timedisplayform.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc
index 63801533956..1c50f57f15c 100644
--- a/gr-qtgui/lib/timedisplayform.cc
+++ b/gr-qtgui/lib/timedisplayform.cc
@@ -23,9 +23,9 @@
 
 #include <gnuradio/qtgui/timedisplayform.h>
 
+#include <QGroupBox>
 #include <QMessageBox>
 #include <QSpacerItem>
-#include <QGroupBox>
 
 #include <cmath>
 #include <iostream>
diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc
index 92963b4a644..b38f14ca2c1 100644
--- a/gr-qtgui/lib/vector_sink_f_impl.cc
+++ b/gr-qtgui/lib/vector_sink_f_impl.cc
@@ -29,8 +29,8 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
 #include <string.h>
 
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index b2f5751eaba..edbbfdc6095 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -29,11 +29,11 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 
-#include <volk/volk.h>
 #include <qwt_symbol.h>
+#include <volk/volk.h>
 
-#include <iostream>
 #include <string.h>
+#include <iostream>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h
index 41fdf86e48f..c03a9a1b587 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.h
@@ -25,9 +25,9 @@
 
 #include <gnuradio/qtgui/waterfall_sink_c.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/fft/fft_shift.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/waterfalldisplayform.h>
 
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h
index 036dd23e614..2613ef5e5d1 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.h
@@ -25,9 +25,9 @@
 
 #include <gnuradio/qtgui/waterfall_sink_f.h>
 
-#include <gnuradio/filter/firdes.h>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/fft/fft_shift.h>
+#include <gnuradio/filter/firdes.h>
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/waterfalldisplayform.h>
 
diff --git a/gr-trellis/include/gnuradio/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h
index 053a9db9ce0..554c10456f0 100644
--- a/gr-trellis/include/gnuradio/trellis/calc_metric.h
+++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_CALC_METRIC_H
 #define INCLUDED_CALC_METRIC_H
 
-#include <vector>
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/digital/metric_type.h>
+#include <gnuradio/gr_complex.h>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
index 9dcac004b98..66866ba33cf 100644
--- a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 
-#include <gnuradio/trellis/api.h>
 #include <gnuradio/block.h>
 #include <gnuradio/digital/constellation.h>
 #include <gnuradio/digital/metric_type.h>
+#include <gnuradio/trellis/api.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
index ffd78c0fdb5..93055e3714d 100644
--- a/gr-trellis/include/gnuradio/trellis/core_algorithms.h
+++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_CORE_ALGORITHMS_H
 #define INCLUDED_CORE_ALGORITHMS_H
 
-#include <cmath>
-#include <vector>
 #include <gnuradio/digital/metric_type.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
+#include <cmath>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/encoder.h b/gr-trellis/include/gnuradio/trellis/encoder.h
index 15c64063b1d..11f8a63969d 100644
--- a/gr-trellis/include/gnuradio/trellis/encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/encoder.h
@@ -23,9 +23,9 @@
 #ifndef ENCODER_H
 #define ENCODER_H
 
+#include <gnuradio/sync_block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/fsm.h>
-#include <gnuradio/sync_block.h>
 #include <cstdint>
 
 namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h
index 6ce9cec0eab..5daf8d38d63 100644
--- a/gr-trellis/include/gnuradio/trellis/fsm.h
+++ b/gr-trellis/include/gnuradio/trellis/fsm.h
@@ -24,8 +24,8 @@
 #define INCLUDED_TRELLIS_FSM_H
 
 #include <gnuradio/trellis/api.h>
-#include <vector>
 #include <iosfwd>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h
index caf0f80a094..230114b6c16 100644
--- a/gr-trellis/include/gnuradio/trellis/interleaver.h
+++ b/gr-trellis/include/gnuradio/trellis/interleaver.h
@@ -24,8 +24,8 @@
 #define INCLUDED_TRELLIS_INTERLEAVER_H
 
 #include <gnuradio/trellis/api.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/metrics.h b/gr-trellis/include/gnuradio/trellis/metrics.h
index b9af40a25c3..96b04e9187e 100644
--- a/gr-trellis/include/gnuradio/trellis/metrics.h
+++ b/gr-trellis/include/gnuradio/trellis/metrics.h
@@ -24,9 +24,9 @@
 #ifndef METRICS_H
 #define METRICS_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/calc_metric.h>
-#include <gnuradio/block.h>
 #include <cstdint>
 
 namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
index b6ed61ec332..ca3ef056455 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
@@ -24,13 +24,13 @@
 #ifndef PCCC_DECODER_BLK_H
 #define PCCC_DECODER_BLK_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
 #include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
index 0bb9188558b..7ad142e72ec 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
@@ -23,14 +23,14 @@
 #ifndef PCCC_DECODER_COMBINED_BLK_H
 #define PCCC_DECODER_COMBINED_BLK_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
index b4bb2694049..1bff4ac975f 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
@@ -23,12 +23,12 @@
 #ifndef PCCC_ENCODER_H
 #define PCCC_ENCODER_H
 
+#include <gnuradio/sync_block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/sync_block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h
index 22c586c5046..8409324a075 100644
--- a/gr-trellis/include/gnuradio/trellis/permutation.h
+++ b/gr-trellis/include/gnuradio/trellis/permutation.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_TRELLIS_PERMUTATION_H
 #define INCLUDED_TRELLIS_PERMUTATION_H
 
+#include <gnuradio/sync_block.h>
 #include <gnuradio/trellis/api.h>
 #include <vector>
-#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
index 1728199d882..0e197bcf50f 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
@@ -24,13 +24,13 @@
 #ifndef SCCC_DECODER_BLK_H
 #define SCCC_DECODER_BLK_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
 #include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
index 177f4e20773..e669b9c742a 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
@@ -23,14 +23,14 @@
 #ifndef SCCC_DECODER_COMBINED_BLK_H
 #define SCCC_DECODER_COMBINED_BLK_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
index 8506fd7c216..66c30fcafd6 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
@@ -23,10 +23,10 @@
 #ifndef SCCC_ENCODER_H
 #define SCCC_ENCODER_H
 
+#include <gnuradio/sync_block.h>
 #include <gnuradio/trellis/api.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/sync_block.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
index d6249aca62a..80f7344a51b 100644
--- a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H
 #define INCLUDED_TRELLIS_SISO_COMBINED_F_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
-#include <gnuradio/trellis/siso_type.h>
 #include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/siso_type.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h
index 90ae33309f2..4107ee21690 100644
--- a/gr-trellis/include/gnuradio/trellis/siso_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_f.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_TRELLIS_SISO_F_H
 #define INCLUDED_TRELLIS_SISO_F_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/core_algorithms.h>
 #include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/viterbi.h b/gr-trellis/include/gnuradio/trellis/viterbi.h
index c4327934267..21b5ebbf605 100644
--- a/gr-trellis/include/gnuradio/trellis/viterbi.h
+++ b/gr-trellis/include/gnuradio/trellis/viterbi.h
@@ -24,10 +24,10 @@
 #ifndef VITERBI_H
 #define VITERBI_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
 #include <cstdint>
 
 namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
index de1e139e5f7..472d37f45a7 100644
--- a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
@@ -23,11 +23,11 @@
 #ifndef VITERBI_COMBINED_H
 #define VITERBI_COMBINED_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
 #include <cstdint>
 
 namespace gr {
diff --git a/gr-trellis/lib/base.cc b/gr-trellis/lib/base.cc
index 15ccc80f75d..bec69bf2989 100644
--- a/gr-trellis/lib/base.cc
+++ b/gr-trellis/lib/base.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/trellis/base.h>
+#include <cmath>
 #include <cstdio>
 #include <stdexcept>
-#include <cmath>
-#include <gnuradio/trellis/base.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc
index 587edd437e3..e427174c33c 100644
--- a/gr-trellis/lib/calc_metric.cc
+++ b/gr-trellis/lib/calc_metric.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/trellis/calc_metric.h>
 #include <float.h>
 #include <stdexcept>
-#include <gnuradio/trellis/calc_metric.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index 6658e0e5186..8dac03f0a1c 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.cc
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc
@@ -27,8 +27,8 @@
 #include "constellation_metrics_cf_impl.h"
 #include <gnuradio/io_signature.h>
 #include <assert.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/core_algorithms.cc b/gr-trellis/lib/core_algorithms.cc
index d12896d3427..f3f75fb744b 100644
--- a/gr-trellis/lib/core_algorithms.cc
+++ b/gr-trellis/lib/core_algorithms.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/core_algorithms.h>
 #include <cstring>
-#include <stdexcept>
 #include <iostream>
-#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/trellis/calc_metric.h>
+#include <stdexcept>
 
 namespace gr {
 namespace trellis {
@@ -511,8 +511,8 @@ void siso_algorithm(int I,
                     const float* priori,
                     const float* prioro,
                     float* post //,
-                    // std::vector<float> &alpha,
-                    // std::vector<float> &beta
+                                // std::vector<float> &alpha,
+                                // std::vector<float> &beta
 )
 {
     float norm, mm, minm;
diff --git a/gr-trellis/lib/fsm.cc b/gr-trellis/lib/fsm.cc
index ca28266b70d..bceed6e1ad2 100644
--- a/gr-trellis/lib/fsm.cc
+++ b/gr-trellis/lib/fsm.cc
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gnuradio/trellis/base.h>
+#include <gnuradio/trellis/fsm.h>
+#include <stdlib.h>
+#include <cmath>
 #include <cstdio>
-#include <string>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <stdexcept>
-#include <cmath>
-#include <stdlib.h>
-#include <gnuradio/trellis/base.h>
-#include <gnuradio/trellis/fsm.h>
+#include <string>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/interleaver.cc b/gr-trellis/lib/interleaver.cc
index ae6fb05aa2f..5f5b8c0a301 100644
--- a/gr-trellis/lib/interleaver.cc
+++ b/gr-trellis/lib/interleaver.cc
@@ -20,16 +20,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <cstdlib>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/quicksort_index.h>
+#include <gnuradio/xoroshiro128p.h>
+#include <cmath>
 #include <cstdio>
-#include <iostream>
-#include <string>
+#include <cstdlib>
 #include <fstream>
+#include <iostream>
 #include <stdexcept>
-#include <cmath>
-#include <gnuradio/trellis/quicksort_index.h>
-#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/xoroshiro128p.h>
+#include <string>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/metrics_impl.cc b/gr-trellis/lib/metrics_impl.cc
index f3ebb4f5d39..2a65b40a3fa 100644
--- a/gr-trellis/lib/metrics_impl.cc
+++ b/gr-trellis/lib/metrics_impl.cc
@@ -28,8 +28,8 @@
 #include "metrics_impl.h"
 #include <gnuradio/io_signature.h>
 #include <assert.h>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/pccc_decoder_blk_impl.cc b/gr-trellis/lib/pccc_decoder_blk_impl.cc
index d6c817685d6..6d3f48b7983 100644
--- a/gr-trellis/lib/pccc_decoder_blk_impl.cc
+++ b/gr-trellis/lib/pccc_decoder_blk_impl.cc
@@ -27,8 +27,8 @@
 
 #include "pccc_decoder_blk_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
index b8a93d91182..c9d44325223 100644
--- a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
+++ b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
@@ -26,8 +26,8 @@
 
 #include "pccc_decoder_combined_blk_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc
index c0e732e1c3f..459311c49ad 100644
--- a/gr-trellis/lib/permutation_impl.cc
+++ b/gr-trellis/lib/permutation_impl.cc
@@ -26,8 +26,8 @@
 
 #include "permutation_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <string.h>
+#include <iostream>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/sccc_decoder_blk_impl.cc b/gr-trellis/lib/sccc_decoder_blk_impl.cc
index 206dc3f5da1..76e27b286b4 100644
--- a/gr-trellis/lib/sccc_decoder_blk_impl.cc
+++ b/gr-trellis/lib/sccc_decoder_blk_impl.cc
@@ -27,8 +27,8 @@
 
 #include "sccc_decoder_blk_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
index 6f251892463..eca74491f59 100644
--- a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
+++ b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
@@ -26,8 +26,8 @@
 
 #include "sccc_decoder_combined_blk_impl.h"
 #include <gnuradio/io_signature.h>
-#include <iostream>
 #include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc
index d6decbbafdb..cd3ef2edd6d 100644
--- a/gr-trellis/lib/siso_combined_f_impl.cc
+++ b/gr-trellis/lib/siso_combined_f_impl.cc
@@ -26,9 +26,9 @@
 
 #include "siso_combined_f_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <assert.h>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace trellis {
@@ -252,7 +252,7 @@ int siso_combined_f_impl::general_work(int noutput_items,
                                     &(in1[n * d_K * d_FSM.I()]),
                                     &(in2[n * d_K * d_D]),
                                     &(out[n * d_K * multiple]) //,
-                                    // d_alpha,d_beta
+                                                               // d_alpha,d_beta
             );
         }
     }
diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc
index c4052fc28e1..152d82b5a2f 100644
--- a/gr-trellis/lib/siso_f_impl.cc
+++ b/gr-trellis/lib/siso_f_impl.cc
@@ -26,9 +26,9 @@
 
 #include "siso_f_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <assert.h>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace trellis {
@@ -207,7 +207,7 @@ int siso_f_impl::general_work(int noutput_items,
                            &(in1[n * d_K * d_FSM.I()]),
                            &(in2[n * d_K * d_FSM.O()]),
                            &(out[n * d_K * multiple]) //,
-                           // d_alpha,d_beta
+                                                      // d_alpha,d_beta
             );
         }
     }
diff --git a/gr-trellis/lib/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h
index 92ac211bcf4..4538e372dd9 100644
--- a/gr-trellis/lib/siso_f_impl.h
+++ b/gr-trellis/lib/siso_f_impl.h
@@ -24,10 +24,10 @@
 #define INCLUDED_TRELLIS_SISO_F_IMPL_H
 
 #include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
-#include <gnuradio/trellis/siso_type.h>
 #include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/trellis/fsm.h>
 #include <gnuradio/trellis/siso_f.h>
+#include <gnuradio/trellis/siso_type.h>
 
 namespace gr {
 namespace trellis {
diff --git a/gr-uhd/examples/c++/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h
index 8919a2d6b5c..ece180ae0cb 100644
--- a/gr-uhd/examples/c++/tag_sink_demo.h
+++ b/gr-uhd/examples/c++/tag_sink_demo.h
@@ -19,12 +19,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/sync_block.h>
 #include <gnuradio/io_signature.h>
+#include <gnuradio/sync_block.h>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
-#include <iostream>
 #include <complex>
+#include <iostream>
 
 class tag_sink_demo : public gr::sync_block
 {
diff --git a/gr-uhd/examples/c++/tag_source_demo.h b/gr-uhd/examples/c++/tag_source_demo.h
index e176da828d0..9211bf5f042 100644
--- a/gr-uhd/examples/c++/tag_source_demo.h
+++ b/gr-uhd/examples/c++/tag_source_demo.h
@@ -19,12 +19,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/sync_block.h>
 #include <gnuradio/io_signature.h>
+#include <gnuradio/sync_block.h>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
-#include <iostream>
 #include <complex>
+#include <iostream>
 
 class tag_source_demo : public gr::sync_block
 {
@@ -116,8 +116,8 @@ class tag_source_demo : public gr::sync_block
                 this->make_length_tag(this->nitems_written(0), _samps_left_in_burst);
 #else
                 // Test usrp_sink's ability to cancel remainder of burst if new length_tag
-                // is found early sets burst time to 10% greater than the cycle duration to
-                // guarantee early length_tag In a real implementation the user should
+                // is found early sets burst time to 10% greater than the cycle duration
+                // to guarantee early length_tag In a real implementation the user should
                 // guard against this so that the number of samples promised by the
                 // length_tag are actually processed by the usrp_sink.
                 this->make_length_tag(this->nitems_written(0),
diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc
index e6da6a26004..f44915c0c0a 100644
--- a/gr-uhd/examples/c++/tags_demo.cc
+++ b/gr-uhd/examples/c++/tags_demo.cc
@@ -19,15 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "tag_source_demo.h"
 #include "tag_sink_demo.h"
+#include "tag_source_demo.h"
 #include <gnuradio/top_block.h>
-#include <gnuradio/uhd/usrp_source.h>
 #include <gnuradio/uhd/usrp_sink.h>
+#include <gnuradio/uhd/usrp_source.h>
 #include <uhd/utils/safe_main.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/thread/thread.hpp> //sleep
 #include <boost/program_options.hpp>
+#include <boost/thread/thread.hpp> //sleep
 #include <csignal>
 #include <iostream>
 
diff --git a/gr-uhd/include/gnuradio/uhd/amsg_source.h b/gr-uhd/include/gnuradio/uhd/amsg_source.h
index 3f16bde59ad..4a1f5ee0b25 100644
--- a/gr-uhd/include/gnuradio/uhd/amsg_source.h
+++ b/gr-uhd/include/gnuradio/uhd/amsg_source.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_UHD_AMSG_SOURCE_H
 #define INCLUDED_GR_UHD_AMSG_SOURCE_H
 
-#include <uhd/usrp/multi_usrp.hpp>
-#include <gnuradio/uhd/api.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/uhd/api.h>
+#include <uhd/usrp/multi_usrp.hpp>
 
 namespace gr {
 namespace uhd {
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_block.h b/gr-uhd/include/gnuradio/uhd/usrp_block.h
index be0cb334558..1f26c22d94f 100644
--- a/gr-uhd/include/gnuradio/uhd/usrp_block.h
+++ b/gr-uhd/include/gnuradio/uhd/usrp_block.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UHD_USRP_BLOCK_H
 #define INCLUDED_GR_UHD_USRP_BLOCK_H
 
-#include <gnuradio/uhd/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/uhd/api.h>
 #include <uhd/usrp/multi_usrp.hpp>
 
 namespace gr {
diff --git a/gr-uhd/lib/amsg_source_impl.h b/gr-uhd/lib/amsg_source_impl.h
index 58e2ff5805c..6d8b8a9df02 100644
--- a/gr-uhd/lib/amsg_source_impl.h
+++ b/gr-uhd/lib/amsg_source_impl.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/uhd/amsg_source.h>
 #include <gnuradio/thread/thread.h>
+#include <gnuradio/uhd/amsg_source.h>
 
 namespace gr {
 namespace uhd {
diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h
index 74d49ccdcfd..41d3900382e 100644
--- a/gr-uhd/lib/usrp_block_impl.h
+++ b/gr-uhd/lib/usrp_block_impl.h
@@ -26,8 +26,8 @@
 #include <gnuradio/uhd/usrp_block.h>
 #include <pmt/pmt.h>
 #include <uhd/usrp/multi_usrp.hpp>
-#include <boost/dynamic_bitset.hpp>
 #include <boost/bind.hpp>
+#include <boost/dynamic_bitset.hpp>
 
 
 namespace gr {
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc
index eb0557bf559..ee007ea37ab 100644
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <climits>
-#include <stdexcept>
-#include "usrp_sink_impl.h"
 #include "gr_uhd_common.h"
+#include "usrp_sink_impl.h"
 #include <gnuradio/io_signature.h>
+#include <climits>
+#include <stdexcept>
 
 namespace gr {
 namespace uhd {
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
index ed139de2a20..a2ff0821bda 100644
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@ -20,13 +20,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "usrp_source_impl.h"
 #include "gr_uhd_common.h"
+#include "usrp_source_impl.h"
 #include <boost/format.hpp>
-#include <boost/thread/thread.hpp>
 #include <boost/make_shared.hpp>
-#include <stdexcept>
+#include <boost/thread/thread.hpp>
 #include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace uhd {
diff --git a/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h
index ccc38b0a649..d12fbdb8d1c 100644
--- a/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h
+++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_S_H
 #define INCLUDED_VIDEO_SDL_SINK_S_H
 
-#include <gnuradio/video_sdl/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/video_sdl/api.h>
 
 namespace gr {
 namespace video_sdl {
diff --git a/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h
index 878f464aeb1..bf72fd40603 100644
--- a/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h
+++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_UC_H
 #define INCLUDED_VIDEO_SDL_SINK_UC_H
 
-#include <gnuradio/video_sdl/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/video_sdl/api.h>
 
 namespace gr {
 namespace video_sdl {
diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc
index 00e66cee01c..9642582a179 100644
--- a/gr-video-sdl/lib/sink_s_impl.cc
+++ b/gr-video-sdl/lib/sink_s_impl.cc
@@ -26,14 +26,14 @@
 
 #include "sink_s_impl.h"
 #include <gnuradio/io_signature.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <iostream>
 #include <stdexcept>
-#include <string.h>
 
 
 namespace gr {
diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc
index b7682ed9c87..3556e865a11 100644
--- a/gr-video-sdl/lib/sink_uc_impl.cc
+++ b/gr-video-sdl/lib/sink_uc_impl.cc
@@ -26,14 +26,14 @@
 
 #include "sink_uc_impl.h"
 #include <gnuradio/io_signature.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <iostream>
 #include <stdexcept>
-#include <string.h>
 
 
 namespace gr {
diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
index b16088db0dd..78281f793f6 100644
--- a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ALAW_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
index 045cf49cbe8..06142696da0 100644
--- a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
index 38b6344fd6b..414ca458089 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 
+#include <gnuradio/sync_interpolator.h>
 #include <gnuradio/vocoder/api.h>
 #include <gnuradio/vocoder/codec2.h>
-#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
index b1b800c16af..a53371573a2 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 
+#include <gnuradio/sync_decimator.h>
 #include <gnuradio/vocoder/api.h>
 #include <gnuradio/vocoder/codec2.h>
-#include <gnuradio/sync_decimator.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
index 9b4e82296f5..ff96d36c117 100644
--- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H
 #define INCLUDED_VOCODER_CVSD_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_interpolator.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
index a558819f10f..663f4fda0d7 100644
--- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_decimator.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
index 49da8973fc1..f2cf95d3d6d 100644
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_VOCODER_FREEDV_RX_H
 #define INCLUDED_VOCODER_FREEDV_RX_H
 
+#include <gnuradio/block.h>
 #include <gnuradio/vocoder/api.h>
 #include <gnuradio/vocoder/freedv_api.h>
-#include <gnuradio/block.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
index 32f7296d01d..3c39d3495d5 100644
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_VOCODER_FREEDV_TX_H
 #define INCLUDED_VOCODER_FREEDV_TX_H
 
+#include <gnuradio/sync_block.h>
 #include <gnuradio/vocoder/api.h>
 #include <gnuradio/vocoder/freedv_api.h>
-#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
index 38feb4e9ac8..9b11e869674 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G721_DECODE_BS_H
 #define INCLUDED_VOCODER_G721_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
index 9a4a2f69b8a..45fb567a926 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H
 #define INCLUDED_VOCODER_G721_ENCODE_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
index b8b45caa40c..8a96e25bd74 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G723_24_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_24_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
index 8e3c1ae60da..109265f282e 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
index 6b89d8d5d85..22b25ac20e6 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G723_40_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_40_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
index ab3820559c5..8dbcdffa45e 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
index a4af270b6b7..6df21cac337 100644
--- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_interpolator.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
index ba5cfbd38af..e7180d62faf 100644
--- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_decimator.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
index 37510452ced..74899c01b17 100644
--- a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ULAW_DECODE_BS_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
index 635192f674e..02dbb0ad27b 100644
--- a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 
-#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/vocoder/api.h>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc
index e0140f06b8a..22d8e14ffef 100644
--- a/gr-vocoder/lib/codec2_decode_ps_impl.cc
+++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc
@@ -31,8 +31,8 @@ extern "C" {
 #include "codec2_decode_ps_impl.h"
 
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <assert.h>
+#include <stdexcept>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.cc b/gr-vocoder/lib/codec2_encode_sp_impl.cc
index 6e69b69c2e9..ce8a59f6001 100644
--- a/gr-vocoder/lib/codec2_encode_sp_impl.cc
+++ b/gr-vocoder/lib/codec2_encode_sp_impl.cc
@@ -31,9 +31,9 @@ extern "C" {
 #include "codec2_encode_sp_impl.h"
 
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <stdexcept>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-vocoder/lib/freedv_rx_ss_impl.cc b/gr-vocoder/lib/freedv_rx_ss_impl.cc
index af7c45878df..f6d0b10cf7e 100644
--- a/gr-vocoder/lib/freedv_rx_ss_impl.cc
+++ b/gr-vocoder/lib/freedv_rx_ss_impl.cc
@@ -27,8 +27,8 @@
 #include "freedv_rx_ss_impl.h"
 
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <assert.h>
+#include <stdexcept>
 
 extern "C" {
 void put_next_rx_char(void* callback_state, char c)
diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.cc b/gr-vocoder/lib/freedv_tx_ss_impl.cc
index 4ef5302d103..784a3268649 100644
--- a/gr-vocoder/lib/freedv_tx_ss_impl.cc
+++ b/gr-vocoder/lib/freedv_tx_ss_impl.cc
@@ -27,9 +27,9 @@
 #include "freedv_tx_ss_impl.h"
 
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <stdexcept>
 
 extern "C" {
 char get_next_tx_char(void* callback_state)
diff --git a/gr-vocoder/lib/g7xx/decode.c b/gr-vocoder/lib/g7xx/decode.c
index b2ce68ffdde..bd6d98edebc 100644
--- a/gr-vocoder/lib/g7xx/decode.c
+++ b/gr-vocoder/lib/g7xx/decode.c
@@ -5,8 +5,8 @@
  *
  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
  */
-#include <stdio.h>
 #include "g72x.h"
+#include <stdio.h>
 
 
 /*
diff --git a/gr-vocoder/lib/g7xx/encode.c b/gr-vocoder/lib/g7xx/encode.c
index 257b829aa50..5b4e144a2c8 100644
--- a/gr-vocoder/lib/g7xx/encode.c
+++ b/gr-vocoder/lib/g7xx/encode.c
@@ -5,8 +5,8 @@
  *
  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
  */
-#include <stdio.h>
 #include "g72x.h"
+#include <stdio.h>
 
 
 /*
diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
index 27841bf34ca..33121ce1f2c 100644
--- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
+++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
@@ -27,8 +27,8 @@
 #define GSM_SAMPLES_PER_FRAME 160
 #include "gsm_fr_decode_ps_impl.h"
 #include <gnuradio/io_signature.h>
-#include <stdexcept>
 #include <assert.h>
+#include <stdexcept>
 
 namespace gr {
 namespace vocoder {
diff --git a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
index ea7cbea91b8..a0bd046426b 100644
--- a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_WAVELET_SQUASH_FF_H
 #define INCLUDED_WAVELET_SQUASH_FF_H
 
-#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/wavelet/api.h>
 
 namespace gr {
 namespace wavelet {
diff --git a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
index 7220613956e..a6661b10d51 100644
--- a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_WAVELET_WAVELET_FF_H
 #define INCLUDED_WAVELET_WAVELET_FF_H
 
-#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/wavelet/api.h>
 
 namespace gr {
 namespace wavelet {
diff --git a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
index 68ec05fa918..7244f785215 100644
--- a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_WAVELET_WVPS_FF_H
 #define INCLUDED_WAVELET_WVPS_FF_H
 
-#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_decimator.h>
+#include <gnuradio/wavelet/api.h>
 
 class wavelet_wvps_ff;
 
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc
index 266bb0833da..c247225c3ee 100644
--- a/gr-wavelet/lib/squash_ff_impl.cc
+++ b/gr-wavelet/lib/squash_ff_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "squash_ff_impl.h"
-#include <stdexcept>
 #include <gnuradio/io_signature.h>
+#include <stdexcept>
 
 // expect input vector of igrid.size y-values,
 // produce output vector of ogrid.size y-values
diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc
index b78bef1caac..ff1410f2817 100644
--- a/gr-wavelet/lib/wavelet_ff_impl.cc
+++ b/gr-wavelet/lib/wavelet_ff_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "wavelet_ff_impl.h"
-#include <stdexcept>
 #include <gnuradio/io_signature.h>
+#include <stdexcept>
 
 #include <stdio.h>
 
diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h
index 9a233f2aa88..768079d8c15 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PUB_MSG_SINK_H
 #define INCLUDED_ZEROMQ_PUB_MSG_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
index 9427b3a7392..5e4c36c7408 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PUB_SINK_H
 #define INCLUDED_ZEROMQ_PUB_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h
index 341cb213db9..8d9c1eb5ded 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PULL_MSG_SOURCE_H
 #define INCLUDED_ZEROMQ_PULL_MSG_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_source.h
index 6060a34596d..d8ee028ae87 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pull_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pull_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PULL_SOURCE_H
 #define INCLUDED_ZEROMQ_PULL_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h
index 0810d990736..db3cc61752c 100644
--- a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PUSH_MSG_SINK_H
 #define INCLUDED_ZEROMQ_PUSH_MSG_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/push_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
index 8d75b6b2114..cc0e3b4aca6 100644
--- a/gr-zeromq/include/gnuradio/zeromq/push_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PUSH_SINK_H
 #define INCLUDED_ZEROMQ_PUSH_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h
index 8f43aa57985..602dc83ffd9 100644
--- a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REP_MSG_SINK_H
 #define INCLUDED_ZEROMQ_REP_MSG_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
index 49e1e9dcf2e..1224129e1ef 100644
--- a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REP_SINK_H
 #define INCLUDED_ZEROMQ_REP_SINK_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h
index ca03e217565..7f4f5c1f10d 100644
--- a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REQ_MSG_SOURCE_H
 #define INCLUDED_ZEROMQ_REQ_MSG_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/req_source.h b/gr-zeromq/include/gnuradio/zeromq/req_source.h
index 0cec5268da8..a6aa905483e 100644
--- a/gr-zeromq/include/gnuradio/zeromq/req_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/req_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REQ_SOURCE_H
 #define INCLUDED_ZEROMQ_REQ_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h
index 98cf08aa601..9f508575586 100644
--- a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_SUB_MSG_SOURCE_H
 #define INCLUDED_ZEROMQ_SUB_MSG_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/include/gnuradio/zeromq/sub_source.h b/gr-zeromq/include/gnuradio/zeromq/sub_source.h
index b916f8c56ba..dc0014edbd8 100644
--- a/gr-zeromq/include/gnuradio/zeromq/sub_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/sub_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_SUB_SOURCE_H
 #define INCLUDED_ZEROMQ_SUB_SOURCE_H
 
-#include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/zeromq/api.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc
index b3a107c815e..1e3b68321ca 100644
--- a/gr-zeromq/lib/base_impl.cc
+++ b/gr-zeromq/lib/base_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "base_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/base_impl.h b/gr-zeromq/lib/base_impl.h
index 3783a4e3755..62216cce487 100644
--- a/gr-zeromq/lib/base_impl.h
+++ b/gr-zeromq/lib/base_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_BASE_IMPL_H
 #define INCLUDED_ZEROMQ_BASE_IMPL_H
 
-#include <gnuradio/sync_block.h>
 #include "zmq_common_impl.h"
+#include <gnuradio/sync_block.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc
index 77ffc469cdc..0fb26ada737 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.cc
+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "pub_msg_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/pub_sink_impl.cc b/gr-zeromq/lib/pub_sink_impl.cc
index 209b9e7f8c8..6441e4b1709 100644
--- a/gr-zeromq/lib/pub_sink_impl.cc
+++ b/gr-zeromq/lib/pub_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "pub_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc b/gr-zeromq/lib/pull_msg_source_impl.cc
index 100c7be5a3f..270e2a3c3ad 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.cc
+++ b/gr-zeromq/lib/pull_msg_source_impl.cc
@@ -24,11 +24,11 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include <boost/thread/thread.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "pull_msg_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread.hpp>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/pull_msg_source_impl.h b/gr-zeromq/lib/pull_msg_source_impl.h
index 235d80f6557..293d98da74c 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.h
+++ b/gr-zeromq/lib/pull_msg_source_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_PULL_MSG_SOURCE_IMPL_H
 #define INCLUDED_ZEROMQ_PULL_MSG_SOURCE_IMPL_H
 
-#include <gnuradio/zeromq/pull_msg_source.h>
 #include "zmq_common_impl.h"
+#include <gnuradio/zeromq/pull_msg_source.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/pull_source_impl.cc b/gr-zeromq/lib/pull_source_impl.cc
index 58a875f363a..413930b801b 100644
--- a/gr-zeromq/lib/pull_source_impl.cc
+++ b/gr-zeromq/lib/pull_source_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "pull_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc
index 0052e092105..5239a22e783 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.cc
+++ b/gr-zeromq/lib/push_msg_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "push_msg_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index 431970eef5a..04d3d110d28 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "push_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc
index 7466f77474e..e1ac19e8098 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.cc
+++ b/gr-zeromq/lib/rep_msg_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "rep_msg_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.h b/gr-zeromq/lib/rep_msg_sink_impl.h
index cfd17ed9a30..3042c42939d 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.h
+++ b/gr-zeromq/lib/rep_msg_sink_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REP_MSG_SINK_IMPL_H
 #define INCLUDED_ZEROMQ_REP_MSG_SINK_IMPL_H
 
-#include <gnuradio/zeromq/rep_msg_sink.h>
 #include "zmq_common_impl.h"
+#include <gnuradio/zeromq/rep_msg_sink.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc
index c3b6d8c1920..8f22f151b89 100644
--- a/gr-zeromq/lib/rep_sink_impl.cc
+++ b/gr-zeromq/lib/rep_sink_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "rep_sink_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/rep_sink_impl.h b/gr-zeromq/lib/rep_sink_impl.h
index 2fcf9853c69..3cca61db0c7 100644
--- a/gr-zeromq/lib/rep_sink_impl.h
+++ b/gr-zeromq/lib/rep_sink_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REP_SINK_IMPL_H
 #define INCLUDED_ZEROMQ_REP_SINK_IMPL_H
 
-#include <gnuradio/zeromq/rep_sink.h>
 #include "base_impl.h"
+#include <gnuradio/zeromq/rep_sink.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/req_msg_source_impl.cc b/gr-zeromq/lib/req_msg_source_impl.cc
index 6d44aa3cf0a..882a48d6870 100644
--- a/gr-zeromq/lib/req_msg_source_impl.cc
+++ b/gr-zeromq/lib/req_msg_source_impl.cc
@@ -24,11 +24,11 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include <boost/thread/thread.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "req_msg_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread.hpp>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/req_msg_source_impl.h b/gr-zeromq/lib/req_msg_source_impl.h
index 9610229f5d8..82879603725 100644
--- a/gr-zeromq/lib/req_msg_source_impl.h
+++ b/gr-zeromq/lib/req_msg_source_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_REQ_MSG_SOURCE_IMPL_H
 #define INCLUDED_ZEROMQ_REQ_MSG_SOURCE_IMPL_H
 
-#include <gnuradio/zeromq/req_msg_source.h>
 #include "zmq_common_impl.h"
+#include <gnuradio/zeromq/req_msg_source.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc
index 5a498cf9d2f..c7e87b742a7 100644
--- a/gr-zeromq/lib/req_source_impl.cc
+++ b/gr-zeromq/lib/req_source_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "req_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc
index 3a9fb906daf..330c9327a88 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.cc
+++ b/gr-zeromq/lib/sub_msg_source_impl.cc
@@ -24,11 +24,11 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
-#include <boost/thread/thread.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "sub_msg_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread.hpp>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/sub_msg_source_impl.h b/gr-zeromq/lib/sub_msg_source_impl.h
index f83b6d46390..8d760c0ad00 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.h
+++ b/gr-zeromq/lib/sub_msg_source_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ZEROMQ_SUB_MSG_SOURCE_IMPL_H
 #define INCLUDED_ZEROMQ_SUB_MSG_SOURCE_IMPL_H
 
-#include <gnuradio/zeromq/sub_msg_source.h>
 #include "zmq_common_impl.h"
+#include <gnuradio/zeromq/sub_msg_source.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/sub_source_impl.cc b/gr-zeromq/lib/sub_source_impl.cc
index d55ca116f0a..fe087801324 100644
--- a/gr-zeromq/lib/sub_source_impl.cc
+++ b/gr-zeromq/lib/sub_source_impl.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "sub_source_impl.h"
 #include "tag_headers.h"
+#include <gnuradio/io_signature.h>
 
 namespace gr {
 namespace zeromq {
diff --git a/gr-zeromq/lib/tag_headers.cc b/gr-zeromq/lib/tag_headers.cc
index 3b59bebf770..34d2dd701d7 100644
--- a/gr-zeromq/lib/tag_headers.cc
+++ b/gr-zeromq/lib/tag_headers.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/block.h>
-#include <sstream>
-#include <cstring>
+#include <gnuradio/io_signature.h>
 #include <zmq.hpp>
+#include <cstring>
+#include <sstream>
 
 #define GR_HEADER_MAGIC 0x5FF0
 #define GR_HEADER_VERSION 0x01
diff --git a/gr-zeromq/lib/tag_headers.h b/gr-zeromq/lib/tag_headers.h
index a2d01297367..b946f009a48 100644
--- a/gr-zeromq/lib/tag_headers.h
+++ b/gr-zeromq/lib/tag_headers.h
@@ -23,11 +23,11 @@
 #ifndef ZEROMQ_TAG_HEADERS_H
 #define ZEROMQ_TAG_HEADERS_H
 
-#include <gnuradio/io_signature.h>
 #include <gnuradio/block.h>
-#include <sstream>
-#include <cstring>
+#include <gnuradio/io_signature.h>
 #include <zmq.hpp>
+#include <cstring>
+#include <sstream>
 
 namespace gr {
 namespace zeromq {
diff --git a/tools/clang_format.py b/tools/clang_format.py
index 888e76efc90..72ffca43137 100755
--- a/tools/clang_format.py
+++ b/tools/clang_format.py
@@ -186,7 +186,7 @@ def format(self, file_name):
 
         # Update the file with clang-format
         formatted = not subprocess.call(
-            [self.path, "--style=file", "-i", file_name , "-sort-includes=false"])
+            [self.path, "--style=file", "-i", file_name])
 
         # Version 3.8 generates files like foo.cpp~RF83372177.TMP when it formats foo.cpp
         # on Windows, we must clean these up