clang-format: Ordering all the includes

clang-format: ordering includes in gnuradio-runtime clang-format: ordering includes in gr-filter clang-format: ordering includes in gr-fft clang-format: ordering includes in gr-audio clang-format: ordering includes in gr-analog clang-format: ordering includes in gr-fec clang-format: ordering includes in gr-wavelet clang-format: ordering includes in gr-zeromq clang-format: ordering includes in gr-vocoder clang-format: ordering includes in gr-video-sdl clang-format: ordering includes in gr-trellis clang-format: ordering includes in gr-blocks clang-format: ordering includes in gr-digital clang-format: ordering includes in gr-uhd clang-format: ordering includes in gr-dtv clang-format: ordering includes in gr-channels clang-format: ordering includes in gr-qtgui clang_format.py: re-enable include reordering
author: Marcus Müller <mmueller@gnuradio.org> 2019-08-07 22:21:18 +0200
committer: Marcus Müller <marcus@hostalia.de> 2019-08-09 23:04:28 +0200
commit: d24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch)
tree: a18051dccba5266904571dce8a93128ad62e8453 /gr-dtv
parent: 65599ad299f030d302386fcda9bc0e3175d9a828 (diff)
103 files changed, 113 insertions, 113 deletions
diff --git a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
index cc605cb99c..1c2d0ac80c 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 2ea3432b05..d68c8d04d2 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 7cfc882765..8434064856 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 946075ac1c..ca8d74e1ed 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 3229d87553..e99eae441c 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 d5f8bb5ff3..f34f3259e3 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 3c324340eb..46ca23f056 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 ab76b05ab2..78302062cb 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 3daafaf627..d19a736f94 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 702d9c2580..e5b54512b3 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 af7731fa65..14ac91687b 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 1c6f6b4e56..0abae2b308 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 bf872de486..bfd411e620 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 0a4827a734..3a57e9fd4d 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 78911d1c90..4730419961 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 6c04510826..68f214c41c 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 b45c6dedf2..9e8926da58 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 6fd40f5579..b79fdb14c4 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 7b3a517c75..2f060c4fa8 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 3f06a9d2a3..5b4809f9c2 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 15d7b7e2b2..65c25cff96 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 e6763bee97..bffbac7414 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 1ed450f0ac..3e1eaf40f0 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 2f97bbbc06..85050c30d1 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 051410fb79..9615a2f1a2 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 6c03048542..401ffe42ed 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 0132517524..cda09f3ff7 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 55578a3297..608669559c 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 8341ec00a3..f438b07f91 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 4bb12b1f57..f9e4d0c244 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 64bcd8b177..92c28adb7b 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 a2fe0f6fa3..6df0d2dccf 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 0a8c419a30..f97f7bf21c 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 b9202e4f22..f52d66881a 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 b649f2f9d3..35f0bde630 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 f93f0895f3..fee2033e5b 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 6dba4f180f..a40740c1aa 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 86e1171a09..70bf046078 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 4d058718f6..e173d4ba99 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 9e3083e104..8399252fa2 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 1cc5bbd127..a832866aa8 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 6297650227..29907404e2 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 544f6a4ba6..2f8325277b 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 884b6a4ccc..782c3b227e 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 471bf2d8ee..fe914fa60d 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 f77bb80f9d..2cf2c0201e 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 6c90c1a99e..c225151d6a 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 926a9789e4..92bdd9b31a 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 04a0c7c5a2..6b7100d915 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 a6eb3ecd73..0912a13dce 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 544c554fc4..654be77c5d 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 1f474b7305..d8e2a1235d 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 914d7b1ff3..31de4416f4 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 f1202d29e6..c27ef1c451 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 a30c5663d1..43802b8399 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 f5420ef259..07b15efa1f 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 b19d2da018..8b12d71ec2 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 7d83efc426..4e608d361f 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 3d36ca1274..3dfd81ba83 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 da05f8089b..4f850dc2a1 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 76ee79f2a2..2eebb51898 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 5c718ffb02..5a4bb56d5f 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 d16c41e379..51e91a152f 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 fade8ff903..26c9834805 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 4c2a9ecac9..b2ccde0df7 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 7483449980..cdba98557e 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 9486c66e4f..ae47278c96 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 d6632a7406..dd40f816e9 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 dbcb5cbfde..2b8e71e027 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 05f9ee4a4b..e056ef9596 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 b5687bd934..af01a2c909 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 6dbf255202..31cde2005b 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 c82af1356c..fb4c8f7afe 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 b6d6d4203b..cf92c7f8d3 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 7f47961267..d3cda70772 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 0c22744de3..4e373ff1b8 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 69127cb271..e13af277f4 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 f5094bc321..dcbfe941fb 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 77e6aa08ca..847d9c8466 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 ec65eb7fc1..733cc68907 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 54acac43be..7a494e3b8f 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 e80d87fa21..c772730ce5 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 42d0b952bd..074f76c2af 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 3cebb46078..d79e0691cf 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 1b2129b1f2..970519cdf3 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 7da206d3bc..25b9d73dab 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 2a8ee5af31..4d7aeb0307 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 7974dec626..2fba6db22b 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 fc2d7de33b..7f9dac6515 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 f6d59ba2c1..a6d9267aff 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 8bf8794ec3..3d6f039b0f 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 9b4e92b309..f7eedcd4d7 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 0ab7193a26..e5c784b805 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 99d8d634f2..062661bfed 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 8ccc68167b..f223eda4c7 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 e2acf1180e..a2e12b3d2a 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 607e5bda8f..81b667a08f 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 1e04e6c078..dbc81474f6 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 a567ec7929..3f1ceabe26 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 aee8793720..2ebd67c07c 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 74f49d30ae..971fbb3bda 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 626fba2815..44bc698d60 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 9fda59a468..5d2788020d 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>
author	Marcus Müller <mmueller@gnuradio.org>	2019-08-07 22:21:18 +0200
committer	Marcus Müller <marcus@hostalia.de>	2019-08-09 23:04:28 +0200
commit	d24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch)
tree	a18051dccba5266904571dce8a93128ad62e8453 /gr-dtv
parent	65599ad299f030d302386fcda9bc0e3175d9a828 (diff)