diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java
index cd3b5fdfcb..9757959b04 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java
@@ -34,7 +34,11 @@ import org.hibernate.type.Type;
  * Classic AVG sqlfunction that return types as it was done in Hibernate 3.1 
  * 
  * @author Max Rydahl Andersen
+ *
+ * @deprecated Use {@link org.hibernate.dialect.function.StandardAnsiSqlAggregationFunctions.AvgFunction}
+ * or {@link AvgWithArgumentCastFunction} instead.
  */
+@Deprecated
 public class ClassicAvgFunction extends StandardSQLFunction {
 	/**
 	 * Constructs a ClassicAvgFunction
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java
index f26fc62cee..32f139c8f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java
@@ -31,7 +31,10 @@ import org.hibernate.type.Type;
  * Classic COUNT sqlfunction that return types as it was done in Hibernate 3.1 
  * 
  * @author Max Rydahl Andersen
+ *
+ * @deprecated Use {@link org.hibernate.dialect.function.StandardAnsiSqlAggregationFunctions.CountFunction} instead.
  */
+@Deprecated
 public class ClassicCountFunction extends StandardSQLFunction {
 	/**
 	 * Constructs a ClassicCountFunction
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java
index 6bfed870de..1a4f8ca056 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java
@@ -28,7 +28,9 @@ package org.hibernate.dialect.function;
  * 
  * @author Max Rydahl Andersen
  *
+ * @deprecated Use {@link org.hibernate.dialect.function.StandardAnsiSqlAggregationFunctions.SumFunction} instead.
  */
+@Deprecated
 public class ClassicSumFunction extends StandardSQLFunction {
 	/**
 	 * Constructs a ClassicSumFunction