Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/util/StringInterner.java
===================================================================
--- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/util/StringInterner.java	2011-09-01 16:14:21.158642633 +0200
+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/util/StringInterner.java	2011-09-01 16:29:41.794643479 +0200
@@ -16,8 +16,8 @@
 
 package com.google.gwt.dev.util;
 
-import com.google.gwt.thirdparty.guava.common.collect.Interner;
-import com.google.gwt.thirdparty.guava.common.collect.Interners;
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
 
 /**
  * A utility class for reducing String memory waste. Note that this does not use
Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
===================================================================
--- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java	2011-09-01 16:14:21.198643075 +0200
+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java	2011-09-01 16:29:41.806641576 +0200
@@ -15,7 +15,7 @@
  */
 package com.google.gwt.dev.javac;
 
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/util/Strings.java
===================================================================
--- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/util/Strings.java	2011-09-01 16:14:21.170642875 +0200
+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/util/Strings.java	2011-09-01 16:29:41.810687441 +0200
@@ -15,7 +15,7 @@
  */
 package com.google.gwt.dev.util;
 
-import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 
Index: gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java	2011-09-01 16:34:27.598145122 +0200
+++ gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java	2011-09-01 16:35:17.590142122 +0200
@@ -16,7 +16,7 @@
 package com.google.gwt.safehtml.shared;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.gwt.thirdparty.streamhtmlparser.HtmlParser;
 import com.google.gwt.thirdparty.streamhtmlparser.HtmlParserFactory;
 import com.google.gwt.thirdparty.streamhtmlparser.ParseException;
Index: gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java	2011-09-01 16:35:42.534142633 +0200
+++ gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java	2011-09-01 16:35:52.390142207 +0200
@@ -16,7 +16,7 @@
 package com.google.gwt.safehtml.shared;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 
 import java.net.URI;
 import java.net.URISyntaxException;
Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/BeanHelper.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/BeanHelper.java	2011-09-01 16:39:59.534144664 +0200
+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/BeanHelper.java	2011-09-01 16:40:10.970142194 +0200
@@ -26,7 +26,7 @@
 import com.google.gwt.core.ext.typeinfo.JRawType;
 import com.google.gwt.core.ext.typeinfo.JType;
 import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.common.base.Function;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.google.gwt.validation.client.impl.GwtSpecificValidator;
Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java	2011-09-01 16:38:19.474145570 +0200
+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java	2011-09-01 16:39:02.942142236 +0200
@@ -28,17 +28,17 @@
 import com.google.gwt.core.ext.typeinfo.JType;
 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.dev.jjs.ast.JProgram;
-import com.google.gwt.thirdparty.guava.common.base.Function;
-import com.google.gwt.thirdparty.guava.common.base.Functions;
-import com.google.gwt.thirdparty.guava.common.base.Joiner;
-import com.google.gwt.thirdparty.guava.common.base.Predicate;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
-import com.google.gwt.thirdparty.guava.common.collect.Iterables;
-import com.google.gwt.thirdparty.guava.common.collect.Maps;
-import com.google.gwt.thirdparty.guava.common.collect.Ordering;
-import com.google.gwt.thirdparty.guava.common.collect.Sets;
-import com.google.gwt.thirdparty.guava.common.primitives.Primitives;
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.base.Joiner;
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Primitives;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.google.gwt.validation.client.impl.AbstractGwtSpecificValidator;
Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/Util.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/Util.java	2011-09-01 16:39:17.870143823 +0200
+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/Util.java	2011-09-01 16:39:43.870142623 +0200
@@ -15,14 +15,14 @@
  */
 package com.google.gwt.validation.rebind;
 
-import com.google.gwt.thirdparty.guava.common.base.Function;
-import com.google.gwt.thirdparty.guava.common.base.Functions;
-import com.google.gwt.thirdparty.guava.common.base.Predicate;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
-import com.google.gwt.thirdparty.guava.common.collect.Iterables;
-import com.google.gwt.thirdparty.guava.common.collect.Lists;
-import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 import java.util.HashSet;
 import java.util.Iterator;
Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
===================================================================
--- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java	2011-09-01 16:40:25.210144901 +0200
+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java	2011-09-01 16:40:37.642142278 +0200
@@ -20,8 +20,8 @@
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
-import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.google.gwt.validation.client.GwtValidation;
