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

40 files changed, 56 insertions, 56 deletions

diff --git a/gr-filter/lib/fft_filter.cc b/gr-filter/lib/fft_filter.cc
index 344114e0a..2146aea52 100644
--- a/gr-filter/lib/fft_filter.cc
+++ b/gr-filter/lib/fft_filter.cc
@@ -26,8 +26,8 @@
 
 #include <gnuradio/filter/fft_filter.h>
 #include <volk/volk.h>
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc
index a277fc145..78b91b400 100644
--- a/gr-filter/lib/fft_filter_ccc_impl.cc
+++ b/gr-filter/lib/fft_filter_ccc_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_ccc_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/fft_filter_ccf_impl.cc b/gr-filter/lib/fft_filter_ccf_impl.cc
index 17d03acd9..3d614a503 100644
--- a/gr-filter/lib/fft_filter_ccf_impl.cc
+++ b/gr-filter/lib/fft_filter_ccf_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_ccf_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc
index 6f3a9de48..8100beba0 100644
--- a/gr-filter/lib/fft_filter_fff_impl.cc
+++ b/gr-filter/lib/fft_filter_fff_impl.cc
@@ -27,8 +27,8 @@
 #include "fft_filter_fff_impl.h"
 #include <gnuradio/io_signature.h>
 
-#include <math.h>
 #include <assert.h>
+#include <math.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/filterbank_vcvcf_impl.h b/gr-filter/lib/filterbank_vcvcf_impl.h
index dc6e3e5d1..2d5a1313f 100644
--- a/gr-filter/lib/filterbank_vcvcf_impl.h
+++ b/gr-filter/lib/filterbank_vcvcf_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
 #define INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
 
-#include <gnuradio/filter/filterbank_vcvcf.h>
 #include <gnuradio/filter/filterbank.h>
+#include <gnuradio/filter/filterbank_vcvcf.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/thread/thread.h>
 
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc
index 940d59d59..0656068c7 100644
--- a/gr-filter/lib/fir_filter.cc
+++ b/gr-filter/lib/fir_filter.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <cstdio>
-#include <cstring>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <volk/volk.h>
+#include <cstdio>
+#include <cstring>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
index f3e3cf66e..879fcf0fb 100644
--- a/gr-filter/lib/fir_filter_with_buffer.cc
+++ b/gr-filter/lib/fir_filter_with_buffer.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <volk/volk.h>
 #include <algorithm>
 #include <cstdio>
diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.h b/gr-filter/lib/freq_xlating_fir_filter_impl.h
index c58bb81ac..73b83a256 100644
--- a/gr-filter/lib/freq_xlating_fir_filter_impl.h
+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.h
@@ -23,10 +23,10 @@
 #ifndef FREQ_XLATING_FIR_FILTER_IMPL_H
 #define FREQ_XLATING_FIR_FILTER_IMPL_H
 
+#include <gnuradio/blocks/rotator.h>
 #include <gnuradio/filter/api.h>
 #include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/freq_xlating_fir_filter.h>
-#include <gnuradio/blocks/rotator.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c b/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
index c922c02bb..8de29f08c 100644
--- a/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
+++ b/gr-filter/lib/gen_interpolator_taps/diff_objective_fct.c
@@ -24,9 +24,9 @@
  * generate MMSE interpolating differentiator FIR table values
  */
 
-#include <math.h>
 #include <assert.h>
 #include <gsl/gsl_integration.h>
+#include <math.h>
 
 #define MU 0.5 /* the MU for which we're computing coeffs */
 
diff --git a/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c b/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
index df4e1cc49..aadd80114 100644
--- a/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
+++ b/gr-filter/lib/gen_interpolator_taps/gen_interp_differentiator_taps.c
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gsl/gsl_integration.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <gsl/gsl_integration.h>
+#include <unistd.h>
 
 #define NSTEPS 10 // how many steps of mu are in the generated table
 #define MAX_NSTEPS 256
