diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java b/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
index 58b80d2f93..66cab537c8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
@@ -28,6 +28,7 @@ import java.util.Set;
  * @author Phillip Webb
  * @since 1.2.0
  */
+@Deprecated
 class DefaultPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 
 	private final char[] delimiters;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
index 2e48d81557..2175fde7fc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import java.net.UnknownHostException;
  *
  * @author Dave Syer
  */
+@Deprecated
 public class InetAddressEditor extends PropertyEditorSupport {
 
 	@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/OriginCapablePropertyValue.java b/spring-boot/src/main/java/org/springframework/boot/bind/OriginCapablePropertyValue.java
index cb1d96599d..9332ed48b6 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/OriginCapablePropertyValue.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/OriginCapablePropertyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.core.env.PropertySource;
  *
  * @author Andy Wilkinson
  */
+@Deprecated
 class OriginCapablePropertyValue extends PropertyValue {
 
 	private static final String ATTRIBUTE_PROPERTY_ORIGIN = "propertyOrigin";
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PatternPropertyNamePatternsMatcher.java b/spring-boot/src/main/java/org/springframework/boot/bind/PatternPropertyNamePatternsMatcher.java
index 390947fc64..b95883d5cc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PatternPropertyNamePatternsMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PatternPropertyNamePatternsMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.springframework.util.PatternMatchUtils;
  * @author Phillip Webb
  * @since 1.2.0
  */
+@Deprecated
 class PatternPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 
 	private final String[] patterns;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
index be8fd600d8..27bf28d6e0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
@@ -51,6 +51,7 @@ import org.springframework.validation.Validator;
  * @param <T> the target type
  * @author Dave Syer
  */
+@Deprecated
 public class PropertiesConfigurationFactory<T>
 		implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java
index d82bd2d63a..7ac154149e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java
@@ -22,6 +22,7 @@ package org.springframework.boot.bind;
  * @author Phillip Webb
  * @since 1.2.0
  */
+@Deprecated
 interface PropertyNamePatternsMatcher {
 
 	PropertyNamePatternsMatcher ALL = new PropertyNamePatternsMatcher() {
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertyOrigin.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertyOrigin.java
index 47cca7f63e..d07de560af 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertyOrigin.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertyOrigin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.core.env.PropertySource;
  * @author Andy Wilkinson
  * @since 1.3.0
  */
+@Deprecated
 public class PropertyOrigin {
 
 	private final PropertySource<?> source;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
index fb30e91d90..d9dd190954 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
@@ -31,6 +31,7 @@ import org.springframework.core.env.PropertySources;
  * @see PropertySource
  * @see PropertySources
  */
+@Deprecated
 public abstract class PropertySourceUtils {
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
index 8e59e80ea9..c775014693 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
@@ -34,6 +34,7 @@ import org.springframework.validation.BindException;
  * @author Stephane Nicoll
  * @since 1.4.0
  */
+@Deprecated
 public class PropertySourcesBinder {
 
 	private PropertySources propertySources;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
index ce0b73cab5..1fb4cc29ec 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
@@ -41,6 +41,7 @@ import org.springframework.validation.DataBinder;
  * @author Dave Syer
  * @author Phillip Webb
  */
+@Deprecated
 public class PropertySourcesPropertyValues implements PropertyValues {
 
 	private static final Pattern COLLECTION_PROPERTY = Pattern
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedBindingNotWritablePropertyException.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedBindingNotWritablePropertyException.java
index 81d4bc8944..747d42ebb1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedBindingNotWritablePropertyException.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedBindingNotWritablePropertyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.springframework.beans.NotWritablePropertyException;
  * @since 1.3.0
  * @see RelaxedDataBinder
  */
+@Deprecated
 public class RelaxedBindingNotWritablePropertyException
 		extends NotWritablePropertyException {
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java
index 5db206cc57..9e83127e60 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java
@@ -36,6 +36,7 @@ import org.springframework.util.Assert;
  * @author Stephane Nicoll
  * @since 1.1.0
  */
+@Deprecated
 class RelaxedConversionService implements ConversionService {
 
 	private final ConversionService conversionService;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
index 48fe904bbc..3c025d7ca8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
@@ -56,6 +56,7 @@ import org.springframework.validation.DataBinder;
  * @author Andy Wilkinson
  * @see RelaxedNames
  */
+@Deprecated
 public class RelaxedDataBinder extends DataBinder {
 
 	private static final Object BLANK = new Object();
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
index bd77de3900..4b54935866 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
@@ -32,6 +32,7 @@ import org.springframework.util.StringUtils;
  * @see RelaxedDataBinder
  * @see RelaxedPropertyResolver
  */
+@Deprecated
 public final class RelaxedNames implements Iterable<String> {
 
 	private static final Pattern CAMEL_CASE_PATTERN = Pattern.compile("([^A-Z-])([A-Z])");
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java
index 327165a620..93ab74dece 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
  * @author Phillip Webb
  * @see RelaxedNames
  */
+@Deprecated
 public class RelaxedPropertyResolver implements PropertyResolver {
 
 	private final PropertyResolver resolver;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/StringToCharArrayConverter.java b/spring-boot/src/main/java/org/springframework/boot/bind/StringToCharArrayConverter.java
index 1c3e20bcbb..17f9116564 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/StringToCharArrayConverter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/StringToCharArrayConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.springframework.core.convert.converter.Converter;
  *
  * @author Phillip Webb
  */
+@Deprecated
 class StringToCharArrayConverter implements Converter<String, char[]> {
 
 	@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
index 63fdf39b5e..a9629da835 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
@@ -48,6 +48,7 @@ import org.springframework.validation.Validator;
  * @author Luke Taylor
  * @author Dave Syer
  */
+@Deprecated
 public class YamlConfigurationFactory<T>
 		implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
index 6d0688342d..f3b726e492 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
@@ -31,6 +31,7 @@ import org.yaml.snakeyaml.nodes.NodeId;
  *
  * @author Luke Taylor
  */
+@Deprecated
 public class YamlJavaBeanPropertyConstructor extends Constructor {
 
 	private final Map<Class<?>, Map<String, Property>> properties = new HashMap<>();
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
index 459972fdde..87ac7cccf3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
index 12e0f1a996..96cb5cc410 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
@@ -45,6 +45,7 @@ import org.springframework.util.StringUtils;
  * @author Christian Dupuis
  * @author Stephane Nicoll
  */
+@Deprecated
 class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 
 	@Override