diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1f76f670e38c..a8f754aac62e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Matthias Klose  <doko@ubuntu.com>
+
+	* gnu/classpath/jdwp/util/MethodResult.h,
+	gnu/classpath/jdwp/value/ObjectValue.h: Regenerate.
+
 2007-07-11  Keith Seitz  <keiths@redhat.com>
 
 	* interpret.cc (get_local_var_table) [DIRECT_THREADED]: Make sure the
diff --git a/libjava/gnu/classpath/jdwp/util/MethodResult.h b/libjava/gnu/classpath/jdwp/util/MethodResult.h
index 308446784174..11e26d3c99ce 100644
--- a/libjava/gnu/classpath/jdwp/util/MethodResult.h
+++ b/libjava/gnu/classpath/jdwp/util/MethodResult.h
@@ -19,6 +19,10 @@ extern "Java"
         {
             class MethodResult;
         }
+        namespace value
+        {
+            class Value;
+        }
       }
     }
   }
@@ -28,17 +32,12 @@ class gnu::classpath::jdwp::util::MethodResult : public ::java::lang::Object
 {
 
 public:
-  MethodResult();
-  virtual ::java::lang::Object * getReturnedValue();
-  virtual void setReturnedValue(::java::lang::Object *);
-  virtual ::java::lang::Exception * getThrownException();
-  virtual void setThrownException(::java::lang::Exception *);
-  virtual ::java::lang::Class * getResultType();
-  virtual void setResultType(::java::lang::Class *);
+  MethodResult(::gnu::classpath::jdwp::value::Value *, ::java::lang::Throwable *);
+  virtual ::gnu::classpath::jdwp::value::Value * getReturnedValue();
+  virtual ::java::lang::Throwable * getThrownException();
 private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) returnedValue;
-  ::java::lang::Exception * thrownException;
-  ::java::lang::Class * resType;
+  ::gnu::classpath::jdwp::value::Value * __attribute__((aligned(__alignof__( ::java::lang::Object)))) returnedValue;
+  ::java::lang::Throwable * thrownException;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/classpath/jdwp/value/ObjectValue.h b/libjava/gnu/classpath/jdwp/value/ObjectValue.h
index 828294526946..46bef25bbcbf 100644
--- a/libjava/gnu/classpath/jdwp/value/ObjectValue.h
+++ b/libjava/gnu/classpath/jdwp/value/ObjectValue.h
@@ -29,6 +29,7 @@ class gnu::classpath::jdwp::value::ObjectValue : public ::gnu::classpath::jdwp::
 
 public:
   ObjectValue(::java::lang::Object *);
+  ::java::lang::Object * getValue();
 public: // actually protected
   ::java::lang::Object * getObject();
   void write(::java::io::DataOutputStream *);