diff --git a/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c b/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
index 6069e7bd0..3b22c74c2 100644
--- a/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
+++ b/gr-filter/lib/gen_interpolator_taps/gen_interpolator_taps.c
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gsl/gsl_integration.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <gsl/gsl_integration.h>
+#include <unistd.h>
 
 #define NSTEPS 10 // how many steps of mu are in the generated table
 #define MAX_NSTEPS 256
diff --git a/gr-filter/lib/gen_interpolator_taps/objective_fct.c b/gr-filter/lib/gen_interpolator_taps/objective_fct.c
index ea36f4957..bee649533 100644
--- a/gr-filter/lib/gen_interpolator_taps/objective_fct.c
+++ b/gr-filter/lib/gen_interpolator_taps/objective_fct.c
@@ -24,9 +24,9 @@
  * generate MMSE FIR interpolation table values
  */
 
-#include <math.h>
 #include <assert.h>
 #include <gsl/gsl_integration.h>
+#include <math.h>
 
 #define MU 0.5 /* the MU for which we're computing coeffs */
 
diff --git a/gr-filter/lib/hilbert_fc_impl.h b/gr-filter/lib/hilbert_fc_impl.h
index 22fd475b5..998179f25 100644
--- a/gr-filter/lib/hilbert_fc_impl.h
+++ b/gr-filter/lib/hilbert_fc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FILTER_HILBERT_FC_IMPL_H
 #define INCLUDED_FILTER_HILBERT_FC_IMPL_H
 
-#include <gnuradio/filter/hilbert_fc.h>
 #include <gnuradio/filter/fir_filter.h>
+#include <gnuradio/filter/hilbert_fc.h>
 #include <gnuradio/types.h>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_fir_interpolator_cc.cc b/gr-filter/lib/mmse_fir_interpolator_cc.cc
index 6e423d3bd..9c393a433 100644
--- a/gr-filter/lib/mmse_fir_interpolator_cc.cc
+++ b/gr-filter/lib/mmse_fir_interpolator_cc.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/filter/interpolator_taps.h>
+#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_fir_interpolator_ff.cc b/gr-filter/lib/mmse_fir_interpolator_ff.cc
index 327934c75..b1e3ec43e 100644
--- a/gr-filter/lib/mmse_fir_interpolator_ff.cc
+++ b/gr-filter/lib/mmse_fir_interpolator_ff.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/filter/interpolator_taps.h>
+#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interp_differentiator_cc.cc b/gr-filter/lib/mmse_interp_differentiator_cc.cc
index d15f9106c..3d81b5253 100644
--- a/gr-filter/lib/mmse_interp_differentiator_cc.cc
+++ b/gr-filter/lib/mmse_interp_differentiator_cc.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include "gnuradio/filter/interp_differentiator_taps.h"
+#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interp_differentiator_ff.cc b/gr-filter/lib/mmse_interp_differentiator_ff.cc
index 4566e8e6c..431eff630 100644
--- a/gr-filter/lib/mmse_interp_differentiator_ff.cc
+++ b/gr-filter/lib/mmse_interp_differentiator_ff.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include "gnuradio/filter/interp_differentiator_taps.h"
+#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.cc b/gr-filter/lib/mmse_interpolator_cc_impl.cc
index caf00fb06..1d80a635d 100644
--- a/gr-filter/lib/mmse_interpolator_cc_impl.cc
+++ b/gr-filter/lib/mmse_interpolator_cc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_interpolator_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.h b/gr-filter/lib/mmse_interpolator_cc_impl.h
index e1fa1dc6c..fe316ad4e 100644
--- a/gr-filter/lib/mmse_interpolator_cc_impl.h
+++ b/gr-filter/lib/mmse_interpolator_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H
 #define INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H
 
