diff --git wp-includes/pluggable-deprecated.php wp-includes/pluggable-deprecated.php
index 2a202ac..59cab8c 100644
--- wp-includes/pluggable-deprecated.php
+++ wp-includes/pluggable-deprecated.php
@@ -36,6 +36,42 @@ function set_current_user($id, $name = '') {
 }
 endif;
 
+if ( !function_exists('get_currentuserinfo') ) :
+/**
+ * Populate global variables with information about the currently logged in user.
+ *
+ * Will set the current user, if the current user is not set. The current user
+ * will be set to the logged in person. If no user is logged in, then it will
+ * set the current user to 0, which is invalid and won't have any permissions.
+ *
+ * @since 0.71
+ * @uses $current_user Checks if the current user is set
+ * @uses wp_validate_auth_cookie() Retrieves current logged in user.
+ *
+ * @return bool|null False on XMLRPC Request and invalid auth cookie. Null when current user set
+ */
+function get_currentuserinfo() {
+	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_current_user()' );
+
+	global $current_user;
+
+	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
+		return false;
+
+	if ( ! empty($current_user) )
+		return;
+
+	if ( ! $user = wp_validate_auth_cookie() ) {
+		 if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+		 	wp_set_current_user(0);
+		 	return false;
+		 }
+	}
+
+	wp_set_current_user($user);
+}
+endif;
+
 if ( !function_exists('get_userdatabylogin') ) :
 /**
  * Retrieve user info by login name.
diff --git wp-includes/pluggable.php wp-includes/pluggable.php
index 7855004..9b67c71 100644
--- wp-includes/pluggable.php
+++ wp-includes/pluggable.php
@@ -57,40 +57,6 @@ function wp_get_current_user() {
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
-/**
- * Populate global variables with information about the currently logged in user.
- *
- * Will set the current user, if the current user is not set. The current user
- * will be set to the logged in person. If no user is logged in, then it will
- * set the current user to 0, which is invalid and won't have any permissions.
- *
- * @since 0.71
- * @uses $current_user Checks if the current user is set
- * @uses wp_validate_auth_cookie() Retrieves current logged in user.
- *
- * @return bool|null False on XMLRPC Request and invalid auth cookie. Null when current user set
- */
-function get_currentuserinfo() {
-	global $current_user;
-
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
-		return false;
-
-	if ( ! empty($current_user) )
-		return;
-
-	if ( ! $user = wp_validate_auth_cookie() ) {
-		 if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
-		 	wp_set_current_user(0);
-		 	return false;
-		 }
-	}
-
-	wp_set_current_user($user);
-}
-endif;
-
 if ( !function_exists('get_userdata') ) :
 /**
  * Retrieve user info by user ID.