diff --git a/pom.xml b/pom.xml
index 0679313013..f60fae45de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
 									<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 									<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 									<includeTestSourceDirectory>true</includeTestSourceDirectory>
+									<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
 								</configuration>
 								<goals>
 									<goal>check</goal>
diff --git a/spring-boot-project/pom.xml b/spring-boot-project/pom.xml
index 542650cd94..e3d8f20ec1 100644
--- a/spring-boot-project/pom.xml
+++ b/spring-boot-project/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Build</name>
 	<description>Spring Boot Build</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
 		<module>spring-boot-dependencies</module>
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index b7b534baca..7b441ad24e 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -31,6 +31,7 @@
 		</developer>
 	</developers>
 	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<!-- Dependency versions -->
 		<activemq.version>5.15.6</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
index ba459a2917..8e609dafe5 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -14,6 +14,7 @@
 	<description>Parent pom providing dependency and plugin management for applications
 		built with Maven</description>
 	<properties>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<java.version>1.8</java.version>
 		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
index 3c5ca006dc..06867ba7ca 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.web.reactive.filter;
 
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.core.Ordered;
 import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
@@ -32,8 +31,7 @@ public class OrderedHiddenHttpMethodFilter extends HiddenHttpMethodFilter
 	/**
 	 * The default order is high to ensure the filter is applied before Spring Security.
 	 */
-	public static final int DEFAULT_ORDER = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER
-			- 10000;
+	public static final int DEFAULT_ORDER = -10000;
 
 	private int order = DEFAULT_ORDER;
 
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index d1febd65d0..c8ab93869c 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -11,5 +11,11 @@
 			<property name="illegalClasses"
 				value="^reactor\.core\.support\.Assert" />
 		</module>
+		<module
+			name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
+			<property name="file"
+				value="${main.basedir}/src/checkstyle/import-control.xml" />
+			<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
+		</module>
 	</module>
 </module>
diff --git a/src/checkstyle/import-control.xml b/src/checkstyle/import-control.xml
index a398cbffce..c8c85effab 100644
--- a/src/checkstyle/import-control.xml
+++ b/src/checkstyle/import-control.xml
@@ -5,12 +5,12 @@
 
 	<subpackage name="autoconfigure">
 		<subpackage name="web">
+			<allow pkg="org.springframework.boot.web.server" />
+			<allow pkg="org.springframework.boot.web.servlet.server" />
 			<disallow pkg="org.springframework.boot.web" />
 			<disallow pkg="org.springframework.web.servlet" />
 			<disallow pkg="org.springframework.web.reactive" />
 			<disallow pkg="javax.servlet" />
-			<allow pkg="org.springframework.boot.web.server" />
-			<allow pkg="org.springframework.boot.web.servlet.server" />
 			<subpackage name="client">
 				<allow pkg="org.springframework.boot.web.client" />
 			</subpackage>