-#include <gnuradio/filter/mmse_interpolator_cc.h>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
+#include <gnuradio/filter/mmse_interpolator_cc.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.cc b/gr-filter/lib/mmse_interpolator_ff_impl.cc
index 0b696fbeb..49c554375 100644
--- a/gr-filter/lib/mmse_interpolator_ff_impl.cc
+++ b/gr-filter/lib/mmse_interpolator_ff_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_interpolator_ff_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.h b/gr-filter/lib/mmse_interpolator_ff_impl.h
index efdf96e9a..193fcecee 100644
--- a/gr-filter/lib/mmse_interpolator_ff_impl.h
+++ b/gr-filter/lib/mmse_interpolator_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H
 #define INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H
 
-#include <gnuradio/filter/mmse_interpolator_ff.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/mmse_interpolator_ff.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc
index 4892556dc..59f9eacfa 100644
--- a/gr-filter/lib/mmse_resampler_cc_impl.cc
+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_resampler_cc_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_resampler_cc_impl.h b/gr-filter/lib/mmse_resampler_cc_impl.h
index ce41fd358..58420f2f2 100644
--- a/gr-filter/lib/mmse_resampler_cc_impl.h
+++ b/gr-filter/lib/mmse_resampler_cc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_CC_IMPL_H
 #define INCLUDED_MMSE_RESAMPLER_CC_IMPL_H
 
-#include <gnuradio/filter/mmse_resampler_cc.h>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
+#include <gnuradio/filter/mmse_resampler_cc.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc
index 0a7bc9ee5..342d9f767 100644
--- a/gr-filter/lib/mmse_resampler_ff_impl.cc
+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include <gnuradio/io_signature.h>
 #include "mmse_resampler_ff_impl.h"
