summaryrefslogtreecommitdiff
path: root/gr-blocks/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gr-blocks/lib')
-rw-r--r--gr-blocks/lib/annotator_1to1_impl.cc2
-rw-r--r--gr-blocks/lib/annotator_alltoall_impl.cc2
-rw-r--r--gr-blocks/lib/annotator_raw_impl.cc2
-rw-r--r--gr-blocks/lib/check_lfsr_32k_s_impl.cc2
-rw-r--r--gr-blocks/lib/complex_to_arg_impl.cc2
-rw-r--r--gr-blocks/lib/complex_to_magphase_impl.cc2
-rw-r--r--gr-blocks/lib/ctrlport_probe2_b_impl.h2
-rw-r--r--gr-blocks/lib/ctrlport_probe2_c_impl.h2
-rw-r--r--gr-blocks/lib/ctrlport_probe2_f_impl.h2
-rw-r--r--gr-blocks/lib/ctrlport_probe2_i_impl.h2
-rw-r--r--gr-blocks/lib/ctrlport_probe2_s_impl.h2
-rw-r--r--gr-blocks/lib/exponentiate_const_cci_impl.cc2
-rw-r--r--gr-blocks/lib/file_descriptor_sink_impl.cc8
-rw-r--r--gr-blocks/lib/file_descriptor_source_impl.cc8
-rw-r--r--gr-blocks/lib/file_meta_sink_impl.cc8
-rw-r--r--gr-blocks/lib/file_meta_source_impl.cc8
-rw-r--r--gr-blocks/lib/file_meta_source_impl.h2
-rw-r--r--gr-blocks/lib/file_sink_base.cc10
-rw-r--r--gr-blocks/lib/file_source_impl.cc10
-rw-r--r--gr-blocks/lib/float_to_int_impl.cc2
-rw-r--r--gr-blocks/lib/float_to_uchar_impl.cc2
-rw-r--r--gr-blocks/lib/interleaved_short_to_complex_impl.cc2
-rw-r--r--gr-blocks/lib/lfsr_32k_source_s_impl.h2
-rw-r--r--gr-blocks/lib/message_debug_impl.h2
-rw-r--r--gr-blocks/lib/message_strobe_impl.cc8
-rw-r--r--gr-blocks/lib/message_strobe_random_impl.cc8
-rw-r--r--gr-blocks/lib/message_strobe_random_impl.h4
-rw-r--r--gr-blocks/lib/moving_average_impl.h2
-rw-r--r--gr-blocks/lib/multiply_matrix_impl.cc2
-rw-r--r--gr-blocks/lib/pack_k_bits.cc2
-rw-r--r--gr-blocks/lib/pack_k_bits_bb_impl.cc2
-rw-r--r--gr-blocks/lib/pack_k_bits_bb_impl.h2
-rw-r--r--gr-blocks/lib/packed_to_unpacked_impl.h2
-rw-r--r--gr-blocks/lib/pdu_filter_impl.cc2
-rw-r--r--gr-blocks/lib/pdu_remove_impl.cc2
-rw-r--r--gr-blocks/lib/pdu_set_impl.cc2
-rw-r--r--gr-blocks/lib/plateau_detector_fb_impl.cc2
-rw-r--r--gr-blocks/lib/probe_signal_v_impl.h2
-rw-r--r--gr-blocks/lib/qa_block_tags.cc10
-rw-r--r--gr-blocks/lib/qa_gr_block.cc4
-rw-r--r--gr-blocks/lib/qa_gr_flowgraph.cc4
-rw-r--r--gr-blocks/lib/qa_gr_hier_block2_derived.cc10
-rw-r--r--gr-blocks/lib/qa_gr_top_block.cc4
-rw-r--r--gr-blocks/lib/qa_rotator.cc2
-rw-r--r--gr-blocks/lib/qa_set_msg_handler.cc8
-rw-r--r--gr-blocks/lib/random_pdu_impl.cc2
-rw-r--r--gr-blocks/lib/random_pdu_impl.h2
-rw-r--r--gr-blocks/lib/repack_bits_bb_impl.cc2
-rw-r--r--gr-blocks/lib/rotator_cc_impl.h2
-rw-r--r--gr-blocks/lib/socket_pdu_impl.cc2
-rw-r--r--gr-blocks/lib/socket_pdu_impl.h2
-rw-r--r--gr-blocks/lib/stream_pdu_base.cc4
-rw-r--r--gr-blocks/lib/stream_pdu_base.h2
-rw-r--r--gr-blocks/lib/stream_to_tagged_stream_impl.cc4
-rw-r--r--gr-blocks/lib/tag_debug_impl.cc2
-rw-r--r--gr-blocks/lib/tag_gate_impl.cc2
-rw-r--r--gr-blocks/lib/tag_share_impl.cc2
-rw-r--r--gr-blocks/lib/tagged_file_sink_impl.cc6
-rw-r--r--gr-blocks/lib/tagged_stream_align_impl.cc2
-rw-r--r--gr-blocks/lib/tagged_stream_align_impl.h2
-rw-r--r--gr-blocks/lib/tagged_stream_multiply_length_impl.cc2
-rw-r--r--gr-blocks/lib/tagged_stream_multiply_length_impl.h2
-rw-r--r--gr-blocks/lib/tagged_stream_mux_impl.cc2
-rw-r--r--gr-blocks/lib/tagged_stream_mux_impl.h2
-rw-r--r--gr-blocks/lib/tags_strobe_impl.cc8
-rw-r--r--gr-blocks/lib/tcp_connection.h2
-rw-r--r--gr-blocks/lib/tcp_server_sink_impl.cc8
-rw-r--r--gr-blocks/lib/tcp_server_sink_impl.h2
-rw-r--r--gr-blocks/lib/test_tag_variable_rate_ff_impl.cc4
-rw-r--r--gr-blocks/lib/throttle_impl.cc2
-rw-r--r--gr-blocks/lib/transcendental_impl.cc4
-rw-r--r--gr-blocks/lib/tuntap_pdu_impl.cc8
-rw-r--r--gr-blocks/lib/tuntap_pdu_impl.h2
-rw-r--r--gr-blocks/lib/uchar_to_float_impl.cc2
-rw-r--r--gr-blocks/lib/udp_sink_impl.cc6
-rw-r--r--gr-blocks/lib/udp_source_impl.cc2
-rw-r--r--gr-blocks/lib/udp_source_impl.h2
-rw-r--r--gr-blocks/lib/unpack_k_bits.cc2
-rw-r--r--gr-blocks/lib/unpack_k_bits_bb_impl.cc2
-rw-r--r--gr-blocks/lib/unpack_k_bits_bb_impl.h2
-rw-r--r--gr-blocks/lib/vector_insert_impl.cc6
-rw-r--r--gr-blocks/lib/vector_source_impl.cc2
-rw-r--r--gr-blocks/lib/wavfile.cc2
-rw-r--r--gr-blocks/lib/wavfile_sink_impl.cc10
-rw-r--r--gr-blocks/lib/wavfile_source_impl.cc4
85 files changed, 150 insertions, 150 deletions
diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc
index 1b099cde74..7b8693f45d 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 8eeb7625e0..7bb5723450 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 4ca6f3fde5..4d2239bef7 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 a3826d5a6e..8cdc92abea 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 8f5bf61c81..74ae3e224b 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 dd72c8e9c8..b44f564876 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 8a5f7952c8..e6c62387c4 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 63d7629e26..ab4afed637 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 81c79e4d36..ea01205945 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 ed59801160..7747ee4129 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 6b3677a4f3..e7806458f8 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 cd9a287ae5..ec97ef2ee3 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 cb16129bcc..1d24bd441d 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 de47bb85a3..4ecdf5345c 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 342ee4573c..ed75f135c9 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 fcf8228de5..b395d5d8c7 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 242edce56a..fd0fbc58e3 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 2b10ba93e5..290e56731e 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 b025f449af..ee8f08d980 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 4c8ae689d8..5e0584ec4b 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 ad75df9eff..80a828346b 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 ada88cd34a..b83d311a03 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 7705c9f02f..6a7dcd7cd1 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 2faa42a0d0..68bf6fa02a 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 cf06448ecb..038eeae5a1 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 0a36b6d380..0ab5d6adc7 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 de70c28419..77eaa005e5 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 bb29e26d23..c2ca07ed81 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 eb0a77409d..b9c7ed1dce 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 8ff5f638ff..cd3c0fa6bb 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 06c422b923..04fbd236d9 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 6459a1e811..6c9d0a0f1e 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 1ef8b17c48..8d56be3f17 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 10423ae05d..b0748eec02 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 09c73c5875..19cc4dc76a 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 6ef46f370f..40fbc3cd83 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 6f75702c84..6fb0b5ff70 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 17d8e348db..ae5c0f9257 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 2c45551e37..847ca6cad4 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 b40a63cd2a..ad23437446 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 524c43755e..c6d1ca1c6d 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 9b22568a4c..eb63ec6aa1 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 04e4379e97..2ef00f31e5 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 7a1426b4b9..db118302fe 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 368643bfa7..4f3e337260 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 08078cc75b..75d825aefa 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 ecb8ec770d..6745dcde0b 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 240cac4a1f..eff58a8a5e 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 415b49cd49..fd3dcef6a4 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 b3a96d350a..df69f07ad2 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 c05ef7bbc9..53a78df736 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 1cbcb0485c..3d5dd0a0a0 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 cc3394d6f0..00622eed16 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 2873e98042..31d7a51e61 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 450e5f87fe..f4faff8e7c 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 08390beca2..1ced79a7a8 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 f8a1129704..5e66dc8875 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 83b0432253..b4e6f2e7cf 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 c2050e1556..6c091da984 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 8b203115c2..77a642b196 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 96d77401ae..30f4c46dc6 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 f54c71b3c7..3a8680b1e9 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 1742340d89..610a1c1267 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 03804a6253..ec6fa8dc01 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 51391fb082..e9eac26c12 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 4c5a67c54b..4581abe413 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 dd6a9d2e44..8e6d30e1e3 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 6c4b0f938f..a1d19efc4c 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 5a825710e6..580bf0d19f 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 d5614c5676..c18d44522f 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 a29a1e75da..1c53ec1b6d 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 fa16683510..4343ae1dc3 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 31afc445e7..fcd9523dc5 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 ec666da349..879177310b 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 cb44ba0b6f..885503d0f1 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 c948410c02..a668086565 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 a1f0b3b06d..8ae337b50d 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 0865121d02..ee5333bbd9 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 49849e9285..c5824cf2d2 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 b677de81e1..0edbd18614 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 8f13dfa421..71e1b6df83 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 b7f9409631..b9709496fb 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 72cec7d8bc..9b7e9b7ecf 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 8ce5d94b96..43bf1869bf 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 b1950f2deb..a8f173634e 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