2 files changed, 8 insertions, 7 deletions
diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h
index eac8845448..c3de303c3b 100644
--- a/gnuradio-runtime/include/gnuradio/block.h
+++ b/gnuradio-runtime/include/gnuradio/block.h
@@ -684,8 +684,6 @@ namespace gr {
     bool                  d_update_rate;           // should sched update rel rate?
     bool d_finished;    // true if msg ports think we are finished
 
-    static const pmt::pmt_t d_pmt_done;
-
   protected:
     block(void) {} // allows pure virtual interface sub-classes
     block(const std::string &name,
@@ -863,9 +861,13 @@ namespace gr {
     // These are really only for internal use, but leaving them public avoids
     // having to work up an ever-varying list of friend GR_RUNTIME_APIs
 
+    /*! PMT Symbol for "hey, we're done here"
+     */
+    const pmt::pmt_t d_pmt_done;
+
     /*! PMT Symbol of the system port, `pmt::mp("system")`
      */
-    static const pmt::pmt_t d_system_port;
+    const pmt::pmt_t d_system_port;
 
   public:
     block_detail_sptr detail() const { return d_detail; }
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index c7eafb0fc7..86c4aa701f 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -34,9 +34,6 @@
 
 namespace gr {
 
-  const pmt::pmt_t block::d_system_port = pmt::intern("system");
-  const pmt::pmt_t block::d_pmt_done = pmt::intern("done");
-
   block::block(const std::string &name,
                io_signature::sptr input_signature,
                io_signature::sptr output_signature)
@@ -57,7 +54,9 @@ namespace gr {
       d_pc_rpc_set(false),
       d_update_rate(false),
       d_max_output_buffer(std::max(output_signature->max_streams(),1), -1),
-      d_min_output_buffer(std::max(output_signature->max_streams(),1), -1)
+      d_min_output_buffer(std::max(output_signature->max_streams(),1), -1),
+      d_pmt_done(pmt::intern("done")),
+      d_system_port(pmt::intern("system"))
   {
     global_block_registry.register_primitive(alias(), this);
     message_port_register_in(d_system_port);