summaryrefslogtreecommitdiff
path: root/gr-fec
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-07 22:21:18 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-09 23:04:28 +0200
commitd24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch)
treea18051dccba5266904571dce8a93128ad62e8453 /gr-fec
parent65599ad299f030d302386fcda9bc0e3175d9a828 (diff)
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
Diffstat (limited to 'gr-fec')
-rw-r--r--gr-fec/include/gnuradio/fec/alist.h6
-rw-r--r--gr-fec/include/gnuradio/fec/async_decoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/async_encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/awgn_bp.h8
-rw-r--r--gr-fec/include/gnuradio/fec/ber_bf.h2
-rw-r--r--gr-fec/include/gnuradio/fec/cc_decoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/cc_encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/ccsds_encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/cldpc.h4
-rw-r--r--gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h2
-rw-r--r--gr-fec/include/gnuradio/fec/decoder.h6
-rw-r--r--gr-fec/include/gnuradio/fec/depuncture_bb.h2
-rw-r--r--gr-fec/include/gnuradio/fec/encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/fec_mtrx.h2
-rw-r--r--gr-fec/include/gnuradio/fec/generic_decoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/generic_encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/gf2mat.h4
-rw-r--r--gr-fec/include/gnuradio/fec/ldpc_G_matrix.h2
-rw-r--r--gr-fec/include/gnuradio/fec/ldpc_H_matrix.h2
-rw-r--r--gr-fec/include/gnuradio/fec/ldpc_decoder.h4
-rw-r--r--gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/puncture_bb.h2
-rw-r--r--gr-fec/include/gnuradio/fec/puncture_ff.h2
-rw-r--r--gr-fec/include/gnuradio/fec/tagged_decoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/tpc_decoder.h2
-rw-r--r--gr-fec/include/gnuradio/fec/tpc_encoder.h4
-rw-r--r--gr-fec/lib/async_decoder_impl.cc2
-rw-r--r--gr-fec/lib/async_decoder_impl.h2
-rw-r--r--gr-fec/lib/async_encoder_impl.cc2
-rw-r--r--gr-fec/lib/async_encoder_impl.h4
-rw-r--r--gr-fec/lib/ber_bf_impl.cc2
-rw-r--r--gr-fec/lib/cc_decoder_impl.cc4
-rw-r--r--gr-fec/lib/cc_decoder_impl.h2
-rw-r--r--gr-fec/lib/cc_encoder_impl.cc10
-rw-r--r--gr-fec/lib/cc_encoder_impl.h2
-rw-r--r--gr-fec/lib/ccsds_encoder_impl.h2
-rw-r--r--gr-fec/lib/depuncture_bb_impl.cc4
-rw-r--r--gr-fec/lib/dummy_decoder_impl.cc4
-rw-r--r--gr-fec/lib/dummy_decoder_impl.h2
-rw-r--r--gr-fec/lib/dummy_encoder_impl.h2
-rw-r--r--gr-fec/lib/fec_mtrx_impl.cc4
-rw-r--r--gr-fec/lib/fec_mtrx_impl.h8
-rw-r--r--gr-fec/lib/ldpc_G_matrix_impl.cc4
-rw-r--r--gr-fec/lib/ldpc_G_matrix_impl.h6
-rw-r--r--gr-fec/lib/ldpc_H_matrix_impl.cc4
-rw-r--r--gr-fec/lib/ldpc_bit_flip_decoder_impl.cc4
-rw-r--r--gr-fec/lib/ldpc_decoder.cc12
-rw-r--r--gr-fec/lib/ldpc_encoder_impl.cc8
-rw-r--r--gr-fec/lib/ldpc_encoder_impl.h4
-rw-r--r--gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h4
-rw-r--r--gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc8
-rw-r--r--gr-fec/lib/polar_common.cc4
-rw-r--r--gr-fec/lib/polar_decoder_common.cc2
-rw-r--r--gr-fec/lib/polar_decoder_sc.cc2
-rw-r--r--gr-fec/lib/polar_decoder_sc_list.cc4
-rw-r--r--gr-fec/lib/polar_decoder_sc_systematic.cc2
-rw-r--r--gr-fec/lib/polar_encoder.cc4
-rw-r--r--gr-fec/lib/polar_encoder_systematic.cc2
-rw-r--r--gr-fec/lib/puncture_bb_impl.cc4
-rw-r--r--gr-fec/lib/puncture_ff_impl.cc4
-rw-r--r--gr-fec/lib/reed-solomon/decode_rs.c2
-rw-r--r--gr-fec/lib/reed-solomon/decode_rs_ccsds.c2
-rw-r--r--gr-fec/lib/reed-solomon/encode_rs_ccsds.c2
-rw-r--r--gr-fec/lib/reed-solomon/exercise.c2
-rw-r--r--gr-fec/lib/reed-solomon/gen_ccsds.c2
-rw-r--r--gr-fec/lib/reed-solomon/rstest.c2
-rw-r--r--gr-fec/lib/repetition_decoder_impl.cc4
-rw-r--r--gr-fec/lib/repetition_decoder_impl.h4
-rw-r--r--gr-fec/lib/repetition_encoder_impl.h2
-rw-r--r--gr-fec/lib/scl_list.cc4
-rw-r--r--gr-fec/lib/tpc_decoder.cc6
-rw-r--r--gr-fec/lib/tpc_encoder.cc10
-rw-r--r--gr-fec/lib/viterbi/decode.cc2
-rw-r--r--gr-fec/lib/viterbi/metrics.cc2
74 files changed, 129 insertions, 129 deletions
diff --git a/gr-fec/include/gnuradio/fec/alist.h b/gr-fec/include/gnuradio/fec/alist.h
index 5e4ed54e94..7a0d65c08b 100644
--- a/gr-fec/include/gnuradio/fec/alist.h
+++ b/gr-fec/include/gnuradio/fec/alist.h
@@ -34,12 +34,12 @@
#ifndef ALIST_H
#define ALIST_H
-#include <iostream>
+#include <gnuradio/fec/api.h>
+#include <stdlib.h>
#include <fstream>
+#include <iostream>
#include <sstream>
#include <vector>
-#include <stdlib.h>
-#include <gnuradio/fec/api.h>
class FEC_API alist
{
diff --git a/gr-fec/include/gnuradio/fec/async_decoder.h b/gr-fec/include/gnuradio/fec/async_decoder.h
index fa14641e01..dd4c660ff9 100644
--- a/gr-fec/include/gnuradio/fec/async_decoder.h
+++ b/gr-fec/include/gnuradio/fec/async_decoder.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_ASYNC_DECODER_H
#define INCLUDED_FEC_ASYNC_DECODER_H
+#include <gnuradio/block.h>
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/generic_decoder.h>
-#include <gnuradio/block.h>
#include <boost/shared_ptr.hpp>
namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/async_encoder.h b/gr-fec/include/gnuradio/fec/async_encoder.h
index ed320addee..8e143ea742 100644
--- a/gr-fec/include/gnuradio/fec/async_encoder.h
+++ b/gr-fec/include/gnuradio/fec/async_encoder.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_ASYNC_ENCODER_H
#define INCLUDED_FEC_ASYNC_ENCODER_H
+#include <gnuradio/block.h>
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/block.h>
#include <boost/shared_ptr.hpp>
namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/awgn_bp.h b/gr-fec/include/gnuradio/fec/awgn_bp.h
index bbe9ba889c..a7e0ff1959 100644
--- a/gr-fec/include/gnuradio/fec/awgn_bp.h
+++ b/gr-fec/include/gnuradio/fec/awgn_bp.h
@@ -36,12 +36,12 @@
#ifndef AWGN_BP_H
#define AWGN_BP_H
-#include <vector>
-#include <cmath>
-#include <iostream>
-#include "gf2mat.h"
#include "alist.h"
+#include "gf2mat.h"
#include <gnuradio/fec/api.h>
+#include <cmath>
+#include <iostream>
+#include <vector>
class FEC_API awgn_bp
{
diff --git a/gr-fec/include/gnuradio/fec/ber_bf.h b/gr-fec/include/gnuradio/fec/ber_bf.h
index a8e78c0fc5..381d976e29 100644
--- a/gr-fec/include/gnuradio/fec/ber_bf.h
+++ b/gr-fec/include/gnuradio/fec/ber_bf.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_BER_BF_H
#define INCLUDED_FEC_BER_BF_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/cc_decoder.h b/gr-fec/include/gnuradio/fec/cc_decoder.h
index c426749da5..8b59d7bbc5 100644
--- a/gr-fec/include/gnuradio/fec/cc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/cc_decoder.h
@@ -24,8 +24,8 @@
#define INCLUDED_FEC_CC_DECODER_H
#include <gnuradio/fec/api.h>
-#include <gnuradio/fec/generic_decoder.h>
#include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/generic_decoder.h>
#include <map>
#include <string>
diff --git a/gr-fec/include/gnuradio/fec/cc_encoder.h b/gr-fec/include/gnuradio/fec/cc_encoder.h
index fcaf6dcf27..26f3a4a85a 100644
--- a/gr-fec/include/gnuradio/fec/cc_encoder.h
+++ b/gr-fec/include/gnuradio/fec/cc_encoder.h
@@ -24,8 +24,8 @@
#define INCLUDED_FEC_CC_ENCODER_H
#include <gnuradio/fec/api.h>
-#include <gnuradio/fec/encoder.h>
#include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/encoder.h>
#include <map>
#include <string>
diff --git a/gr-fec/include/gnuradio/fec/ccsds_encoder.h b/gr-fec/include/gnuradio/fec/ccsds_encoder.h
index 4eca78084e..b45c62ee1b 100644
--- a/gr-fec/include/gnuradio/fec/ccsds_encoder.h
+++ b/gr-fec/include/gnuradio/fec/ccsds_encoder.h
@@ -24,8 +24,8 @@
#define INCLUDED_FEC_CCSDS_ENCODER_H
#include <gnuradio/fec/api.h>
-#include <gnuradio/fec/encoder.h>
#include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/encoder.h>
#include <map>
#include <string>
diff --git a/gr-fec/include/gnuradio/fec/cldpc.h b/gr-fec/include/gnuradio/fec/cldpc.h
index 758594d3e7..cb285da85f 100644
--- a/gr-fec/include/gnuradio/fec/cldpc.h
+++ b/gr-fec/include/gnuradio/fec/cldpc.h
@@ -26,9 +26,9 @@
#include <iostream>
#include <vector>
-#include "gnuradio/fec/gf2vec.h"
-#include "gnuradio/fec/gf2mat.h"
#include "gnuradio/fec/alist.h"
+#include "gnuradio/fec/gf2mat.h"
+#include "gnuradio/fec/gf2vec.h"
#include <gnuradio/fec/api.h>
diff --git a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
index a4a23490a5..fc362379d2 100644
--- a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
+++ b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_CONV_BIT_CORR_BB_H
#define INCLUDED_FEC_CONV_BIT_CORR_BB_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/decoder.h b/gr-fec/include/gnuradio/fec/decoder.h
index 38946deef3..6bc7260b31 100644
--- a/gr-fec/include/gnuradio/fec/decoder.h
+++ b/gr-fec/include/gnuradio/fec/decoder.h
@@ -23,12 +23,12 @@
#ifndef INCLUDED_FEC_DECODER_H
#define INCLUDED_FEC_DECODER_H
+#include <gnuradio/block.h>
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/generic_decoder.h>
-#include <gnuradio/block.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
#include <boost/format.hpp>
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/depuncture_bb.h b/gr-fec/include/gnuradio/fec/depuncture_bb.h
index 3d085286b7..76a866a3f7 100644
--- a/gr-fec/include/gnuradio/fec/depuncture_bb.h
+++ b/gr-fec/include/gnuradio/fec/depuncture_bb.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_DEPUNCTURE_BB_H
#define INCLUDED_FEC_DEPUNCTURE_BB_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/encoder.h b/gr-fec/include/gnuradio/fec/encoder.h
index 084e4ff450..2e0e58c1a5 100644
--- a/gr-fec/include/gnuradio/fec/encoder.h
+++ b/gr-fec/include/gnuradio/fec/encoder.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_ENCODER_H
#define INCLUDED_FEC_ENCODER_H
+#include <gnuradio/block.h>
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/block.h>
#include <boost/shared_ptr.hpp>
namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/fec_mtrx.h b/gr-fec/include/gnuradio/fec/fec_mtrx.h
index 8aa2ee699a..d337b8fa66 100644
--- a/gr-fec/include/gnuradio/fec/fec_mtrx.h
+++ b/gr-fec/include/gnuradio/fec/fec_mtrx.h
@@ -22,8 +22,8 @@
#define INCLUDED_fec_mtrx_H
#include <gnuradio/fec/api.h>
-#include <cstdlib>
#include <boost/shared_ptr.hpp>
+#include <cstdlib>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/generic_decoder.h b/gr-fec/include/gnuradio/fec/generic_decoder.h
index 9356c85ce4..064c44e93c 100644
--- a/gr-fec/include/gnuradio/fec/generic_decoder.h
+++ b/gr-fec/include/gnuradio/fec/generic_decoder.h
@@ -25,8 +25,8 @@
#include <gnuradio/fec/api.h>
#include <gnuradio/logger.h>
-#include <boost/shared_ptr.hpp>
#include <boost/format.hpp>
+#include <boost/shared_ptr.hpp>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/generic_encoder.h b/gr-fec/include/gnuradio/fec/generic_encoder.h
index 597839eac3..6de99b3573 100644
--- a/gr-fec/include/gnuradio/fec/generic_encoder.h
+++ b/gr-fec/include/gnuradio/fec/generic_encoder.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_GENERIC_ENCODER_H
#define INCLUDED_FEC_GENERIC_ENCODER_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
#include <gnuradio/logger.h>
#include <boost/shared_ptr.hpp>
diff --git a/gr-fec/include/gnuradio/fec/gf2mat.h b/gr-fec/include/gnuradio/fec/gf2mat.h
index 460d1bbc2f..e0ed878894 100644
--- a/gr-fec/include/gnuradio/fec/gf2mat.h
+++ b/gr-fec/include/gnuradio/fec/gf2mat.h
@@ -22,9 +22,9 @@
#ifndef GF2MAT_H
#define GF2MAT_H
-#include <vector>
-#include "gf2vec.h"
#include "alist.h"
+#include "gf2vec.h"
+#include <vector>
class GF2Mat
{
diff --git a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
index 95e8638bc5..447a4169bd 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h
@@ -23,8 +23,8 @@
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/fec_mtrx.h>
-#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
index 2ed35c6cdc..4ffe5aaa8d 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h
@@ -23,8 +23,8 @@
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/fec_mtrx.h>
-#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_decoder.h b/gr-fec/include/gnuradio/fec/ldpc_decoder.h
index 309710036b..7a1c734bb2 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_decoder.h
@@ -26,14 +26,14 @@
typedef float INPUT_DATATYPE;
typedef unsigned char OUTPUT_DATATYPE;
+#include <gnuradio/fec/decoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/decoder.h>
#include <vector>
-#include <gnuradio/fec/cldpc.h>
#include <gnuradio/fec/alist.h>
#include <gnuradio/fec/awgn_bp.h>
+#include <gnuradio/fec/cldpc.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h b/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
index f1cf958e8e..d4fd1f1c32 100644
--- a/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
+++ b/gr-fec/include/gnuradio/fec/ldpc_par_mtrx_encoder.h
@@ -24,8 +24,8 @@
#define INCLUDED_LDPC_PAR_MTRX_ENCODER_H
#include <gnuradio/fec/encoder.h>
-#include <gnuradio/fec/ldpc_H_matrix.h>
#include <gnuradio/fec/fec_mtrx.h>
+#include <gnuradio/fec/ldpc_H_matrix.h>
#include <string>
#include <vector>
diff --git a/gr-fec/include/gnuradio/fec/puncture_bb.h b/gr-fec/include/gnuradio/fec/puncture_bb.h
index 7b5dad7e48..90d3856444 100644
--- a/gr-fec/include/gnuradio/fec/puncture_bb.h
+++ b/gr-fec/include/gnuradio/fec/puncture_bb.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_PUNCTURE_BB_H
#define INCLUDED_FEC_PUNCTURE_BB_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/puncture_ff.h b/gr-fec/include/gnuradio/fec/puncture_ff.h
index 5abb5042cd..df88bc6e7d 100644
--- a/gr-fec/include/gnuradio/fec/puncture_ff.h
+++ b/gr-fec/include/gnuradio/fec/puncture_ff.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_PUNCTURE_FF_H
#define INCLUDED_FEC_PUNCTURE_FF_H
-#include <gnuradio/fec/api.h>
#include <gnuradio/block.h>
+#include <gnuradio/fec/api.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/tagged_decoder.h b/gr-fec/include/gnuradio/fec/tagged_decoder.h
index 5ee3fe8a91..da29c7e212 100644
--- a/gr-fec/include/gnuradio/fec/tagged_decoder.h
+++ b/gr-fec/include/gnuradio/fec/tagged_decoder.h
@@ -26,8 +26,8 @@
#include <gnuradio/fec/api.h>
#include <gnuradio/fec/generic_decoder.h>
#include <gnuradio/tagged_stream_block.h>
-#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
namespace gr {
namespace fec {
diff --git a/gr-fec/include/gnuradio/fec/tpc_decoder.h b/gr-fec/include/gnuradio/fec/tpc_decoder.h
index fd7579b3c4..ff3d75622b 100644
--- a/gr-fec/include/gnuradio/fec/tpc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_decoder.h
@@ -26,9 +26,9 @@
typedef float INPUT_DATATYPE;
typedef unsigned char OUTPUT_DATATYPE;
+#include <gnuradio/fec/decoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/decoder.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/include/gnuradio/fec/tpc_encoder.h b/gr-fec/include/gnuradio/fec/tpc_encoder.h
index 5c0facda60..515658c7d6 100644
--- a/gr-fec/include/gnuradio/fec/tpc_encoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_encoder.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_TPC_ENCODER_H
#define INCLUDED_TPC_ENCODER_H
-#include <map>
-#include <string>
#include <gnuradio/fec/encoder.h>
#include <gnuradio/fec/generic_encoder.h>
+#include <map>
+#include <string>
#include <vector>
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
index c8db512068..790cd58a4b 100644
--- a/gr-fec/lib/async_decoder_impl.cc
+++ b/gr-fec/lib/async_decoder_impl.cc
@@ -26,8 +26,8 @@
#include "async_decoder_impl.h"
#include <gnuradio/io_signature.h>
-#include <volk/volk.h>
#include <stdio.h>
+#include <volk/volk.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/async_decoder_impl.h b/gr-fec/lib/async_decoder_impl.h
index d3bf0adb31..635321acad 100644
--- a/gr-fec/lib/async_decoder_impl.h
+++ b/gr-fec/lib/async_decoder_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FEC_ASYNC_DECODER_IMPL_H
#define INCLUDED_FEC_ASYNC_DECODER_IMPL_H
-#include <gnuradio/fec/async_decoder.h>
#include <gnuradio/blocks/pack_k_bits.h>
+#include <gnuradio/fec/async_decoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index 5454388de1..811d55601f 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -26,8 +26,8 @@
#include "async_encoder_impl.h"
#include <gnuradio/io_signature.h>
-#include <volk/volk.h>
#include <stdio.h>
+#include <volk/volk.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/async_encoder_impl.h b/gr-fec/lib/async_encoder_impl.h
index 80ae80b7d1..0a07cbabf0 100644
--- a/gr-fec/lib/async_encoder_impl.h
+++ b/gr-fec/lib/async_encoder_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_ASYNC_ENCODER_IMPL_H
#define INCLUDED_FEC_ASYNC_ENCODER_IMPL_H
-#include <gnuradio/fec/async_encoder.h>
-#include <gnuradio/blocks/unpack_k_bits.h>
#include <gnuradio/blocks/pack_k_bits.h>
+#include <gnuradio/blocks/unpack_k_bits.h>
+#include <gnuradio/fec/async_encoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index 33127e4309..c38f6a83a0 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -26,8 +26,8 @@
#include "ber_bf_impl.h"
#include <gnuradio/io_signature.h>
-#include <volk/volk.h>
#include <math.h>
+#include <volk/volk.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/cc_decoder_impl.cc b/gr-fec/lib/cc_decoder_impl.cc
index abe5ca59bc..e60131c7a1 100644
--- a/gr-fec/lib/cc_decoder_impl.cc
+++ b/gr-fec/lib/cc_decoder_impl.cc
@@ -26,10 +26,10 @@
#include "cc_decoder_impl.h"
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/lib/cc_decoder_impl.h b/gr-fec/lib/cc_decoder_impl.h
index 841c5f048c..621b198a5d 100644
--- a/gr-fec/lib/cc_decoder_impl.h
+++ b/gr-fec/lib/cc_decoder_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_CC_DECODER_IMPL_H
#define INCLUDED_FEC_CC_DECODER_IMPL_H
+#include <gnuradio/fec/cc_decoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/cc_decoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/cc_encoder_impl.cc b/gr-fec/lib/cc_encoder_impl.cc
index 389a41c1c5..42015ed875 100644
--- a/gr-fec/lib/cc_encoder_impl.cc
+++ b/gr-fec/lib/cc_encoder_impl.cc
@@ -25,15 +25,15 @@
#endif
#include "cc_encoder_impl.h"
+#include <gnuradio/fec/cc_common.h>
+#include <gnuradio/fec/generic_encoder.h>
#include <math.h>
-#include <boost/assign/list_of.hpp>
-#include <volk/volk_typedefs.h>
+#include <stdio.h>
#include <volk/volk.h>
+#include <volk/volk_typedefs.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
-#include <gnuradio/fec/generic_encoder.h>
-#include <gnuradio/fec/cc_common.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/cc_encoder_impl.h b/gr-fec/lib/cc_encoder_impl.h
index ce3f1020a0..446a187461 100644
--- a/gr-fec/lib/cc_encoder_impl.h
+++ b/gr-fec/lib/cc_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
#ifndef INCLUDED_FEC_CC_ENCODER_IMPL_H
#define INCLUDED_FEC_CC_ENCODER_IMPL_H
+#include <gnuradio/fec/cc_encoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/cc_encoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ccsds_encoder_impl.h b/gr-fec/lib/ccsds_encoder_impl.h
index f533afa878..4b0e109de7 100644
--- a/gr-fec/lib/ccsds_encoder_impl.h
+++ b/gr-fec/lib/ccsds_encoder_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_CCSDS_ENCODER_IMPL_H
#define INCLUDED_FEC_CCSDS_ENCODER_IMPL_H
+#include <gnuradio/fec/ccsds_encoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/ccsds_encoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
index 0fa3ba94b0..27d00bb5bb 100644
--- a/gr-fec/lib/depuncture_bb_impl.cc
+++ b/gr-fec/lib/depuncture_bb_impl.cc
@@ -26,11 +26,11 @@
#include "depuncture_bb_impl.h"
#include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
#include <volk/volk.h>
#include <boost/bind.hpp>
-#include <pmt/pmt.h>
#include <string>
-#include <stdio.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/dummy_decoder_impl.cc b/gr-fec/lib/dummy_decoder_impl.cc
index 4cf95b45e7..166cdcfcec 100644
--- a/gr-fec/lib/dummy_decoder_impl.cc
+++ b/gr-fec/lib/dummy_decoder_impl.cc
@@ -26,10 +26,10 @@
#include "dummy_decoder_impl.h"
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/lib/dummy_decoder_impl.h b/gr-fec/lib/dummy_decoder_impl.h
index 92860c22c7..1ead851c91 100644
--- a/gr-fec/lib/dummy_decoder_impl.h
+++ b/gr-fec/lib/dummy_decoder_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_FEC_DUMMY_DECODER_IMPL_H
#define INCLUDED_FEC_DUMMY_DECODER_IMPL_H
+#include <gnuradio/fec/dummy_decoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/dummy_decoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/dummy_encoder_impl.h b/gr-fec/lib/dummy_encoder_impl.h
index 4cd093d8d3..13602b3e5d 100644
--- a/gr-fec/lib/dummy_encoder_impl.h
+++ b/gr-fec/lib/dummy_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
#ifndef INCLUDED_FEC_DUMMY_ENCODER_IMPL_H
#define INCLUDED_FEC_DUMMY_ENCODER_IMPL_H
+#include <gnuradio/fec/dummy_encoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/dummy_encoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/fec_mtrx_impl.cc b/gr-fec/lib/fec_mtrx_impl.cc
index 40705d6397..10ed5f4f3f 100644
--- a/gr-fec/lib/fec_mtrx_impl.cc
+++ b/gr-fec/lib/fec_mtrx_impl.cc
@@ -25,10 +25,10 @@
#include "fec_mtrx_impl.h"
#include <math.h>
#include <fstream>
-#include <vector>
-#include <sstream>
#include <iostream>
+#include <sstream>
#include <stdexcept>
+#include <vector>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/fec_mtrx_impl.h b/gr-fec/lib/fec_mtrx_impl.h
index 8b58864e61..0beda10b9e 100644
--- a/gr-fec/lib/fec_mtrx_impl.h
+++ b/gr-fec/lib/fec_mtrx_impl.h
@@ -23,12 +23,12 @@
#include <string>
+#include <gnuradio/fec/fec_mtrx.h>
+#include <gsl/gsl_blas.h>
+#include <gsl/gsl_linalg.h>
#include <gsl/gsl_matrix.h>
-#include <gsl/gsl_randist.h>
#include <gsl/gsl_permutation.h>
-#include <gsl/gsl_linalg.h>
-#include <gsl/gsl_blas.h>
-#include <gnuradio/fec/fec_mtrx.h>
+#include <gsl/gsl_randist.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ldpc_G_matrix_impl.cc b/gr-fec/lib/ldpc_G_matrix_impl.cc
index a17c571ec9..4a680cbdd2 100644
--- a/gr-fec/lib/ldpc_G_matrix_impl.cc
+++ b/gr-fec/lib/ldpc_G_matrix_impl.cc
@@ -24,9 +24,9 @@
#include "ldpc_G_matrix_impl.h"
#include <math.h>
#include <fstream>
-#include <vector>
-#include <sstream>
#include <iostream>
+#include <sstream>
+#include <vector>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ldpc_G_matrix_impl.h b/gr-fec/lib/ldpc_G_matrix_impl.h
index b42c1791c2..8a5de4faf1 100644
--- a/gr-fec/lib/ldpc_G_matrix_impl.h
+++ b/gr-fec/lib/ldpc_G_matrix_impl.h
@@ -21,10 +21,10 @@
#ifndef INCLUDED_ldpc_G_matrix_impl_H
#define INCLUDED_ldpc_G_matrix_impl_H
-#include <gsl/gsl_randist.h>
-#include <gsl/gsl_permutation.h>
-#include <gsl/gsl_linalg.h>
#include <gsl/gsl_blas.h>
+#include <gsl/gsl_linalg.h>
+#include <gsl/gsl_permutation.h>
+#include <gsl/gsl_randist.h>
#include "fec_mtrx_impl.h"
#include <gnuradio/fec/ldpc_G_matrix.h>
diff --git a/gr-fec/lib/ldpc_H_matrix_impl.cc b/gr-fec/lib/ldpc_H_matrix_impl.cc
index 6b1b17e0f9..333fdee034 100644
--- a/gr-fec/lib/ldpc_H_matrix_impl.cc
+++ b/gr-fec/lib/ldpc_H_matrix_impl.cc
@@ -24,10 +24,10 @@
#include "ldpc_H_matrix_impl.h"
#include <math.h>
#include <fstream>
-#include <vector>
-#include <sstream>
#include <iostream>
+#include <sstream>
#include <stdexcept>
+#include <vector>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc b/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
index 286b7364f2..8c0f16adf8 100644
--- a/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
+++ b/gr-fec/lib/ldpc_bit_flip_decoder_impl.cc
@@ -24,10 +24,10 @@
#include "ldpc_bit_flip_decoder_impl.h"
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/lib/ldpc_decoder.cc b/gr-fec/lib/ldpc_decoder.cc
index 26992066eb..b8c25980f0 100644
--- a/gr-fec/lib/ldpc_decoder.cc
+++ b/gr-fec/lib/ldpc_decoder.cc
@@ -20,17 +20,17 @@
* Boston, MA 02110-1301, USA.
*/
+#include <gnuradio/fec/decoder.h>
#include <gnuradio/fec/ldpc_decoder.h>
+#include <gnuradio/fec/maxstar.h>
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
+#include <string.h> // for memcpy
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
+#include <algorithm> // for std::reverse
#include <sstream>
-#include <stdio.h>
#include <vector>
-#include <gnuradio/fec/decoder.h>
-#include <algorithm> // for std::reverse
-#include <string.h> // for memcpy
-#include <gnuradio/fec/maxstar.h>
namespace gr {
diff --git a/gr-fec/lib/ldpc_encoder_impl.cc b/gr-fec/lib/ldpc_encoder_impl.cc
index 7adaf6b886..44ca0dca96 100644
--- a/gr-fec/lib/ldpc_encoder_impl.cc
+++ b/gr-fec/lib/ldpc_encoder_impl.cc
@@ -21,12 +21,12 @@
*/
#include "ldpc_encoder_impl.h"
-#include <boost/assign/list_of.hpp>
-#include <volk/volk.h>
-#include <sstream>
#include <stdio.h>
+#include <string.h> // for memcpy
+#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <algorithm> // for std::reverse
-#include <string.h> // for memcpy
+#include <sstream>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ldpc_encoder_impl.h b/gr-fec/lib/ldpc_encoder_impl.h
index 5889f116d2..b33928f9df 100644
--- a/gr-fec/lib/ldpc_encoder_impl.h
+++ b/gr-fec/lib/ldpc_encoder_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_LDPC_ENCODER_IMPL_H
#define INCLUDED_LDPC_ENCODER_IMPL_H
-#include <gnuradio/fec/ldpc_encoder.h>
-#include <gnuradio/fec/cldpc.h>
#include <gnuradio/fec/alist.h>
+#include <gnuradio/fec/cldpc.h>
+#include <gnuradio/fec/ldpc_encoder.h>
#include <map>
#include <string>
#include <vector>
diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
index ee73699e49..10158c868d 100644
--- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h
@@ -21,10 +21,10 @@
#ifndef INCLUDED_FEC_LDPC_GEN_MTRX_ENCODER_IMPL_H
#define INCLUDED_FEC_LDPC_GEN_MTRX_ENCODER_IMPL_H
+#include <gnuradio/fec/ldpc_G_matrix.h>
+#include <gnuradio/fec/ldpc_gen_mtrx_encoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/ldpc_gen_mtrx_encoder.h>
-#include <gnuradio/fec/ldpc_G_matrix.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
index 16c03574ee..8a5ced1917 100644
--- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
@@ -22,13 +22,13 @@
#include "ldpc_par_mtrx_encoder_impl.h"
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
+#include <string.h> // for memcpy
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
+#include <algorithm> // for std::reverse
#include <sstream>
-#include <stdio.h>
#include <vector>
-#include <algorithm> // for std::reverse
-#include <string.h> // for memcpy
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/polar_common.cc b/gr-fec/lib/polar_common.cc
index 2207b69f37..b514e83829 100644
--- a/gr-fec/lib/polar_common.cc
+++ b/gr-fec/lib/polar_common.cc
@@ -24,16 +24,16 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_common.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
#include <gnuradio/blocks/pack_k_bits.h>
#include <gnuradio/blocks/unpack_k_bits.h>
#include <cmath>
-#include <stdexcept>
#include <iostream>
+#include <stdexcept>
#include <vector>
namespace gr {
diff --git a/gr-fec/lib/polar_decoder_common.cc b/gr-fec/lib/polar_decoder_common.cc
index 1712350172..1860c0fc33 100644
--- a/gr-fec/lib/polar_decoder_common.cc
+++ b/gr-fec/lib/polar_decoder_common.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_decoder_common.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
#include <cstdio>
diff --git a/gr-fec/lib/polar_decoder_sc.cc b/gr-fec/lib/polar_decoder_sc.cc
index 731648f4f4..4d15ca20e5 100644
--- a/gr-fec/lib/polar_decoder_sc.cc
+++ b/gr-fec/lib/polar_decoder_sc.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_decoder_sc.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
#include <cmath>
diff --git a/gr-fec/lib/polar_decoder_sc_list.cc b/gr-fec/lib/polar_decoder_sc_list.cc
index 8b922d2044..9395d6e9fe 100644
--- a/gr-fec/lib/polar_decoder_sc_list.cc
+++ b/gr-fec/lib/polar_decoder_sc_list.cc
@@ -24,13 +24,13 @@
#include "config.h"
#endif
-#include <gnuradio/fec/polar_decoder_sc_list.h>
#include "scl_list.h"
+#include <gnuradio/fec/polar_decoder_sc_list.h>
#include <gnuradio/io_signature.h>
#include <volk/volk.h>
-#include <cmath>
#include <algorithm>
+#include <cmath>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/polar_decoder_sc_systematic.cc b/gr-fec/lib/polar_decoder_sc_systematic.cc
index cb51d8b227..486d6df548 100644
--- a/gr-fec/lib/polar_decoder_sc_systematic.cc
+++ b/gr-fec/lib/polar_decoder_sc_systematic.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_decoder_sc_systematic.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
diff --git a/gr-fec/lib/polar_encoder.cc b/gr-fec/lib/polar_encoder.cc
index 07df87f17c..073e595cb5 100644
--- a/gr-fec/lib/polar_encoder.cc
+++ b/gr-fec/lib/polar_encoder.cc
@@ -24,11 +24,11 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_encoder.h>
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
#include <cmath>
#include <stdexcept>
-#include <volk/volk.h>
#include <gnuradio/blocks/pack_k_bits.h>
#include <gnuradio/blocks/unpack_k_bits.h>
diff --git a/gr-fec/lib/polar_encoder_systematic.cc b/gr-fec/lib/polar_encoder_systematic.cc
index 05b1472aa7..9c5607d4eb 100644
--- a/gr-fec/lib/polar_encoder_systematic.cc
+++ b/gr-fec/lib/polar_encoder_systematic.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include <gnuradio/io_signature.h>
#include <gnuradio/fec/polar_encoder_systematic.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc
index 14995b84c4..a365d6a69f 100644
--- a/gr-fec/lib/puncture_bb_impl.cc
+++ b/gr-fec/lib/puncture_bb_impl.cc
@@ -26,11 +26,11 @@
#include "puncture_bb_impl.h"
#include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
#include <volk/volk.h>
#include <boost/bind.hpp>
-#include <pmt/pmt.h>
#include <string>
-#include <stdio.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc
index d4c1c05723..c95288d691 100644
--- a/gr-fec/lib/puncture_ff_impl.cc
+++ b/gr-fec/lib/puncture_ff_impl.cc
@@ -26,11 +26,11 @@
#include "puncture_ff_impl.h"
#include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <stdio.h>
#include <volk/volk.h>
#include <boost/bind.hpp>
-#include <pmt/pmt.h>
#include <string>
-#include <stdio.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/reed-solomon/decode_rs.c b/gr-fec/lib/reed-solomon/decode_rs.c
index df05527494..28c42d2401 100644
--- a/gr-fec/lib/reed-solomon/decode_rs.c
+++ b/gr-fec/lib/reed-solomon/decode_rs.c
@@ -200,7 +200,7 @@ int DECODE_RS(
}
if (q != 0)
continue; /* Not a root */
- /* store root (index-form) and error location number */
+ /* store root (index-form) and error location number */
#if DEBUG >= 2
printf("count %d root %d loc %d\n", count, i, k);
#endif
diff --git a/gr-fec/lib/reed-solomon/decode_rs_ccsds.c b/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
index e842bfaf84..be6e2018e3 100644
--- a/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
+++ b/gr-fec/lib/reed-solomon/decode_rs_ccsds.c
@@ -5,8 +5,8 @@
* May be used under the terms of the GNU General Public License (GPL)
*/
#define FIXED 1
-#include "fixed.h"
#include "ccsds.h"
+#include "fixed.h"
int decode_rs_ccsds(unsigned char* data, int* eras_pos, int no_eras)
{
diff --git a/gr-fec/lib/reed-solomon/encode_rs_ccsds.c b/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
index aae16ae37d..7080b3f419 100644
--- a/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
+++ b/gr-fec/lib/reed-solomon/encode_rs_ccsds.c
@@ -5,8 +5,8 @@
* May be used under the terms of the GNU General Public License (GPL)
*/
#define FIXED
-#include "fixed.h"
#include "ccsds.h"
+#include "fixed.h"
void encode_rs_ccsds(unsigned char* data, unsigned char* parity)
{
diff --git a/gr-fec/lib/reed-solomon/exercise.c b/gr-fec/lib/reed-solomon/exercise.c
index 562a051f17..598f485fed 100644
--- a/gr-fec/lib/reed-solomon/exercise.c
+++ b/gr-fec/lib/reed-solomon/exercise.c
@@ -18,8 +18,8 @@
#include "fixed.h"
#define EXERCISE exercise_8
#elif defined(CCSDS)
-#include "fixed.h"
#include "ccsds.h"
+#include "fixed.h"
#define EXERCISE exercise_ccsds
#elif defined(BIGSYM)
#include "int.h"
diff --git a/gr-fec/lib/reed-solomon/gen_ccsds.c b/gr-fec/lib/reed-solomon/gen_ccsds.c
index a069834346..8073278d81 100644
--- a/gr-fec/lib/reed-solomon/gen_ccsds.c
+++ b/gr-fec/lib/reed-solomon/gen_ccsds.c
@@ -2,8 +2,8 @@
* Copyright 2002 Phil Karn, KA9Q
* May be used under the terms of the GNU General Public License (GPL)
*/
-#include <stdio.h>
#include "char.h"
+#include <stdio.h>
int main()
{
diff --git a/gr-fec/lib/reed-solomon/rstest.c b/gr-fec/lib/reed-solomon/rstest.c
index c8fc000700..cfc2d62bc2 100644
--- a/gr-fec/lib/reed-solomon/rstest.c
+++ b/gr-fec/lib/reed-solomon/rstest.c
@@ -9,10 +9,10 @@
#include <config.h>
#endif
+#include <gnuradio/fec/rs.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
-#include <gnuradio/fec/rs.h>
int exercise_char(void*, int);
diff --git a/gr-fec/lib/repetition_decoder_impl.cc b/gr-fec/lib/repetition_decoder_impl.cc
index ed8ba11eee..61b1ed5ba9 100644
--- a/gr-fec/lib/repetition_decoder_impl.cc
+++ b/gr-fec/lib/repetition_decoder_impl.cc
@@ -26,10 +26,10 @@
#include "repetition_decoder_impl.h"
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
namespace gr {
diff --git a/gr-fec/lib/repetition_decoder_impl.h b/gr-fec/lib/repetition_decoder_impl.h
index 2a058a0894..9eaad143c9 100644
--- a/gr-fec/lib/repetition_decoder_impl.h
+++ b/gr-fec/lib/repetition_decoder_impl.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_FEC_REPETITION_DECODER_IMPL_H
#define INCLUDED_FEC_REPETITION_DECODER_IMPL_H
-#include <vector>
+#include <gnuradio/fec/repetition_decoder.h>
#include <algorithm>
#include <string>
-#include <gnuradio/fec/repetition_decoder.h>
+#include <vector>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/repetition_encoder_impl.h b/gr-fec/lib/repetition_encoder_impl.h
index 278b585f3a..bf76304f43 100644
--- a/gr-fec/lib/repetition_encoder_impl.h
+++ b/gr-fec/lib/repetition_encoder_impl.h
@@ -23,9 +23,9 @@ p * You should have received a copy of the GNU General Public License
#ifndef INCLUDED_FEC_REPETITION_ENCODER_IMPL_H
#define INCLUDED_FEC_REPETITION_ENCODER_IMPL_H
+#include <gnuradio/fec/repetition_encoder.h>
#include <map>
#include <string>
-#include <gnuradio/fec/repetition_encoder.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/scl_list.cc b/gr-fec/lib/scl_list.cc
index 2b126358ec..aff5a87507 100644
--- a/gr-fec/lib/scl_list.cc
+++ b/gr-fec/lib/scl_list.cc
@@ -21,10 +21,10 @@
*/
#include "scl_list.h"
+#include <volk/volk.h>
+#include <algorithm>
#include <cstring>
#include <iostream>
-#include <algorithm>
-#include <volk/volk.h>
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/tpc_decoder.cc b/gr-fec/lib/tpc_decoder.cc
index 3477e30aab..b8a1e74e82 100644
--- a/gr-fec/lib/tpc_decoder.cc
+++ b/gr-fec/lib/tpc_decoder.cc
@@ -20,18 +20,18 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gnuradio/fec/tpc_decoder.h>
#include <gnuradio/fec/tpc_common.h>
+#include <gnuradio/fec/tpc_decoder.h>
#include <volk/volk.h>
#include <math.h>
+#include <stdio.h>
#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
-#include <algorithm> // for std::reverse
#include <string.h> // for memcpy
+#include <algorithm> // for std::reverse
#include <gnuradio/fec/maxstar.h>
diff --git a/gr-fec/lib/tpc_encoder.cc b/gr-fec/lib/tpc_encoder.cc
index 381235c62c..44862a02d4 100644
--- a/gr-fec/lib/tpc_encoder.cc
+++ b/gr-fec/lib/tpc_encoder.cc
@@ -20,19 +20,19 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gnuradio/fec/tpc_encoder.h>
-#include <gnuradio/fec/tpc_common.h>
#include <gnuradio/fec/generic_encoder.h>
+#include <gnuradio/fec/tpc_common.h>
+#include <gnuradio/fec/tpc_encoder.h>
#include <math.h>
-#include <boost/assign/list_of.hpp>
+#include <stdio.h>
#include <volk/volk.h>
+#include <boost/assign/list_of.hpp>
#include <sstream>
-#include <stdio.h>
#include <vector>
-#include <algorithm> // for std::reverse
#include <string.h> // for memcpy
+#include <algorithm> // for std::reverse
namespace gr {
namespace fec {
diff --git a/gr-fec/lib/viterbi/decode.cc b/gr-fec/lib/viterbi/decode.cc
index 98d2644f89..67605cec2a 100644
--- a/gr-fec/lib/viterbi/decode.cc
+++ b/gr-fec/lib/viterbi/decode.cc
@@ -29,8 +29,8 @@
#include <gnuradio/fec/viterbi.h>
-#include <cstdio>
#include <cmath>
+#include <cstdio>
#define MAXCHUNKSIZE 4096
#define MAXENCSIZE MAXCHUNKSIZE * 16
diff --git a/gr-fec/lib/viterbi/metrics.cc b/gr-fec/lib/viterbi/metrics.cc
index 9ec2f37e17..b0fd52096b 100644
--- a/gr-fec/lib/viterbi/metrics.cc
+++ b/gr-fec/lib/viterbi/metrics.cc
@@ -41,8 +41,8 @@
#include <gnuradio/math.h>
-#include <cstdlib>
#include <cmath>
+#include <cstdlib>
/* Normal function integrated from -Inf to x. Range: 0-1 */
#define normal(x) (0.5 + 0.5 * erf((x) / GR_M_SQRT2))