+#include <gnuradio/io_signature.h>
 #include <stdexcept>
 
 namespace gr {
diff --git a/gr-filter/lib/mmse_resampler_ff_impl.h b/gr-filter/lib/mmse_resampler_ff_impl.h
index aad2f2fc3..5632f8a81 100644
--- a/gr-filter/lib/mmse_resampler_ff_impl.h
+++ b/gr-filter/lib/mmse_resampler_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_MMSE_RESAMPLER_FF_IMPL_H
 #define INCLUDED_MMSE_RESAMPLER_FF_IMPL_H
 
-#include <gnuradio/filter/mmse_resampler_ff.h>
 #include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/mmse_resampler_ff.h>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/pfb_arb_resampler_ccc_impl.h b/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
index aa30eee4d..b41eae2e6 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_ccc_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCC_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCC_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_ccc.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_ccc.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
index b611de0a5..b339a94fc 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_CCF_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_CCF_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_ccf.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_ccf.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_arb_resampler_fff_impl.h b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
index 78598dde0..c63b1a377 100644
--- a/gr-filter/lib/pfb_arb_resampler_fff_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_PFB_ARB_RESAMPLER_FFF_IMPL_H
 #define INCLUDED_PFB_ARB_RESAMPLER_FFF_IMPL_H
 
-#include <gnuradio/filter/pfb_arb_resampler_fff.h>
 #include <gnuradio/filter/pfb_arb_resampler.h>
+#include <gnuradio/filter/pfb_arb_resampler_fff.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.h b/gr-filter/lib/pfb_channelizer_ccf_impl.h
index 1eecdd356..5f67b70ca 100644
--- a/gr-filter/lib/pfb_channelizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_channelizer_ccf_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_FILTER_PFB_CHANNELIZER_CCF_IMPL_H
 #define INCLUDED_FILTER_PFB_CHANNELIZER_CCF_IMPL_H
 
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/pfb_channelizer_ccf.h>
 #include <gnuradio/filter/polyphase_filterbank.h>
-#include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/fft/fft.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc
index 503513a08..7f845596d 100644
--- a/gr-filter/lib/pfb_decimator_ccf_impl.cc
+++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "pfb_decimator_ccf_impl.h"
-#include <gnuradio/io_signature.h>
 #include <gnuradio/expj.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 
diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.h b/gr-filter/lib/pfb_interpolator_ccf_impl.h
index 103b44a07..86e5e2ee5 100644
--- a/gr-filter/lib/pfb_interpolator_ccf_impl.h
+++ b/gr-filter/lib/pfb_interpolator_ccf_impl.h
@@ -24,10 +24,10 @@
 #ifndef INCLUDED_PFB_INTERPOLATOR_CCF_IMPL_H
 #define INCLUDED_PFB_INTERPOLATOR_CCF_IMPL_H
 
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter.h>
 #include <gnuradio/filter/pfb_interpolator_ccf.h>
 #include <gnuradio/filter/polyphase_filterbank.h>
-#include <gnuradio/filter/fir_filter.h>
-#include <gnuradio/fft/fft.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.h b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
index 7cce3019a..9e54a3b93 100644
--- a/gr-filter/lib/pfb_synthesizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
@@ -24,9 +24,9 @@
 #ifndef INCLUDED_PFB_SYNTHESIZER_CCF_IMPL_H
 #define INCLUDED_PFB_SYNTHESIZER_CCF_IMPL_H
 
-#include <gnuradio/filter/pfb_synthesizer_ccf.h>
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
+#include <gnuradio/filter/pfb_synthesizer_ccf.h>
 #include <gnuradio/thread/thread.h>
 
 namespace gr {
diff --git a/gr-filter/lib/pm_remez.cc b/gr-filter/lib/pm_remez.cc
index 45a33ea6a..cc952bfba 100644
--- a/gr-filter/lib/pm_remez.cc
+++ b/gr-filter/lib/pm_remez.cc
@@ -42,8 +42,8 @@
 #endif
 
 #include <gnuradio/filter/pm_remez.h>
-#include <cmath>
 #include <assert.h>
+#include <cmath>
 #include <iostream>
 
 #ifndef LOCAL_BUFFER
diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
index fdd57f416..0c93bc247 100644
--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
+++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
@@ -24,10 +24,10 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/types.h>
-#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/fir_filter_with_buffer.h>
 #include <gnuradio/random.h>
+#include <gnuradio/types.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
 #include <cmath>
diff --git a/gr-filter/lib/qa_firdes.cc b/gr-filter/lib/qa_firdes.cc
index ad1d08f15..3f80a2f20 100644
--- a/gr-filter/lib/qa_firdes.cc
+++ b/gr-filter/lib/qa_firdes.cc
@@ -22,11 +22,11 @@
 
 #include <gnuradio/filter/firdes.h>
 #include <gnuradio/gr_complex.h>
-#include <boost/test/unit_test.hpp>
+#include <stdio.h>
 #include <string.h>
-#include <iostream>
+#include <boost/test/unit_test.hpp>
 #include <iomanip>
-#include <stdio.h>
+#include <iostream>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
index 2b2dba1f6..420717275 100644
--- a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
+++ b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_fir_interpolator_cc.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
index c7cec03c2..40bcf4417 100644
--- a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
+++ b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc
@@ -24,13 +24,13 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
index e769351f6..fd88fcc5d 100644
--- a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
+++ b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_interp_differentiator_cc.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
index 5be4e995c..53d0f2725 100644
--- a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
+++ b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc
@@ -24,15 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/filter/mmse_interp_differentiator_ff.h>
 #include <gnuradio/math.h>
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
-#include <cstdio>
 #include <cmath>
-#include <stdexcept>
 #include <cstdint>
+#include <cstdio>
+#include <stdexcept>
 
 namespace gr {
 namespace filter {
diff --git a/gr-filter/lib/single_pole_iir_filter_cc_impl.h b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
index 05bdeb496..e181f8f00 100644
--- a/gr-filter/lib/single_pole_iir_filter_cc_impl.h
+++ b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
@@ -25,8 +25,8 @@
 
 #include <gnuradio/filter/single_pole_iir.h>
 #include <gnuradio/filter/single_pole_iir_filter_cc.h>
-#include <gnuradio/sync_block.h>
 #include <gnuradio/gr_complex.h>
+#include <gnuradio/sync_block.h>
 #include <stdexcept>
 
 namespace gr {