--- a/jdk/src/java.se.ee/share/classes/module-info.java	Thu Apr 13 11:08:52 2017 -0700
+++ b/jdk/src/java.se.ee/share/classes/module-info.java	Thu Apr 13 11:16:25 2017 -0700
@@ -32,7 +32,8 @@
  * @moduleGraph
  * @since 9
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation",
+                   "removal"}) // java.corba and other modules
 module java.se.ee {
 
     requires transitive java.se;

--- a/jdk/src/jdk.unsupported/share/classes/sun/reflect/Reflection.java	Thu Apr 13 11:08:52 2017 -0700
+++ b/jdk/src/jdk.unsupported/share/classes/sun/reflect/Reflection.java	Thu Apr 13 11:16:25 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
      * with {@link StackWalker.StackFrame#getDeclaringClass} instead.
      */
     @Deprecated(forRemoval=true)
+    @SuppressWarnings("removal") // Reflection.getCallerClass
     public static Class<?> getCallerClass(int depth) {
         if (depth < 0)
             throw new InternalError("depth must be positive");