summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2008-04-30 02:24:06 +0000
committereb2008-04-30 02:24:06 +0000
commit38ea3a576a20820e574c6cb37607aeafe07f34b4 (patch)
treef606c6f72729860c68915920a71fa2fa97a0b945
parentd8e2641775a0ceb4fa388c59968a75509250d923 (diff)
downloadgnuradio-38ea3a576a20820e574c6cb37607aeafe07f34b4.tar.gz
gnuradio-38ea3a576a20820e574c6cb37607aeafe07f34b4.tar.bz2
gnuradio-38ea3a576a20820e574c6cb37607aeafe07f34b4.zip
Tweaks for gcc 4.3 based on patch from Marek Mahut <mmahut@fedoraproject.org>.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8292 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gcell/src/lib/runtime/gc_aligned_alloc.cc1
-rw-r--r--gcell/src/lib/runtime/gc_job_manager_impl.cc1
-rw-r--r--gcell/src/lib/runtime/qa_job_manager.cc1
-rw-r--r--gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc1
-rw-r--r--gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc1
-rw-r--r--gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc1
-rw-r--r--gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc1
-rw-r--r--gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc1
-rw-r--r--gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc1
-rw-r--r--gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_bin_statistics_f.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_circular_file.cc2
-rw-r--r--gnuradio-core/src/lib/general/gr_delay.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_fft_vcc.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_fft_vfc.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_framer_sink_1.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_head.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_keep_one_in_n.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_log2_const.h22
-rw-r--r--gnuradio-core/src/lib/general/gr_null_source.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_packet_sink.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_repeat.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_simple_correlator.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_simple_framer.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_skiphead.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_stream_mux.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_stream_to_streams.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_stream_to_vector.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_streams_to_stream.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_streams_to_vector.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_test.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_throttle.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_vector_to_stream.cc1
-rw-r--r--gnuradio-core/src/lib/general/gr_vector_to_streams.cc1
-rw-r--r--gnuradio-core/src/lib/general/malloc16.c1
-rw-r--r--gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t1
-rw-r--r--gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t1
-rw-r--r--gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_file_descriptor_source.cc2
-rw-r--r--gnuradio-core/src/lib/io/gr_file_sink_base.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_file_source.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_message_sink.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_message_source.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_sink.cc1
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_source.cc2
-rw-r--r--gnuradio-core/src/lib/io/gri_logger.cc1
-rw-r--r--gnuradio-core/src/lib/reed-solomon/decode_rs.c1
-rw-r--r--gnuradio-core/src/lib/reed-solomon/encode_rs.c1
-rw-r--r--gnuradio-core/src/lib/reed-solomon/exercise.c1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_dispatcher.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_error_handler.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_local_sighandler.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_message.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_preferences.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_realtime.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc1
-rw-r--r--gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc1
-rw-r--r--gnuradio-core/src/tests/benchmark_nco.cc1
-rw-r--r--gnuradio-core/src/tests/benchmark_vco.cc1
-rw-r--r--gr-atsc/src/lib/atsc_bit_timing_loop.cc1
-rw-r--r--gr-atsc/src/lib/atsci_reed_solomon.cc1
-rw-r--r--gr-atsc/src/lib/atsci_sliding_correlator.h5
-rw-r--r--gr-atsc/src/lib/atsci_sssr.cc1
-rw-r--r--gr-atsc/src/lib/atsci_trellis_encoder.cc1
-rw-r--r--gr-atsc/src/lib/atsci_viterbi_decoder.cc1
-rw-r--r--gr-atsc/src/lib/interleaver_fifo.h1
-rw-r--r--gr-atsc/src/lib/qa_atsci_data_interleaver.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_equalizer_nop.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_randomizer.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_reed_solomon.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_single_viterbi.cc1
-rw-r--r--gr-atsc/src/lib/qa_atsci_trellis_encoder.cc1
-rw-r--r--gr-audio-portaudio/src/audio_portaudio_sink.cc1
-rw-r--r--gr-audio-portaudio/src/audio_portaudio_source.cc1
-rw-r--r--gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc1
-rw-r--r--gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc1
-rw-r--r--gr-gcell/src/gcell_fft_vcc.cc1
-rw-r--r--gr-gsm-fr-vocoder/src/lib/gsm/code.c1
-rw-r--r--gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c1
-rw-r--r--gr-trellis/src/lib/fsm.cc1
-rw-r--r--gr-trellis/src/lib/fsm.h1
-rw-r--r--gr-trellis/src/lib/trellis_permutation.cc1
-rw-r--r--gr-video-sdl/src/video_sdl_sink_s.cc1
-rw-r--r--gr-video-sdl/src/video_sdl_sink_uc.cc1
-rw-r--r--pmt/src/lib/pmt.cc1
-rw-r--r--usrp/host/apps/usrper.cc1
-rw-r--r--usrp/host/lib/inband/qa_inband_packet_prims.cc1
-rw-r--r--usrp/host/lib/inband/test_usrp_inband.cc1
-rw-r--r--usrp/host/lib/inband/usrp_inband_usb_packet.cc1
-rw-r--r--usrp/host/lib/inband/usrp_rx_stub.cc1
-rw-r--r--usrp/host/lib/inband/usrp_server.cc2
-rw-r--r--usrp/host/lib/legacy/fusb_win32.cc1
-rw-r--r--usrp/host/lib/legacy/usrp_basic.cc1
-rw-r--r--usrp/host/lib/legacy/usrp_local_sighandler.cc1
-rw-r--r--usrp/host/lib/legacy/usrp_prims.cc1
-rw-r--r--usrp/host/misc/getopt.c1
108 files changed, 123 insertions, 14 deletions
diff --git a/gcell/src/lib/runtime/gc_aligned_alloc.cc b/gcell/src/lib/runtime/gc_aligned_alloc.cc
index fa20a6443..6f9a999b9 100644
--- a/gcell/src/lib/runtime/gc_aligned_alloc.cc
+++ b/gcell/src/lib/runtime/gc_aligned_alloc.cc
@@ -25,6 +25,7 @@
#include <gc_aligned_alloc.h>
#include <stdlib.h>
#include <stdexcept>
+#include <string.h>
// custom deleter of anything that can be freed with "free"
class free_deleter {
diff --git a/gcell/src/lib/runtime/gc_job_manager_impl.cc b/gcell/src/lib/runtime/gc_job_manager_impl.cc
index 9c859511b..2b4b83f4f 100644
--- a/gcell/src/lib/runtime/gc_job_manager_impl.cc
+++ b/gcell/src/lib/runtime/gc_job_manager_impl.cc
@@ -36,6 +36,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <string.h>
static const size_t CACHE_LINE_SIZE = 128;
diff --git a/gcell/src/lib/runtime/qa_job_manager.cc b/gcell/src/lib/runtime/qa_job_manager.cc
index 53a1ec681..e37e3c37f 100644
--- a/gcell/src/lib/runtime/qa_job_manager.cc
+++ b/gcell/src/lib/runtime/qa_job_manager.cc
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <time.h>
#include <errno.h>
+#include <string.h>
#include <malloc.h>
diff --git a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc b/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc
index 404f83657..dbbe05fbc 100644
--- a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc
+++ b/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h> // random, posix_memalign
#include <algorithm>
+#include <string.h>
typedef boost::shared_ptr<void> void_sptr;
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
index a4e6c9919..1083b181c 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
@@ -38,6 +38,7 @@
#include <gr_firdes.h>
#include <iostream>
+#include <string.h>
gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps)
{
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
index 865f8a1eb..28ee3e070 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
@@ -33,6 +33,7 @@
#include <gr_firdes.h>
#include <iostream>
+#include <string.h>
gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps)
{
diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
index aee0e4614..52f3340a9 100644
--- a/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
+++ b/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
@@ -47,6 +47,7 @@ typedef gr_complex acc_type;
#include <cppunit/TestAssert.h>
#include <random.h>
#include <malloc16.h>
+#include <string.h>
using std::vector;
diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
index 1d57cd0cd..6bb63f240 100644
--- a/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
+++ b/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
@@ -47,6 +47,7 @@ typedef gr_complex acc_type;
#include <cppunit/TestAssert.h>
#include <random.h>
#include <malloc16.h>
+#include <string.h>
using std::vector;
diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
index 93b84b9c3..bb56d1788 100644
--- a/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
+++ b/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
@@ -46,6 +46,7 @@ typedef gr_complex acc_type;
#include <gr_types.h>
#include <cppunit/TestAssert.h>
#include <random.h>
+#include <string.h>
using std::vector;
diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
index abb2caeac..380435bf7 100644
--- a/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
+++ b/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
@@ -32,6 +32,7 @@
#include <cmath>
#include <cppunit/TestAssert.h>
#include <random.h>
+#include <string.h>
using std::vector;
diff --git a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
index 4d4d99617..906a72c4c 100644
--- a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
+++ b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
@@ -28,6 +28,7 @@
#include <gr_io_signature.h>
#include <assert.h>
#include <stdexcept>
+#include <string.h>
//define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec.
//It is more resource intensive, less tested and probably not needed
diff --git a/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc b/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
index ab91f57e8..61abd72b8 100644
--- a/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
+++ b/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
@@ -26,6 +26,7 @@
#include <gr_bin_statistics_f.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_bin_statistics_f_sptr
gr_make_bin_statistics_f(unsigned int vlen,
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.cc b/gnuradio-core/src/lib/general/gr_circular_file.cc
index 6f605419e..468b49a10 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.cc
+++ b/gnuradio-core/src/lib/general/gr_circular_file.cc
@@ -39,6 +39,8 @@
#include <stdlib.h>
#include <algorithm>
+#include <stdio.h>
+#include <string.h>
static const int HEADER_SIZE = 4096;
static const int HEADER_MAGIC = 0xEB021026;
diff --git a/gnuradio-core/src/lib/general/gr_delay.cc b/gnuradio-core/src/lib/general/gr_delay.cc
index a5709c1e7..d52faca39 100644
--- a/gnuradio-core/src/lib/general/gr_delay.cc
+++ b/gnuradio-core/src/lib/general/gr_delay.cc
@@ -26,6 +26,7 @@
#include <gr_delay.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_delay_sptr
gr_make_delay (size_t itemsize, int delay)
diff --git a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
index accd25fb8..02385c59e 100644
--- a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
+++ b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
@@ -28,6 +28,7 @@
#include <gr_io_signature.h>
#include <string.h>
#include <stdexcept>
+#include <string.h>
static const int PAD_VAL = 0xAA;
diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc.cc b/gnuradio-core/src/lib/general/gr_fft_vcc.cc
index 05de7fbd4..d07f6fa07 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vcc.cc
+++ b/gnuradio-core/src/lib/general/gr_fft_vcc.cc
@@ -29,6 +29,7 @@
#include <gr_io_signature.h>
#include <gri_fft.h>
#include <math.h>
+#include <string.h>
gr_fft_vcc_sptr
gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> &window, bool shift)
diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
index a70be014c..f69d2e84e 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
+++ b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
@@ -28,6 +28,7 @@
#include <gr_io_signature.h>
#include <gri_fft.h>
#include <math.h>
+#include <string.h>
gr_fft_vcc_sptr
gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> &window, bool shift)
diff --git a/gnuradio-core/src/lib/general/gr_fft_vfc.cc b/gnuradio-core/src/lib/general/gr_fft_vfc.cc
index f6c14f981..c954e4443 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vfc.cc
+++ b/gnuradio-core/src/lib/general/gr_fft_vfc.cc
@@ -29,6 +29,7 @@
#include <gri_fft.h>
#include <math.h>
#include <stdexcept>
+#include <string.h>
// FIXME after this is working, change to use native real to complex fft.
diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc b/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
index 711345ed5..9da271bac 100644
--- a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
+++ b/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
@@ -28,6 +28,7 @@
#include <gr_io_signature.h>
#include <cstdio>
#include <stdexcept>
+#include <string.h>
#define VERBOSE 0
diff --git a/gnuradio-core/src/lib/general/gr_head.cc b/gnuradio-core/src/lib/general/gr_head.cc
index 7f0506cd9..94a00cc68 100644
--- a/gnuradio-core/src/lib/general/gr_head.cc
+++ b/gnuradio-core/src/lib/general/gr_head.cc
@@ -25,6 +25,7 @@
#endif
#include <gr_head.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_head::gr_head (size_t sizeof_stream_item, int nitems)
: gr_sync_block ("head",
diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
index 9fb99ea3e..e38240a3f 100644
--- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
+++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
@@ -26,6 +26,7 @@
#include <gr_keep_one_in_n.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_keep_one_in_n_sptr
gr_make_keep_one_in_n (size_t item_size, int n)
diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h
index 058fcfff2..4ea420920 100644
--- a/gnuradio-core/src/lib/general/gr_log2_const.h
+++ b/gnuradio-core/src/lib/general/gr_log2_const.h
@@ -31,16 +31,16 @@
template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; }
-template<> static inline int gr_log2_const<1>() { return 0; }
-template<> static inline int gr_log2_const<2>() { return 1; }
-template<> static inline int gr_log2_const<4>() { return 2; }
-template<> static inline int gr_log2_const<8>() { return 3; }
-template<> static inline int gr_log2_const<16>() { return 4; }
-template<> static inline int gr_log2_const<32>() { return 5; }
-template<> static inline int gr_log2_const<64>() { return 6; }
-template<> static inline int gr_log2_const<128>() { return 7; }
-template<> static inline int gr_log2_const<256>() { return 8; }
-template<> static inline int gr_log2_const<512>() { return 9; }
-template<> static inline int gr_log2_const<1024>(){ return 10; }
+template<> inline int gr_log2_const<1>() { return 0; }
+template<> inline int gr_log2_const<2>() { return 1; }
+template<> inline int gr_log2_const<4>() { return 2; }
+template<> inline int gr_log2_const<8>() { return 3; }
+template<> inline int gr_log2_const<16>() { return 4; }
+template<> inline int gr_log2_const<32>() { return 5; }
+template<> inline int gr_log2_const<64>() { return 6; }
+template<> inline int gr_log2_const<128>() { return 7; }
+template<> inline int gr_log2_const<256>() { return 8; }
+template<> inline int gr_log2_const<512>() { return 9; }
+template<> inline int gr_log2_const<1024>(){ return 10; }
#endif /* INCLUDED_GR_LOG2_CONST_H */
diff --git a/gnuradio-core/src/lib/general/gr_null_source.cc b/gnuradio-core/src/lib/general/gr_null_source.cc
index 82853ccf5..d11976e1b 100644
--- a/gnuradio-core/src/lib/general/gr_null_source.cc
+++ b/gnuradio-core/src/lib/general/gr_null_source.cc
@@ -26,6 +26,7 @@
#include <gr_null_source.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_null_source::gr_null_source (size_t sizeof_stream_item)
: gr_sync_block ("null_source",
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
index f634ed3f6..786584357 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
@@ -27,6 +27,7 @@
#include <gr_ofdm_bpsk_mapper.h>
#include <gr_io_signature.h>
#include <stdexcept>
+#include <string.h>
gr_ofdm_bpsk_mapper_sptr
gr_make_ofdm_bpsk_mapper (unsigned int msgq_limit,
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
index ab0c31a2c..7e4996b0b 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
@@ -32,6 +32,7 @@
#include <cstdio>
#include <stdexcept>
#include <iostream>
+#include <string.h>
#define VERBOSE 0
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc b/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc
index ba7a010ea..3706c3672 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc
@@ -27,6 +27,7 @@
#include <gr_io_signature.h>
#include <stdexcept>
#include <iostream>
+#include <string.h>
gr_ofdm_insert_preamble_sptr
gr_make_ofdm_insert_preamble(int fft_length,
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc b/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
index 0a3602cb2..56701b3c1 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
@@ -28,6 +28,7 @@
#include <gr_ofdm_mapper_bcv.h>
#include <gr_io_signature.h>
#include <stdexcept>
+#include <string.h>
gr_ofdm_mapper_bcv_sptr
gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit,
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
index 79d2a06c7..433b3bc31 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
@@ -27,6 +27,7 @@
#include <gr_ofdm_qam_mapper.h>
#include <gr_io_signature.h>
#include <stdexcept>
+#include <string.h>
gr_ofdm_qam_mapper_sptr
gr_make_ofdm_qam_mapper (unsigned int msgq_limit,
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
index 39c5bbdee..2c6fe5a55 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
@@ -27,6 +27,7 @@
#include <gr_ofdm_qpsk_mapper.h>
#include <gr_io_signature.h>
#include <stdexcept>
+#include <string.h>
gr_ofdm_qpsk_mapper_sptr
gr_make_ofdm_qpsk_mapper (unsigned int msgq_limit,
diff --git a/gnuradio-core/src/lib/general/gr_packet_sink.cc b/gnuradio-core/src/lib/general/gr_packet_sink.cc
index 8e8225112..0979f76d3 100644
--- a/gnuradio-core/src/lib/general/gr_packet_sink.cc
+++ b/gnuradio-core/src/lib/general/gr_packet_sink.cc
@@ -33,6 +33,7 @@
#include <fcntl.h>
#include <stdexcept>
#include <gr_count_bits.h>
+#include <string.h>
#define VERBOSE 0
diff --git a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
index a84cf189f..4f927bffe 100644
--- a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
+++ b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
@@ -26,6 +26,7 @@
#include <gr_peak_detector2_fb.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_peak_detector2_fb_sptr
gr_make_peak_detector2_fb (float threshold_factor_rise,
diff --git a/gnuradio-core/src/lib/general/gr_repeat.cc b/gnuradio-core/src/lib/general/gr_repeat.cc
index 5d6f93b30..aa1e17701 100644
--- a/gnuradio-core/src/lib/general/gr_repeat.cc
+++ b/gnuradio-core/src/lib/general/gr_repeat.cc
@@ -26,6 +26,7 @@
#include <gr_repeat.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_repeat_sptr
gr_make_repeat(size_t itemsize, int interp)
diff --git a/gnuradio-core/src/lib/general/gr_simple_correlator.cc b/gnuradio-core/src/lib/general/gr_simple_correlator.cc
index 5638ff721..0d575694b 100644
--- a/gnuradio-core/src/lib/general/gr_simple_correlator.cc
+++ b/gnuradio-core/src/lib/general/gr_simple_correlator.cc
@@ -30,6 +30,7 @@
#include <assert.h>
#include <stdexcept>
#include <gr_count_bits.h>
+#include <string.h>
static const int THRESHOLD = 3;
diff --git a/gnuradio-core/src/lib/general/gr_simple_framer.cc b/gnuradio-core/src/lib/general/gr_simple_framer.cc
index 33ae74e64..d2de09546 100644
--- a/gnuradio-core/src/lib/general/gr_simple_framer.cc
+++ b/gnuradio-core/src/lib/general/gr_simple_framer.cc
@@ -29,6 +29,7 @@
#include <gr_io_signature.h>
#include <assert.h>
#include <stdexcept>
+#include <string.h>
gr_simple_framer_sptr
diff --git a/gnuradio-core/src/lib/general/gr_skiphead.cc b/gnuradio-core/src/lib/general/gr_skiphead.cc
index 82b3390cf..45e3d5cb2 100644
--- a/gnuradio-core/src/lib/general/gr_skiphead.cc
+++ b/gnuradio-core/src/lib/general/gr_skiphead.cc
@@ -25,6 +25,7 @@
#endif
#include <gr_skiphead.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip)
: gr_block ("skiphead",
diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.cc b/gnuradio-core/src/lib/general/gr_stream_mux.cc
index 763bcf220..8ba138471 100644
--- a/gnuradio-core/src/lib/general/gr_stream_mux.cc
+++ b/gnuradio-core/src/lib/general/gr_stream_mux.cc
@@ -26,6 +26,7 @@
#include <gr_stream_mux.h>
#include <gr_io_signature.h>
+#include <string.h>
#define VERBOSE 0
diff --git a/gnuradio-core/src/lib/general/gr_stream_to_streams.cc b/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
index 1efbe31b6..b38a8d4d8 100644
--- a/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
+++ b/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
@@ -26,6 +26,7 @@
#include <gr_stream_to_streams.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_stream_to_streams_sptr
gr_make_stream_to_streams (size_t item_size, size_t nstreams)
diff --git a/gnuradio-core/src/lib/general/gr_stream_to_vector.cc b/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
index 739d38d83..fd233adca 100644
--- a/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
+++ b/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
@@ -26,6 +26,7 @@
#include <gr_stream_to_vector.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_stream_to_vector_sptr
gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block)
diff --git a/gnuradio-core/src/lib/general/gr_streams_to_stream.cc b/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
index f4c939e7c..6f6b49a82 100644
--- a/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
+++ b/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
@@ -26,6 +26,7 @@
#include <gr_streams_to_stream.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_streams_to_stream_sptr
gr_make_streams_to_stream (size_t item_size, size_t nstreams)
diff --git a/gnuradio-core/src/lib/general/gr_streams_to_vector.cc b/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
index c0d130b53..f3ee2c49a 100644
--- a/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
+++ b/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
@@ -26,6 +26,7 @@
#include <gr_streams_to_vector.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_streams_to_vector_sptr
gr_make_streams_to_vector (size_t item_size, size_t nstreams)
diff --git a/gnuradio-core/src/lib/general/gr_test.cc b/gnuradio-core/src/lib/general/gr_test.cc
index 9698c23a7..a04554ec4 100644
--- a/gnuradio-core/src/lib/general/gr_test.cc
+++ b/gnuradio-core/src/lib/general/gr_test.cc
@@ -28,6 +28,7 @@
#include <gr_io_signature.h>
#include <stdexcept>
#include <iostream>
+#include <string.h>
gr_test_sptr gr_make_test (const std::string &name,
int min_inputs, int max_inputs, unsigned int sizeof_input_item,
diff --git a/gnuradio-core/src/lib/general/gr_throttle.cc b/gnuradio-core/src/lib/general/gr_throttle.cc
index 87ae5e979..88219c1c8 100644
--- a/gnuradio-core/src/lib/general/gr_throttle.cc
+++ b/gnuradio-core/src/lib/general/gr_throttle.cc
@@ -29,6 +29,7 @@
#include <errno.h>
#include <stdio.h>
#include <math.h>
+#include <string.h>
#ifdef HAVE_TIME_H
#include <time.h>
#endif
diff --git a/gnuradio-core/src/lib/general/gr_vector_to_stream.cc b/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
index 39650aea6..149bc0d5b 100644
--- a/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
+++ b/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
@@ -26,6 +26,7 @@
#include <gr_vector_to_stream.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_vector_to_stream_sptr
gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block)
diff --git a/gnuradio-core/src/lib/general/gr_vector_to_streams.cc b/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
index cd3d82794..19f15b170 100644
--- a/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
+++ b/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
@@ -26,6 +26,7 @@
#include <gr_vector_to_streams.h>
#include <gr_io_signature.h>
+#include <string.h>
gr_vector_to_streams_sptr
gr_make_vector_to_streams (size_t item_size, size_t nstreams)
diff --git a/gnuradio-core/src/lib/general/malloc16.c b/gnuradio-core/src/lib/general/malloc16.c
index 2cc6135e7..331751499 100644
--- a/gnuradio-core/src/lib/general/malloc16.c
+++ b/gnuradio-core/src/lib/general/malloc16.c
@@ -7,6 +7,7 @@
#include "malloc16.h"
#include <string.h>
+#include <strings.h>
void *malloc16Align(int size){
void *p;
diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
index e6bd6cae5..ab61fb08d 100644
--- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
@@ -30,6 +30,7 @@
#include <gr_io_signature.h>
#include <assert.h>
#include <iostream>
+#include <string.h>
@SPTR_NAME@
gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D)
diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
index e2f6b5026..ce6316920 100644
--- a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
@@ -28,6 +28,7 @@
#include <@NAME@.h>
#include <gr_io_signature.h>
+#include <string.h>
@SPTR_NAME@
gr_make_@BASE_NAME@ (float threshold_factor_rise,
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
index a3a9a8c0e..2da66b7ae 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <stdio.h>
gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
index b2d7c6bfb..700ad4aef 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
@@ -32,6 +32,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <stdio.h>
+#include <string.h>
gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.cc b/gnuradio-core/src/lib/io/gr_file_sink_base.cc
index 1ce84fa88..29ac0dbb1 100644
--- a/gnuradio-core/src/lib/io/gr_file_sink_base.cc
+++ b/gnuradio-core/src/lib/io/gr_file_sink_base.cc
@@ -30,6 +30,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <stdio.h>
// win32 (mingw/msvc) specific
#ifdef HAVE_IO_H
diff --git a/gnuradio-core/src/lib/io/gr_file_source.cc b/gnuradio-core/src/lib/io/gr_file_source.cc
index 95d1c0aca..5591826d0 100644
--- a/gnuradio-core/src/lib/io/gr_file_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_source.cc
@@ -31,6 +31,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <stdio.h>
// win32 (mingw/msvc) specific
#ifdef HAVE_IO_H
diff --git a/gnuradio-core/src/lib/io/gr_message_sink.cc b/gnuradio-core/src/lib/io/gr_message_sink.cc
index 0cb1c0029..b9e0cc382 100644
--- a/gnuradio-core/src/lib/io/gr_message_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_message_sink.cc
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <string.h>
// public constructor that returns a shared_ptr
diff --git a/gnuradio-core/src/lib/io/gr_message_source.cc b/gnuradio-core/src/lib/io/gr_message_source.cc
index bf45318de..3fbe3708e 100644
--- a/gnuradio-core/src/lib/io/gr_message_source.cc
+++ b/gnuradio-core/src/lib/io/gr_message_source.cc
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
+#include <string.h>
// public constructor that returns a shared_ptr
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.cc b/gnuradio-core/src/lib/io/gr_udp_sink.cc
index 82cd5c29f..215eaf8d5 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.cc
@@ -28,6 +28,7 @@
#include <stdexcept>
#if defined(HAVE_SOCKET)
#include <netdb.h>
+#include <stdio.h>
typedef void* optval_t;
#else
#define SHUT_RDWR 2
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.cc b/gnuradio-core/src/lib/io/gr_udp_source.cc
index c65947ba6..9b6ee6e7d 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_source.cc
@@ -27,6 +27,8 @@
#include <gr_io_signature.h>
#include <stdexcept>
#include <errno.h>
+#include <stdio.h>
+#include <string.h>
#if defined(HAVE_SOCKET)
#include <netdb.h>
typedef void* optval_t;
diff --git a/gnuradio-core/src/lib/io/gri_logger.cc b/gnuradio-core/src/lib/io/gri_logger.cc
index dbaace689..c085a93c8 100644
--- a/gnuradio-core/src/lib/io/gri_logger.cc
+++ b/gnuradio-core/src/lib/io/gri_logger.cc
@@ -29,6 +29,7 @@
#include <stdarg.h>
#include <stdexcept>
#include <boost/weak_ptr.hpp>
+#include <string.h>
/*
diff --git a/gnuradio-core/src/lib/reed-solomon/decode_rs.c b/gnuradio-core/src/lib/reed-solomon/decode_rs.c
index ca409782f..27ddd8532 100644
--- a/gnuradio-core/src/lib/reed-solomon/decode_rs.c
+++ b/gnuradio-core/src/lib/reed-solomon/decode_rs.c
@@ -8,6 +8,7 @@
#endif
#include <string.h>
+#include <strings.h>
#define NULL ((void *)0)
#define min(a,b) ((a) < (b) ? (a) : (b))
diff --git a/gnuradio-core/src/lib/reed-solomon/encode_rs.c b/gnuradio-core/src/lib/reed-solomon/encode_rs.c
index 9d56d0bf1..147f0a9e3 100644
--- a/gnuradio-core/src/lib/reed-solomon/encode_rs.c
+++ b/gnuradio-core/src/lib/reed-solomon/encode_rs.c
@@ -3,6 +3,7 @@
* May be used under the terms of the GNU General Public License (GPL)
*/
#include <string.h>
+#include <strings.h>
#ifdef FIXED
#include "fixed.h"
diff --git a/gnuradio-core/src/lib/reed-solomon/exercise.c b/gnuradio-core/src/lib/reed-solomon/exercise.c
index 91d43e157..1e04f618d 100644
--- a/gnuradio-core/src/lib/reed-solomon/exercise.c
+++ b/gnuradio-core/src/lib/reed-solomon/exercise.c
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#ifdef FIXED
#include "fixed.h"
diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc b/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
index 1b0a1d7a3..e165361fc 100644
--- a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
+++ b/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
@@ -27,6 +27,7 @@
#include <gr_dispatcher.h>
#include <math.h>
#include <errno.h>
+#include <stdio.h>
#ifdef HAVE_SELECT
# ifdef HAVE_SYS_SELECT_H
diff --git a/gnuradio-core/src/lib/runtime/gr_error_handler.cc b/gnuradio-core/src/lib/runtime/gr_error_handler.cc
index 4b4cdacef..6dbb0a5d2 100644
--- a/gnuradio-core/src/lib/runtime/gr_error_handler.cc
+++ b/gnuradio-core/src/lib/runtime/gr_error_handler.cc
@@ -48,6 +48,7 @@
#include <assert.h>
#include <stdexcept>
#include <unistd.h>
+#include <stdio.h>
#ifdef HAVE_IO_H
#include <io.h>
diff --git a/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc b/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
index c6448f872..adad55791 100644
--- a/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
+++ b/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
@@ -27,6 +27,7 @@
#include <gr_local_sighandler.h>
#include <stdexcept>
#include <stdio.h>
+#include <string.h>
gr_local_sighandler::gr_local_sighandler (int signum,
diff --git a/gnuradio-core/src/lib/runtime/gr_message.cc b/gnuradio-core/src/lib/runtime/gr_message.cc
index f14ed9d9c..6bef71ed5 100644
--- a/gnuradio-core/src/lib/runtime/gr_message.cc
+++ b/gnuradio-core/src/lib/runtime/gr_message.cc
@@ -25,6 +25,7 @@
#endif
#include <gr_message.h>
#include <assert.h>
+#include <string.h>
static long s_ncurrently_allocated = 0;
diff --git a/gnuradio-core/src/lib/runtime/gr_preferences.cc b/gnuradio-core/src/lib/runtime/gr_preferences.cc
index 16c9bcafe..e0be2db62 100644
--- a/gnuradio-core/src/lib/runtime/gr_preferences.cc
+++ b/gnuradio-core/src/lib/runtime/gr_preferences.cc
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <string.h>
#ifdef MKDIR_TAKES_ONE_ARG
diff --git a/gnuradio-core/src/lib/runtime/gr_realtime.cc b/gnuradio-core/src/lib/runtime/gr_realtime.cc
index 35d0ef381..d3cda0eaa 100644
--- a/gnuradio-core/src/lib/runtime/gr_realtime.cc
+++ b/gnuradio-core/src/lib/runtime/gr_realtime.cc
@@ -61,6 +61,7 @@ gr_enable_realtime_scheduling()
#elif defined(HAVE_PTHREAD_SETSCHEDPARAM)
#include <pthread.h>
+#include <stdio.h>
gr_rt_status_t
gr_enable_realtime_scheduling()
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc b/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
index bc8f9b97e..07bd60500 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
+++ b/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
@@ -26,6 +26,7 @@
#include <gr_scheduler_thread.h>
#include <iostream>
+#include <stdio.h>
#ifdef HAVE_SIGNAL_H
#include <signal.h>
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
index a70229610..abcf5b2a6 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
@@ -28,6 +28,7 @@
#include <stdexcept>
#include <gr_preferences.h>
#include <stdio.h>
+#include <string.h>
#include <gr_local_sighandler.h>
// all the factories we know about
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
index 173b3f732..faae4b396 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
@@ -41,7 +41,6 @@
#include <gr_pagesize.h>
#include <gr_tmp_path.h>
-
gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size)
: gr_vmcircbuf (size)
{
diff --git a/gnuradio-core/src/tests/benchmark_nco.cc b/gnuradio-core/src/tests/benchmark_nco.cc
index 961442fc9..9c4eff346 100644
--- a/gnuradio-core/src/tests/benchmark_nco.cc
+++ b/gnuradio-core/src/tests/benchmark_nco.cc
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <gr_nco.h>
#include <gr_fxpt_nco.h>
+#include <string.h>
#define ITERATIONS 20000000
#define BLOCK_SIZE (10 * 1000) // fits in cache
diff --git a/gnuradio-core/src/tests/benchmark_vco.cc b/gnuradio-core/src/tests/benchmark_vco.cc
index 5b39bf15e..ed0ae3b67 100644
--- a/gnuradio-core/src/tests/benchmark_vco.cc
+++ b/gnuradio-core/src/tests/benchmark_vco.cc
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <gr_vco.h>
#include <gr_fxpt_vco.h>
+#include <string.h>
#define ITERATIONS 5000000
#define BLOCK_SIZE (10 * 1000) // fits in cache
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
index d0fc5bcc1..dbd864be5 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc
+++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
@@ -27,6 +27,7 @@
#include <atsc_bit_timing_loop.h>
#include <gr_io_signature.h>
#include <atsc_consts.h>
+#include <string.h>
// Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz
float input_rate = 19.2e6;
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/src/lib/atsci_reed_solomon.cc
index 24645b0f6..e20e76d71 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.cc
+++ b/gr-atsc/src/lib/atsci_reed_solomon.cc
@@ -22,6 +22,7 @@
#include <atsci_reed_solomon.h>
#include <assert.h>
+#include <string.h>
extern "C" {
#include "rs.h"
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/src/lib/atsci_sliding_correlator.h
index 66c49e574..d6efd3409 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.h
+++ b/gr-atsc/src/lib/atsci_sliding_correlator.h
@@ -19,11 +19,12 @@
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
+#include <string>
+#include <string.h>
+
#ifndef _ATSC_SLIDING_CORRELATOR_H_
#define _ATSC_SLIDING_CORRELATOR_H_
-#include <string>
-
extern const unsigned char atsc_pn511[511];
extern const unsigned char atsc_pn63[63];
diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc
index 690647e1a..e3f82547b 100644
--- a/gr-atsc/src/lib/atsci_sssr.cc
+++ b/gr-atsc/src/lib/atsci_sssr.cc
@@ -27,6 +27,7 @@
#include <assert.h>
#include <atsci_diag_output.h>
#include <gr_math.h>
+#include <stdio.h>
/*
* ----------------------------------------------------------------
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.cc b/gr-atsc/src/lib/atsci_trellis_encoder.cc
index b3bfb84d6..2ebccc371 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.cc
+++ b/gr-atsc/src/lib/atsci_trellis_encoder.cc
@@ -23,6 +23,7 @@
#include <atsci_trellis_encoder.h>
#include <assert.h>
#include <stdio.h>
+#include <string.h>
static const int DIBITS_PER_BYTE = 4;
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.cc b/gr-atsc/src/lib/atsci_viterbi_decoder.cc
index 66d0189a8..5b9ae4e10 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.cc
+++ b/gr-atsc/src/lib/atsci_viterbi_decoder.cc
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <cmath>
#include "atsci_viterbi_mux.cc"
+#include <string.h>
/* How many separate Trellis encoders / Viterbi decoders run in parallel */
diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/src/lib/interleaver_fifo.h
index 6d1a44580..98764af49 100644
--- a/gr-atsc/src/lib/interleaver_fifo.h
+++ b/gr-atsc/src/lib/interleaver_fifo.h
@@ -26,6 +26,7 @@
#include <interleaver_fifo.h>
#include <string.h>
+#include <strings.h>
/*!
* \brief template class for interleaver fifo
diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
index 63a9e0a64..e76a2f1f5 100644
--- a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
+++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
@@ -22,6 +22,7 @@
#include <cppunit/TestAssert.h>
#include <qa_atsci_data_interleaver.h>
+#include <string.h>
/*!
diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
index e7a041ba0..85584f55f 100644
--- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
+++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
@@ -28,6 +28,7 @@
#include <cppunit/TestAssert.h>
#include <assert.h>
#include <iostream>
+#include <string.h>
using std::cerr;
using std::endl;
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
index 98cb9a0a0..f50f3b6b8 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
@@ -29,6 +29,7 @@
#include <atsci_fake_single_viterbi.h>
#include <qa_atsci_fake_single_viterbi.h>
#include <random.h>
+#include <string.h>
static const int NTRIALS = 50;
diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.cc b/gr-atsc/src/lib/qa_atsci_randomizer.cc
index d4f7d19dd..b2d0bde8a 100644
--- a/gr-atsc/src/lib/qa_atsci_randomizer.cc
+++ b/gr-atsc/src/lib/qa_atsci_randomizer.cc
@@ -23,6 +23,7 @@
#include <qa_atsci_randomizer.h>
#include <cppunit/TestAssert.h>
+#include <string.h>
static unsigned int expected_initial_states[] = {
0x018f,
diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
index 58cce0457..b08c8af52 100644
--- a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
+++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <atsci_reed_solomon.h>
#include <qa_atsci_reed_solomon.h>
+#include <string.h>
static const int NROOTS = 20;
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
index 36e9592b7..d7c29097e 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
@@ -30,6 +30,7 @@
#include <atsci_single_viterbi.h>
#include <qa_atsci_single_viterbi.h>
#include <random.h>
+#include <string.h>
static const int NTRIALS = 50;
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
index bfb2d6872..390776e82 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
+++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
@@ -30,6 +30,7 @@
#include <string.h>
#include <stdlib.h>
#include <time.h>
+#include <string.h>
#define NELEM(x) (sizeof (x) / sizeof (x[0]))
diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.cc b/gr-audio-portaudio/src/audio_portaudio_sink.cc
index 13197192f..49c76a5f1 100644
--- a/gr-audio-portaudio/src/audio_portaudio_sink.cc
+++ b/gr-audio-portaudio/src/audio_portaudio_sink.cc
@@ -33,6 +33,7 @@
#include <stdexcept>
#include <gri_portaudio.h>
#include <omnithread.h>
+#include <string.h>
#define LOGGING 0 // define to 0 or 1
diff --git a/gr-audio-portaudio/src/audio_portaudio_source.cc b/gr-audio-portaudio/src/audio_portaudio_source.cc
index 653c16e02..4ea4eeb9c 100644
--- a/gr-audio-portaudio/src/audio_portaudio_source.cc
+++ b/gr-audio-portaudio/src/audio_portaudio_source.cc
@@ -33,6 +33,7 @@
#include <stdexcept>
#include <gri_portaudio.h>
#include <omnithread.h>
+#include <string.h>
#define LOGGING 0 // define to 0 or 1
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
index fbddd705c..6b44c57e5 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
+++ b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
@@ -31,6 +31,7 @@
#include <cvsd_decode_bs.h>
#include <gr_io_signature.h>
+#include <limits.h>
/*
* Create a new instance of cvsd_decode_bs and return
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
index d6a281ce8..c2d13d19b 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
+++ b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
@@ -31,6 +31,7 @@
#include <cvsd_encode_sb.h>
#include <gr_io_signature.h>
+#include <limits.h>
/*
* Create a new instance of cvsd_encode_sb and return
diff --git a/gr-gcell/src/gcell_fft_vcc.cc b/gr-gcell/src/gcell_fft_vcc.cc
index 4b781696d..0491db9ab 100644
--- a/gr-gcell/src/gcell_fft_vcc.cc
+++ b/gr-gcell/src/gcell_fft_vcc.cc
@@ -32,6 +32,7 @@
#include <math.h>
#include <assert.h>
#include <stdexcept>
+#include <string.h>
#define MIN_FFT_SIZE 32
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/code.c b/gr-gsm-fr-vocoder/src/lib/gsm/code.c
index 739554294..19af507b7 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/code.c
+++ b/gr-gsm-fr-vocoder/src/lib/gsm/code.c
@@ -19,6 +19,7 @@
#include "private.h"
#include "gsm.h"
#include "proto.h"
+#include <string.h>
/*
* 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c b/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
index a59aa2f2a..de0b125b4 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
+++ b/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
@@ -30,6 +30,7 @@ static char const ident[] = "$Header$";
#include "gsm.h"
#include "private.h"
#include "proto.h"
+#include <strings.h>
gsm gsm_create P0()
{
diff --git a/gr-trellis/src/lib/fsm.cc b/gr-trellis/src/lib/fsm.cc
index 4856dc231..cddb7e665 100644
--- a/gr-trellis/src/lib/fsm.cc
+++ b/gr-trellis/src/lib/fsm.cc
@@ -26,6 +26,7 @@
#include <fstream>
#include <stdexcept>
#include <cmath>
+#include <stdlib.h>
#include "base.h"
#include "fsm.h"
diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h
index 2e364a678..e015a37fb 100644
--- a/gr-trellis/src/lib/fsm.h
+++ b/gr-trellis/src/lib/fsm.h
@@ -24,6 +24,7 @@
#define INCLUDED_TRELLIS_FSM_H
#include <vector>
+#include <iosfwd>
/*!
* \brief FSM class
diff --git a/gr-trellis/src/lib/trellis_permutation.cc b/gr-trellis/src/lib/trellis_permutation.cc
index 161b6ee49..c80d820cd 100644
--- a/gr-trellis/src/lib/trellis_permutation.cc
+++ b/gr-trellis/src/lib/trellis_permutation.cc
@@ -27,6 +27,7 @@
#include <trellis_permutation.h>
#include <gr_io_signature.h>
#include <iostream>
+#include <string.h>
trellis_permutation_sptr
trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT)
diff --git a/gr-video-sdl/src/video_sdl_sink_s.cc b/gr-video-sdl/src/video_sdl_sink_s.cc
index cc37c44d3..825cd80cb 100644
--- a/gr-video-sdl/src/video_sdl_sink_s.cc
+++ b/gr-video-sdl/src/video_sdl_sink_s.cc
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <iostream>
#include <stdexcept>
+#include <string.h>
diff --git a/gr-video-sdl/src/video_sdl_sink_uc.cc b/gr-video-sdl/src/video_sdl_sink_uc.cc
index c141a8745..2d25399a8 100644
--- a/gr-video-sdl/src/video_sdl_sink_uc.cc
+++ b/gr-video-sdl/src/video_sdl_sink_uc.cc
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <iostream>
#include <stdexcept>
+#include <string.h>
diff --git a/pmt/src/lib/pmt.cc b/pmt/src/lib/pmt.cc
index b2c04b390..a141224b3 100644
--- a/pmt/src/lib/pmt.cc
+++ b/pmt/src/lib/pmt.cc
@@ -28,6 +28,7 @@
#include "pmt_int.h"
#include <stdio.h>
#include <pmt_pool.h>
+#include <string.h>
static const int CACHE_LINE_SIZE = 64; // good guess
diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index 88a438d55..620287d46 100644
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -30,6 +30,7 @@
#include "usrp_prims.h"
#include "usrp_spi_defs.h"
+#include <string.h>
char *prog_name;
diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.cc b/usrp/host/lib/inband/qa_inband_packet_prims.cc
index 868a1e064..d9bbbec22 100644
--- a/usrp/host/lib/inband/qa_inband_packet_prims.cc
+++ b/usrp/host/lib/inband/qa_inband_packet_prims.cc
@@ -26,6 +26,7 @@
#include <qa_inband_packet_prims.h>
#include <cppunit/TestAssert.h>
#include <stdio.h>
+#include <string.h>
#include <usrp_inband_usb_packet.h> // will change on gigabit crossover
typedef usrp_inband_usb_packet transport_pkt;
diff --git a/usrp/host/lib/inband/test_usrp_inband.cc b/usrp/host/lib/inband/test_usrp_inband.cc
index dd8d46f84..64fbf3a97 100644
--- a/usrp/host/lib/inband/test_usrp_inband.cc
+++ b/usrp/host/lib/inband/test_usrp_inband.cc
@@ -24,6 +24,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#include <iostream>
#include <usrp_inband_usb_packet.h>
#include <mb_mblock.h>
diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.cc b/usrp/host/lib/inband/usrp_inband_usb_packet.cc
index b8befa493..ee4cb22f3 100644
--- a/usrp/host/lib/inband/usrp_inband_usb_packet.cc
+++ b/usrp/host/lib/inband/usrp_inband_usb_packet.cc
@@ -28,6 +28,7 @@
#include <usrp_bytesex.h>
#include <iostream>
#include <stdio.h>
+#include <string.h>
bool usrp_inband_usb_packet::align32()
{
diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/host/lib/inband/usrp_rx_stub.cc
index 5ea8135aa..4bdb106b1 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.cc
+++ b/usrp/host/lib/inband/usrp_rx_stub.cc
@@ -33,6 +33,7 @@
#include <fpga_regs_common.h>
#include "usrp_standard.h"
#include <stdio.h>
+#include <string.h>
#include <ui_nco.h>
#include <fstream>
diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/host/lib/inband/usrp_server.cc
index d73c7d525..1948a43b2 100644
--- a/usrp/host/lib/inband/usrp_server.cc
+++ b/usrp/host/lib/inband/usrp_server.cc
@@ -28,6 +28,7 @@
#include <mb_class_registry.h>
#include <vector>
#include <usrp_usb_interface.h>
+#include <string.h>
#include <symbols_usrp_server_cs.h>
#include <symbols_usrp_channel.h>
@@ -35,6 +36,7 @@
#include <symbols_usrp_rx.h>
#include <symbols_usrp_low_level_cs.h>
#include <symbols_usrp_interface_cs.h>
+
static pmt_t s_shutdown = pmt_intern("%shutdown");
typedef usrp_inband_usb_packet transport_pkt; // makes conversion to gigabit easy
diff --git a/usrp/host/lib/legacy/fusb_win32.cc b/usrp/host/lib/legacy/fusb_win32.cc
index eee373272..8900576d9 100644
--- a/usrp/host/lib/legacy/fusb_win32.cc
+++ b/usrp/host/lib/legacy/fusb_win32.cc
@@ -28,6 +28,7 @@
#include <usb.h>
#include <assert.h>
#include <stdexcept>
+#include <string.h>
static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();
static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
diff --git a/usrp/host/lib/legacy/usrp_basic.cc b/usrp/host/lib/legacy/usrp_basic.cc
index 8bb4a191e..f67300306 100644
--- a/usrp/host/lib/legacy/usrp_basic.cc
+++ b/usrp/host/lib/legacy/usrp_basic.cc
@@ -34,6 +34,7 @@
#include <assert.h>
#include <math.h>
#include <ad9862.h>
+#include <string.h>
using namespace ad9862;
diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.cc b/usrp/host/lib/legacy/usrp_local_sighandler.cc
index b87a7656b..69cde0b37 100644
--- a/usrp/host/lib/legacy/usrp_local_sighandler.cc
+++ b/usrp/host/lib/legacy/usrp_local_sighandler.cc
@@ -32,6 +32,7 @@
#include <usrp_local_sighandler.h>
#include <stdexcept>
#include <stdio.h>
+#include <string.h>
usrp_local_sighandler::usrp_local_sighandler (int signum,
void (*new_handler)(int))
diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/legacy/usrp_prims.cc
index 8fe87a723..0034bb31e 100644
--- a/usrp/host/lib/legacy/usrp_prims.cc
+++ b/usrp/host/lib/legacy/usrp_prims.cc
@@ -62,6 +62,7 @@ static char *default_firmware_filename = "std.ihx";
static char *default_fpga_filename = "std_2rxhb_2tx.rbf";
#include "std_paths.h"
+#include <stdio.h>
static char *
find_file (const char *filename, int hw_rev)
diff --git a/usrp/host/misc/getopt.c b/usrp/host/misc/getopt.c
index 75be3307c..34eeaa6a4 100644
--- a/usrp/host/misc/getopt.c
+++ b/usrp/host/misc/getopt.c
@@ -52,6 +52,7 @@ char *alloca ();
#endif
#include <stdio.h>
+#include <string.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C