diff --git a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
index f5ec06f6a98c..e284348dfba9 100644
--- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
+++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
@@ -14,6 +14,7 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+      
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/base/Base.gwt.xml b/guava-gwt/src/com/google/common/base/Base.gwt.xml
index cddd48eb085c..5ed0fb251a5a 100644
--- a/guava-gwt/src/com/google/common/base/Base.gwt.xml
+++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml
@@ -14,8 +14,11 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.user.User"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+      
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
index 54b8d461f15e..615b95f70a35 100644
--- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
+++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
@@ -14,11 +14,17 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.math.Math"/>
+   
   <inherits name="com.google.common.util.concurrent.Concurrent"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
index 72b65ba559ae..765ac8438412 100644
--- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
+++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
@@ -14,11 +14,17 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.user.User"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.math.Math"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+      
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
index 1284122371ae..d04c253bdc0b 100644
--- a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
+++ b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
@@ -14,8 +14,11 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/src/com/google/common/html/Html.gwt.xml b/guava-gwt/src/com/google/common/html/Html.gwt.xml
index 8ab917eed0ff..143da9bfe5fc 100644
--- a/guava-gwt/src/com/google/common/html/Html.gwt.xml
+++ b/guava-gwt/src/com/google/common/html/Html.gwt.xml
@@ -14,8 +14,11 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+     
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+   
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/io/Io.gwt.xml b/guava-gwt/src/com/google/common/io/Io.gwt.xml
index cc1193adaca7..779065564ba1 100644
--- a/guava-gwt/src/com/google/common/io/Io.gwt.xml
+++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml
@@ -14,10 +14,15 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.math.Math"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/src/com/google/common/math/Math.gwt.xml b/guava-gwt/src/com/google/common/math/Math.gwt.xml
index 11314f7b3299..f5f987910c99 100644
--- a/guava-gwt/src/com/google/common/math/Math.gwt.xml
+++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml
@@ -14,9 +14,13 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/src/com/google/common/net/Net.gwt.xml b/guava-gwt/src/com/google/common/net/Net.gwt.xml
index 8e09522d96bf..19a6cb6fedba 100644
--- a/guava-gwt/src/com/google/common/net/Net.gwt.xml
+++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml
@@ -14,13 +14,21 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.user.User"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+   
   <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixPatterns"/>
+   
   <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
index 4200ce499cc3..505f45cca852 100644
--- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
+++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
@@ -14,9 +14,13 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.user.User"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+      
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
index a1996def0878..e80620d4bfdb 100644
--- a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
+++ b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
@@ -14,10 +14,15 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="elemental2.promise.Promise"/>
+      
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
index 7e6cebe08f25..d00c0edbdb84 100644
--- a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
+++ b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
@@ -14,9 +14,13 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+    
   <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
index 49446182aa23..d5dd2908c856 100644
--- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
+++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
@@ -20,5 +20,11 @@
      (I hope that this workaround does not cause its own problems in the future.)
 -->
 <super-source path="super"/>
-<inherits name="com.google.gwt.user.User" /><inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /><inherits name="com.google.common.annotations.Annotations" /><inherits name="com.google.common.base.Base" /><inherits name="com.google.common.collect.Collect" /><inherits name="com.google.gwt.core.Core" />
+<inherits name="com.google.gwt.user.User" />
+
+<inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" />
+<inherits name="com.google.common.annotations.Annotations" />
+<inherits name="com.google.common.base.Base" />
+<inherits name="com.google.common.collect.Collect" />
+<inherits name="com.google.gwt.core.Core" />
 </module>
diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
index b4f1c4fb13db..ffbcaf104f2e 100644
--- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
+++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
@@ -20,5 +20,8 @@
      (I hope that this workaround does not cause its own problems in the future.)
 -->
 <super-source path="super"/>
-<inherits name="com.google.gwt.user.User" /><inherits name="com.google.common.annotations.Annotations" /><inherits name="com.google.gwt.core.Core" />
+<inherits name="com.google.gwt.user.User" />
+
+<inherits name="com.google.common.annotations.Annotations" />
+<inherits name="com.google.gwt.core.Core" />
 </module>
