diff --git a/common/swig/kicad.i b/common/swig/kicad.i
index f0a03dad68..53c2c28840 100644
--- a/common/swig/kicad.i
+++ b/common/swig/kicad.i
@@ -130,6 +130,9 @@ principle should be easily implemented by adapting the current STL containers.
 #include <../polygon/PolyLine.h>
 %include <../polygon/PolyLine.h>
 
+#include <geometry/shape.h>
+%include <geometry/shape.h>
+
 #include <geometry/shape_poly_set.h>
 %include <geometry/shape_poly_set.h>
 
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.h b/pcbnew/exporters/gendrill_Excellon_writer.h
index 6267571fa4..e5deef2f37 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.h
+++ b/pcbnew/exporters/gendrill_Excellon_writer.h
@@ -51,7 +51,7 @@ private:
 public:
     EXCELLON_WRITER( BOARD* aPcb );
 
-    ~EXCELLON_WRITER()
+    virtual ~EXCELLON_WRITER()
     {
     }
 
diff --git a/pcbnew/exporters/gendrill_file_writer_base.h b/pcbnew/exporters/gendrill_file_writer_base.h
index 55b1507bd7..2f18fe9e05 100644
--- a/pcbnew/exporters/gendrill_file_writer_base.h
+++ b/pcbnew/exporters/gendrill_file_writer_base.h
@@ -163,7 +163,7 @@ protected:
     }
 
 public:
-    ~GENDRILL_WRITER_BASE()
+    virtual ~GENDRILL_WRITER_BASE()
     {
     }
 
diff --git a/pcbnew/exporters/gendrill_gerber_writer.h b/pcbnew/exporters/gendrill_gerber_writer.h
index 2f28b3d9aa..f03aba7385 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.h
+++ b/pcbnew/exporters/gendrill_gerber_writer.h
@@ -42,7 +42,7 @@ class GERBER_WRITER: public GENDRILL_WRITER_BASE
 public:
     GERBER_WRITER( BOARD* aPcb );
 
-    ~GERBER_WRITER()
+    virtual ~GERBER_WRITER()
     {
     }
 
diff --git a/pcbnew/swig/pcbnew.i b/pcbnew/swig/pcbnew.i
index ddfc1516b4..ceae48b637 100644
--- a/pcbnew/swig/pcbnew.i
+++ b/pcbnew/swig/pcbnew.i
@@ -65,7 +65,9 @@ class BASE_SET {};
 
 #include <plotcontroller.h>
 #include <pcb_plot_params.h>
+#include <exporters/gendrill_file_writer_base.h>
 #include <exporters/gendrill_Excellon_writer.h>
+#include <exporters/gendrill_gerber_writer.h>
 
 BOARD *GetBoard(); /* get current editor board */
 %}
@@ -102,7 +104,9 @@ HANDLE_EXCEPTIONS(PLUGIN::FootprintDelete)
 %include <plotcontroller.h>
 %include <pcb_plot_params.h>
 %include <plot_common.h>
+%include <exporters/gendrill_file_writer_base.h>
 %include <exporters/gendrill_Excellon_writer.h>
+%include <exporters/gendrill_gerber_writer.h>
 %include <gal/color4d.h>
 %include <id.h>