diff --git a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
index 32397ef4..f058d3cc 100644
--- a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
+++ b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
@@ -18,7 +18,7 @@ package org.springframework.integration.samples.multipart;
 import java.util.LinkedList;
 
 import org.apache.log4j.Logger;
-import org.springframework.integration.http.UploadedMultipartFile;
+import org.springframework.integration.http.multipart.UploadedMultipartFile;
 import org.springframework.util.LinkedMultiValueMap;
 /**
  * @author Oleg Zhurakousky
diff --git a/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
index 26ff03d0..1d9a830a 100644
--- a/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
+++ b/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
@@ -22,7 +22,7 @@
 					           http-method="POST"
 					           extract-request-payload="true"/>
 	
-	<bean id="headerMapper" class="org.springframework.integration.http.DefaultHttpHeaderMapper">
+	<bean id="headerMapper" class="org.springframework.integration.http.support.DefaultHttpHeaderMapper">
 		<property name="outboundHeaderNames" value="Content-Type"/>
 	</bean>
 </beans>