diff --git a/swig/annotationchannel.i b/swig/annotationchannel.i
index 4010424e180a6d9033e7d03ff9c6bb52f249f9f5..1d9c8da92b2db76899fc4fde8e07e49c6e2bb8e2 100644
--- a/swig/annotationchannel.i
+++ b/swig/annotationchannel.i
@@ -8,9 +8,11 @@
 
 %include "std_string.i"
 %include "std_vector.i"
+
 %include "iob.i"
+%include "std_defs.i"
 
-%template(IntVector) std::vector<int>;
+// %template(IntVector) std::vector<int>;
 %template(IOBVector) std::vector<Corpus2::IOB::Enum>;
 %template(AnnotationVector) std::vector<Corpus2::Annotation>;
 
diff --git a/swig/chunk.i b/swig/chunk.i
index ac9b2e0b90de7c049d1807f6097170d4b83d224a..08412c3935fc602bf4c2f6021a7679acd02cdf93 100644
--- a/swig/chunk.i
+++ b/swig/chunk.i
@@ -7,6 +7,8 @@
 %}
 
 
+%include "std_defs.i"
+
 %include "std_set.i"
 %include "std_map.i"
 %include "std_pair.i"
@@ -18,7 +20,7 @@
 
 %template(ChunkPtr) boost::shared_ptr<Corpus2::Chunk>;
 %template(SentencePtrVector) std::vector<boost::shared_ptr<Sentence> >;
-%template(attr_map_t) std::map<std::string, std::string>;
+// %template(attr_map_t) std::map<std::string, std::string>;
 
 namespace Corpus2 {
   class Chunk {
diff --git a/swig/tagset.i b/swig/tagset.i
index 3df9d956c221a983ca83a29d2aef632ba26643d6..f4305db95e85f9f74d17f4c2cb64fa2b8a96609c 100644
--- a/swig/tagset.i
+++ b/swig/tagset.i
@@ -9,13 +9,14 @@
 %include "tag.i"
 %include "exception.i"
 
+%include "std_defs.i"
 %include "std_string.i"
 %include "std_vector.i"
 
 %feature("notabstract") Corpus2::Tagset;
 
 %template(TagVector) std::vector<Corpus2::Tag>;
-%template(StdStringVector) std::vector<std::string>;
+// %template(StdStringVector) std::vector<std::string>;
 
 namespace Corpus2 {
   class Tagset;