diff --git a/swig/graph.i b/swig/graph.i
index e5cc85b..48ee34f 100644
--- a/swig/graph.i
+++ b/swig/graph.i
@@ -1,6 +1,5 @@
 %{
 //<code(py_graph)>
-
 #define GR_HAVE_USER_HINT         0x00000001
 #define GR_HAVE_CLICKED           0x00000002
 #define GR_HAVE_DBL_CLICKED       0x00000004
@@ -24,8 +23,6 @@
 #define S_M_THIS                  "_this"
 #define S_M_TITLE                 "_title"
 
-#include <map>
-
 class py_graph_t
 {
 private:
@@ -772,7 +769,6 @@ void pyg_select_node(PyObject *self, int nid)
 #undef S_M_NODES
 #undef S_M_THIS
 #undef S_M_TITLE
-
 //</code(py_graph)>
 %}
 
diff --git a/swig/kernwin.i b/swig/kernwin.i
index 3effb04..704e06a 100644
--- a/swig/kernwin.i
+++ b/swig/kernwin.i
@@ -155,12 +155,6 @@ uint32 choose_choose(PyObject *self,
 %{
 
 //<code(py_choose2)>
-#include "Python.h"
-
-//-------------------------------------------------------------------------
-// Chooser2 wrapper class
-//-------------------------------------------------------------------------
-#include <map>
 
 //------------------------------------------------------------------------
 static PyObject *PyObject_TryGetAttrString(PyObject *object, const char *attr)
@@ -774,10 +768,6 @@ PyObject *choose2_find(const char *title)
   return c2->get_self();
 }
 #endif
-//-------------------------------------------------------------------------
-// End of Chooser2 wrapper class
-//-------------------------------------------------------------------------
-
 //</code(py_choose2)>
 uint32 idaapi choose_sizer(void *self)
 {