3c2829
diff --git a/lib/ExtUtils/ParseXS.pm b/lib/ExtUtils/ParseXS.pm
3c2829
index f67a82d..32d74e1 100644
3c2829
--- a/lib/ExtUtils/ParseXS.pm
3c2829
+++ b/lib/ExtUtils/ParseXS.pm
3c2829
@@ -11,7 +11,7 @@ use Symbol;
3c2829
 
3c2829
 our $VERSION;
3c2829
 BEGIN {
3c2829
-  $VERSION = '3.30';
3c2829
+  $VERSION = '3.31';
3c2829
 }
3c2829
 use ExtUtils::ParseXS::Constants $VERSION;
3c2829
 use ExtUtils::ParseXS::CountLines $VERSION;
3c2829
@@ -579,7 +579,7 @@ EOF
3c2829
           } );
3c2829
         }
3c2829
         else {
3c2829
-          print "\t$class *";
3c2829
+          print "\t" . map_type($self, "$class *");
3c2829
           $self->{var_types}->{"THIS"} = "$class *";
3c2829
           $self->generate_init( {
3c2829
             type          => "$class *",
3c2829
diff --git a/lib/ExtUtils/ParseXS/Constants.pm b/lib/ExtUtils/ParseXS/Constants.pm
3c2829
index 8856551..2319a24 100644
3c2829
--- a/lib/ExtUtils/ParseXS/Constants.pm
3c2829
+++ b/lib/ExtUtils/ParseXS/Constants.pm
3c2829
@@ -3,7 +3,7 @@ use strict;
3c2829
 use warnings;
3c2829
 use Symbol;
3c2829
 
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 =head1 NAME
3c2829
 
3c2829
diff --git a/lib/ExtUtils/ParseXS/CountLines.pm b/lib/ExtUtils/ParseXS/CountLines.pm
3c2829
index 2f45292..222a95c 100644
3c2829
--- a/lib/ExtUtils/ParseXS/CountLines.pm
3c2829
+++ b/lib/ExtUtils/ParseXS/CountLines.pm
3c2829
@@ -1,7 +1,7 @@
3c2829
 package ExtUtils::ParseXS::CountLines;
3c2829
 use strict;
3c2829
 
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 our $SECTION_END_MARKER;
3c2829
 
3c2829
diff --git a/lib/ExtUtils/ParseXS/Eval.pm b/lib/ExtUtils/ParseXS/Eval.pm
3c2829
index 8c075a3..7315332 100644
3c2829
--- a/lib/ExtUtils/ParseXS/Eval.pm
3c2829
+++ b/lib/ExtUtils/ParseXS/Eval.pm
3c2829
@@ -2,7 +2,7 @@ package ExtUtils::ParseXS::Eval;
3c2829
 use strict;
3c2829
 use warnings;
3c2829
 
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 =head1 NAME
3c2829
 
3c2829
diff --git a/lib/ExtUtils/ParseXS/Utilities.pm b/lib/ExtUtils/ParseXS/Utilities.pm
3c2829
index 4de9f4e..41a9f6d 100644
3c2829
--- a/lib/ExtUtils/ParseXS/Utilities.pm
3c2829
+++ b/lib/ExtUtils/ParseXS/Utilities.pm
3c2829
@@ -5,7 +5,7 @@ use Exporter;
3c2829
 use File::Spec;
3c2829
 use ExtUtils::ParseXS::Constants ();
3c2829
 
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 our (@ISA, @EXPORT_OK);
3c2829
 @ISA = qw(Exporter);
3c2829
diff --git a/lib/ExtUtils/Typemaps.pm b/lib/ExtUtils/Typemaps.pm
3c2829
index a16ae06..48d623e 100644
3c2829
--- a/lib/ExtUtils/Typemaps.pm
3c2829
+++ b/lib/ExtUtils/Typemaps.pm
3c2829
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps;
3c2829
 use 5.006001;
3c2829
 use strict;
3c2829
 use warnings;
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 require ExtUtils::ParseXS;
3c2829
 require ExtUtils::ParseXS::Constants;
3c2829
diff --git a/lib/ExtUtils/Typemaps/Cmd.pm b/lib/ExtUtils/Typemaps/Cmd.pm
3c2829
index ccd5efe..ffed504 100644
3c2829
--- a/lib/ExtUtils/Typemaps/Cmd.pm
3c2829
+++ b/lib/ExtUtils/Typemaps/Cmd.pm
3c2829
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::Cmd;
3c2829
 use 5.006001;
3c2829
 use strict;
3c2829
 use warnings;
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 use ExtUtils::Typemaps;
3c2829
 
3c2829
diff --git a/lib/ExtUtils/Typemaps/InputMap.pm b/lib/ExtUtils/Typemaps/InputMap.pm
3c2829
index 67ea1c2..86c646d 100644
3c2829
--- a/lib/ExtUtils/Typemaps/InputMap.pm
3c2829
+++ b/lib/ExtUtils/Typemaps/InputMap.pm
3c2829
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::InputMap;
3c2829
 use 5.006001;
3c2829
 use strict;
3c2829
 use warnings;
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 =head1 NAME
3c2829
 
3c2829
diff --git a/lib/ExtUtils/Typemaps/OutputMap.pm b/lib/ExtUtils/Typemaps/OutputMap.pm
3c2829
index 42cbe5c..32cf9f9 100644
3c2829
--- a/lib/ExtUtils/Typemaps/OutputMap.pm
3c2829
+++ b/lib/ExtUtils/Typemaps/OutputMap.pm
3c2829
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::OutputMap;
3c2829
 use 5.006001;
3c2829
 use strict;
3c2829
 use warnings;
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 =head1 NAME
3c2829
 
3c2829
diff --git a/lib/ExtUtils/Typemaps/Type.pm b/lib/ExtUtils/Typemaps/Type.pm
3c2829
index 7e0f4ba..abe93cb 100644
3c2829
--- a/lib/ExtUtils/Typemaps/Type.pm
3c2829
+++ b/lib/ExtUtils/Typemaps/Type.pm
3c2829
@@ -4,7 +4,7 @@ use strict;
3c2829
 use warnings;
3c2829
 require ExtUtils::Typemaps;
3c2829
 
3c2829
-our $VERSION = '3.30';
3c2829
+our $VERSION = '3.31';
3c2829
 
3c2829
 =head1 NAME
3c2829