diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
index 00b22ef..e7ddbb6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
@@ -14,9 +14,9 @@
 
 package com.googlesource.gerrit.plugins.kafka;
 
-import com.google.gerrit.common.EventListener;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.server.events.EventListener;
 import com.google.gson.Gson;
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java
index 44c1aeb..086fa4c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.kafka.message;
 
-import com.google.gerrit.common.EventListener;
+import com.google.gerrit.server.events.EventListener;
 
 import com.googlesource.gerrit.plugins.kafka.config.KafkaProperties;
 import com.googlesource.gerrit.plugins.kafka.session.Session;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/worker/DefaultEventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/worker/DefaultEventWorker.java
index 9e58701..2755c3a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/worker/DefaultEventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/worker/DefaultEventWorker.java
@@ -14,8 +14,8 @@
 
 package com.googlesource.gerrit.plugins.kafka.worker;
 
-import com.google.gerrit.common.EventListener;
 import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventListener;
 import com.google.inject.Singleton;
 
 import com.googlesource.gerrit.plugins.kafka.message.Publisher;