diff --git a/guava-gwt/test/com/google/common/base/testModule.gwt.xml b/guava-gwt/test/com/google/common/base/testModule.gwt.xml
index 326194d79908..c87f3dbe2349 100644
--- a/guava-gwt/test/com/google/common/base/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/base/testModule.gwt.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+            
   <inherits name="com.google.common.truth.Truth"/>
+    
   <entry-point class="com.google.common.base.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
   <super-source path="super"/>
    
 </module>
diff --git a/guava-gwt/test/com/google/common/cache/testModule.gwt.xml b/guava-gwt/test/com/google/common/cache/testModule.gwt.xml
index 4a2a4e718590..dae839685a82 100644
--- a/guava-gwt/test/com/google/common/cache/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/cache/testModule.gwt.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.cache.Cache"/>
+    
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+   
   <inherits name="com.google.common.util.concurrent.Concurrent"/>
+      
   <inherits name="com.google.common.truth.Truth"/>
+           
   <entry-point class="com.google.common.cache.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
   <super-source path="super"/>
    
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml
index 5ec5ab8f1182..a5f868de1fb8 100644
--- a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml
@@ -1,20 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+      
   <inherits name="com.google.common.collect.testing.Testing"/>
+   
   <inherits name="com.google.common.collect.testing.google.Google"/>
+   
   <inherits name="com.google.common.io.Io"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+     
   <inherits name="com.google.common.truth.Truth"/>
+        
   <entry-point class="com.google.common.collect.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
   <super-source path="super"/>
    
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
index f65ce311705f..d15263777334 100644
--- a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
@@ -14,12 +14,19 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
index caf0b73f16dd..5d88b9291f61 100644
--- a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
@@ -14,13 +14,21 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.collect.testing.Testing"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
+  <inherits name="com.google.gwt.core.Core"/>
+      
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testing/testModule.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/testModule.gwt.xml
index d70f1d862632..42b4a606983e 100644
--- a/guava-gwt/test/com/google/common/collect/testing/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testing/testModule.gwt.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.collect.testing.Testing"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+        
   <entry-point class="com.google.common.collect.testing.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
 </module>
diff --git a/guava-gwt/test/com/google/common/escape/testModule.gwt.xml b/guava-gwt/test/com/google/common/escape/testModule.gwt.xml
index ae6d05bc9e64..e52723e0740b 100644
--- a/guava-gwt/test/com/google/common/escape/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/escape/testModule.gwt.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+   
   <inherits name="com.google.common.escape.testing.Testing"/>
+   
   <inherits name="com.google.common.html.Html"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+           
   <entry-point class="com.google.common.escape.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
 </module>
diff --git a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
index 909ca451da7a..85cb436b8781 100644
--- a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
@@ -20,5 +20,10 @@
      (I hope that this workaround does not cause its own problems in the future.)
 -->
 <super-source path="super"/>
-<inherits name="com.google.gwt.user.User" /><inherits name="com.google.gwt.junit.JUnit" /><inherits name="com.google.common.annotations.Annotations" /><inherits name="com.google.common.escape.Escape" /><inherits name="com.google.gwt.core.Core" />
+<inherits name="com.google.gwt.user.User" />
+
+<inherits name="com.google.gwt.junit.JUnit" />
+<inherits name="com.google.common.annotations.Annotations" />
+<inherits name="com.google.common.escape.Escape" />
+<inherits name="com.google.gwt.core.Core" />
 </module>
diff --git a/guava-gwt/test/com/google/common/html/testModule.gwt.xml b/guava-gwt/test/com/google/common/html/testModule.gwt.xml
index 3e03493ae7ee..873e369b6258 100644
--- a/guava-gwt/test/com/google/common/html/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/html/testModule.gwt.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.escape.testing.Testing"/>
+   
   <inherits name="com.google.common.html.Html"/>
+      
   <inherits name="com.google.common.truth.Truth"/>
+                    
   <entry-point class="com.google.common.html.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
 </module>
diff --git a/guava-gwt/test/com/google/common/io/testModule.gwt.xml b/guava-gwt/test/com/google/common/io/testModule.gwt.xml
index 9e58e0592c2d..8b668863fed2 100644
--- a/guava-gwt/test/com/google/common/io/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/io/testModule.gwt.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.io.Io"/>
+   
   <inherits name="com.google.common.math.Math"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+     
   <inherits name="com.google.common.truth.Truth"/>
