diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index f19d50064d..c7bbc664c9 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -131,6 +131,12 @@
       <artifactId>mapstruct-jdk8</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- rest documentation -->
     <dependency>
       <groupId>com.webcohesion.enunciate</groupId>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java