6 files changed, 7 insertions, 5 deletions
diff --git a/gnuradio-runtime/swig/gnuradio.i b/gnuradio-runtime/swig/gnuradio.i
index 39b8677759..0789d1ad82 100644
--- a/gnuradio-runtime/swig/gnuradio.i
+++ b/gnuradio-runtime/swig/gnuradio.i
@@ -43,6 +43,12 @@
 
 %feature("autodoc","1");
 
+// Required for a bug in SWIG 2.0.4 with GCC 4.6
+// see: http://sourceforge.net/p/swig/bugs/1187/
+%{
+#include <cstddef>
+%}
+
 // local file
 %include <gr_shared_ptr.i>
 %include <std_except.i>
diff --git a/gnuradio-runtime/swig/pmt_swig.i b/gnuradio-runtime/swig/pmt_swig.i
index 55b78fb42a..11e9c96d81 100644
--- a/gnuradio-runtime/swig/pmt_swig.i
+++ b/gnuradio-runtime/swig/pmt_swig.i
@@ -44,8 +44,8 @@
 %include "pmt_swig_doc.i"
 
 %include <gr_extras.i>
-%include <gr_types.i>
 
+%include <std_vector.i>
 %template(pmt_vector_uint32) std::vector<uint32_t>;
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/gr-blocks/swig/blocks_swig0.i b/gr-blocks/swig/blocks_swig0.i
index b7cbcc0ba3..ec5b75b0d1 100644
--- a/gr-blocks/swig/blocks_swig0.i
+++ b/gr-blocks/swig/blocks_swig0.i
@@ -22,7 +22,6 @@
 
 #define BLOCKS_API
 
-//%include "runtime_swig.i"
 %include "gnuradio.i"
 
 %include "blocks_swig0_doc.i"
diff --git a/gr-blocks/swig/blocks_swig3.i b/gr-blocks/swig/blocks_swig3.i
index 4327af3332..7e7e8bf365 100644
--- a/gr-blocks/swig/blocks_swig3.i
+++ b/gr-blocks/swig/blocks_swig3.i
@@ -22,7 +22,6 @@
 
 #define BLOCKS_API
 
-//%include "runtime_swig.i"
 %include "gnuradio.i"
 
 //load generated python docstrings
diff --git a/gr-blocks/swig/blocks_swig4.i b/gr-blocks/swig/blocks_swig4.i
index fe2e12c917..2aa6af5408 100644
--- a/gr-blocks/swig/blocks_swig4.i
+++ b/gr-blocks/swig/blocks_swig4.i
@@ -22,7 +22,6 @@
 
 #define BLOCKS_API
 
-//%include "runtime_swig.i"
 %include "gnuradio.i"
 %include "gnuradio/blocks/pdu.h"
 
diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig5.i
index 19cf606a94..1b99720be8 100644
--- a/gr-blocks/swig/blocks_swig5.i
+++ b/gr-blocks/swig/blocks_swig5.i
@@ -22,7 +22,6 @@
 
 #define BLOCKS_API
 
-//%include "runtime_swig.i"
 %include "gnuradio.i"
 %include "gnuradio/blocks/pdu.h"