+           
   <entry-point class="com.google.common.io.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
   <super-source path="super"/>
    
 </module>
diff --git a/guava-gwt/test/com/google/common/math/testModule.gwt.xml b/guava-gwt/test/com/google/common/math/testModule.gwt.xml
index 76a0c99d5405..af911d9b2a69 100644
--- a/guava-gwt/test/com/google/common/math/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/math/testModule.gwt.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.math.Math"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+       
   <inherits name="com.google.common.truth.Truth"/>
+       
   <entry-point class="com.google.common.math.TestModuleEntryPoint"/>
-   
-  <source path=""/>
     
   <super-source path="super"/>
    
diff --git a/guava-gwt/test/com/google/common/net/testModule.gwt.xml b/guava-gwt/test/com/google/common/net/testModule.gwt.xml
index a42cced5d6f4..d0ae466716e3 100644
--- a/guava-gwt/test/com/google/common/net/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/net/testModule.gwt.xml
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+      
   <inherits name="com.google.common.collect.testing.Testing"/>
+   
   <inherits name="com.google.common.collect.testing.google.Google"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+   
   <inherits name="com.google.common.escape.testing.Testing"/>
+    
   <inherits name="com.google.common.net.Net"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+      
   <inherits name="com.google.common.truth.Truth"/>
+         
   <entry-point class="com.google.common.net.TestModuleEntryPoint"/>
-   
-  <source path=""/>
     
   <super-source path="super"/>
    
diff --git a/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml b/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml
index 935d3bd7aa2f..e37c58fa8d1a 100644
--- a/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.collect.testing.Testing"/>
+   
   <inherits name="com.google.common.primitives.Primitives"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+     
   <inherits name="com.google.common.truth.Truth"/>
+           
   <entry-point class="com.google.common.primitives.TestModuleEntryPoint"/>
-   
-  <source path=""/>
     
   <super-source path="super"/>
    
diff --git a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
index f9089db0811f..9929e53cb8bf 100644
--- a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
@@ -14,10 +14,15 @@
   <super-source path="super"/>
    
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+     
   <inherits name="com.google.gwt.core.Core"/>
-   
+    
 </module>
diff --git a/guava-gwt/test/com/google/common/testing/testModule.gwt.xml b/guava-gwt/test/com/google/common/testing/testModule.gwt.xml
index c3cea41306bd..ed7645b4d93f 100644
--- a/guava-gwt/test/com/google/common/testing/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/testing/testModule.gwt.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+     
   <inherits name="com.google.common.truth.Truth"/>
+        
   <entry-point class="com.google.common.testing.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
   <super-source path="super"/>
    
 </module>
diff --git a/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml b/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml
index 34c94d6bef6a..cea425006db5 100644
--- a/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.base.Base"/>
+   
   <inherits name="com.google.common.collect.Collect"/>
+   
   <inherits name="com.google.common.testing.Testing"/>
+   
   <inherits name="com.google.common.util.concurrent.Concurrent"/>
+    
   <inherits name="com.google.common.truth.Truth"/>
+               
   <entry-point class="com.google.common.util.concurrent.TestModuleEntryPoint"/>
-   
-  <source path=""/>
     
   <super-source path="super"/>
    
diff --git a/guava-gwt/test/com/google/common/xml/testModule.gwt.xml b/guava-gwt/test/com/google/common/xml/testModule.gwt.xml
index d377994ca45e..7f48ca04c60a 100644
--- a/guava-gwt/test/com/google/common/xml/testModule.gwt.xml
+++ b/guava-gwt/test/com/google/common/xml/testModule.gwt.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
    
+  <source path=""/>
+   
   <inherits name="com.google.gwt.user.User"/>
+    
   <inherits name="com.google.gwt.junit.JUnit"/>
+   
   <inherits name="com.google.common.annotations.Annotations"/>
+   
   <inherits name="com.google.common.escape.Escape"/>
+   
   <inherits name="com.google.common.escape.testing.Testing"/>
+   
   <inherits name="com.google.common.xml.Xml"/>
+      
   <inherits name="com.google.common.truth.Truth"/>
+           
   <entry-point class="com.google.common.xml.TestModuleEntryPoint"/>
    
-  <source path=""/>
-    
 </module>