diff --git a/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java b/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
index 6aa29a0..4812faf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
@@ -18,6 +18,7 @@
 import com.google.gerrit.common.data.GlobalCapability;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.extensions.client.MenuItem;
 import com.google.gerrit.extensions.restapi.RestReadView;
 import com.google.gerrit.extensions.webui.TopMenu;
 import com.google.gerrit.server.config.ConfigResource;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java b/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
index 0f5629b..f852bbc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
@@ -24,6 +24,7 @@
 import com.google.gerrit.common.data.GlobalCapability;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.extensions.client.MenuItem;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.webui.TopMenu;
 import com.google.gerrit.server.config.ConfigResource;
@@ -36,7 +37,6 @@
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.util.FS;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -69,7 +69,7 @@
     cfg.clear();
     if (input.menus != null) {
       for (TopMenu.MenuEntry menuEntry : input.menus) {
-        for (TopMenu.MenuItem menuItem : menuEntry.items) {
+        for (MenuItem menuItem : menuEntry.items) {
           if (menuItem.name == null) {
             continue;
           }