diff --git a/tests/c++.at b/tests/c++.at
index 737037d3..062e5f08 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -719,6 +719,7 @@ $1
   #include <cstdlib> // size_t and getenv.
   #include <iostream>
   #include <set>
+  #include <string>
 
   bool debug = false;
 
@@ -751,7 +752,7 @@ $1
     ~Object ()
     {
       log (this, "Object::~Object");
-      objects::const_iterator i = instances.find (this);
+      objects::iterator i = instances.find (this);
       // Make sure this object is alive.
       assert (i != instances.end ());
       Object::instances.erase (i);