diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/IActiveToolListener.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/IActiveToolListener.java
index 7514625fd..b81efa2f3 100644
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/IActiveToolListener.java
+++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/IActiveToolListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2026 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.gef.core;
 
-import org.eclipse.wb.gef.core.tools.Tool;
+import org.eclipse.gef.Tool;
 
 /**
  * Listener for {@link Tool} activation in {@link EditDomain}.
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java
index 8e85e55e2..b3a8d5723 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java
@@ -15,7 +15,6 @@
 import org.eclipse.wb.core.gef.part.menu.IMenuObjectEditPart;
 import org.eclipse.wb.gef.core.requests.DragPermissionRequest;
 import org.eclipse.wb.gef.core.requests.PasteRequest;
-import org.eclipse.wb.gef.core.tools.Tool;
 import org.eclipse.wb.gef.graphical.DesignEditPart;
 import org.eclipse.wb.internal.core.model.menu.IMenuObjectInfo;
 import org.eclipse.wb.internal.core.model.menu.IMenuObjectListener;
@@ -25,6 +24,7 @@
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.Tool;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;