diff --git a/cake/libs/cake_request.php b/cake/libs/cake_request.php
index 7a464f742a1..088e0b968a8 100644
--- a/cake/libs/cake_request.php
+++ b/cake/libs/cake_request.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Set');
+App::uses('Set', 'Core');
 
 /**
  * A class that helps wrap Request information and particulars about a single request.
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index aa4b0a95c2c..5c078c7ddaf 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -141,7 +141,6 @@ class CakeSession {
  * @param boolean $start Should session be started right now
  */
 	public static function init($base = null, $start = true) {
-		App::import('Core', 'Security');
 		self::$time = time();
 
 		$checkAgent = Configure::read('Session.checkAgent');
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index c0d4b57a67f..8ce908cda5a 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'ComponentCollection', false);
+App::uses('ComponentCollection', 'Controller');
 
 /**
  * Base class for an individual Component.  Components provide resuable bits of
diff --git a/cake/libs/controller/component_collection.php b/cake/libs/controller/component_collection.php
index 90ec17f177f..9aa589566bb 100644
--- a/cake/libs/controller/component_collection.php
+++ b/cake/libs/controller/component_collection.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ObjectCollection');
+App::uses('ObjectCollection', 'Core');
 
 class ComponentCollection extends ObjectCollection {
 
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index a41d88e547c..b09faa2f458 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -20,8 +20,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'Router', false);
-App::import('Core', 'Security', false);
+App::uses('Router', 'Core');
+App::uses('Security', 'Core');
+App::uses('Debugger', 'Core');
 
 /**
  * Authentication control component class
@@ -287,7 +288,6 @@ public function initialize(Controller $controller, $settings = array()) {
 			}
 		}
 		if (Configure::read('debug') > 0) {
-			App::import('Debugger');
 			Debugger::checkSecurityKeys();
 		}
 	}
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index bff3b7137d7..2efec17c3b4 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -21,7 +21,7 @@
 /**
  * Load Security class
  */
-App::import('Core', 'Security');
+App::uses('Security', 'Core');
 
 /**
  * Cookie Component.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index a4cb6dd02ec..96508458959 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.3467
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Multibyte');
+App::uses('Multibyte', 'Core');
 
 /**
  * EmailComponent
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index b68e5e33eab..4928c945ac2 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -20,6 +20,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Xml', 'Core');
+
 /**
  * Request object for handling HTTP requests
  *
@@ -172,9 +174,6 @@ public function startup(&$controller) {
 		}
 
 		if ($this->requestedWith('xml')) {
-			if (!class_exists('Xml')) {
-				App::import('Core', 'Xml');
-			}
 			try {
 				$xml = Xml::build(trim(file_get_contents('php://input')));
 
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 49632a1c65c..c4f8299c457 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -17,8 +17,8 @@
  * @since         CakePHP(tm) v 0.10.8.2156
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'String', false);
-App::import('Core', 'Security', false);
+App::uses('String', 'Core');
+App::uses('Security', 'Core');
 
 /**
  * SecurityComponent
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index 77ab43a4d05..9406e944717 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -17,9 +17,8 @@
  * @since         CakePHP(tm) v 0.10.0.1232
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('cakesession')) {
-	require LIBS . 'cake_session.php';
-}
+
+App::uses('CakeSession', 'Core');
 
 /**
  * Session Component.
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 581d788c097..b0c8995af8a 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -19,7 +19,7 @@
  * @since         Cake v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('View', 'Scaffold');
+App::uses('Scaffold', 'View');
 
 /**
  * Scaffolding is a set of automatic actions for starting web development work faster.
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index f07ab78c616..a6f060df7c6 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -24,12 +24,8 @@
  * Included libraries.
  *
  */
-if (!class_exists('CakeLog')) {
-	require_once LIBS . 'cake_log.php';
-}
-if (!class_exists('String')) {
-	require_once LIBS . 'string.php';
-}
+App::uses('CakeLog', 'Core');
+App::uses('String', 'Core');
 
 /**
  * Provide custom logging and error handling.
diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
index 1a3738e893c..2b445354665 100644
--- a/cake/libs/dispatcher.php
+++ b/cake/libs/dispatcher.php
@@ -28,6 +28,7 @@
 App::uses('CakeRequest', 'Core');
 App::uses('CakeResponse', 'Core');
 App::uses('Controller', 'Controller');
+App::uses('Scaffold', 'Controller');
 App::uses('View', 'View');
 App::uses('Debugger', 'Core');
 
@@ -163,7 +164,6 @@ protected function _invoke(Controller $controller, CakeRequest $request) {
 
 		if (!isset($methods[$request->params['action']])) {
 			if ($controller->scaffold !== false) {
-				App::import('Controller', 'Scaffold', false);
 				return new Scaffold($controller, $request);
 			}
 			throw new MissingActionException(array(
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index aaf3b504c25..40f66204b3f 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -17,8 +17,8 @@
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'CakeSocket');
-App::import('Core', 'Router');
+App::uses('CakeSocket', 'Core');
+App::uses('Router', 'Core');
 
 /**
  * Cake network socket connection class.
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 05ec9c9e846..bab553d1a3c 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -21,8 +21,8 @@
 /**
  * Included libraries.
  */
-App::import('Core', 'L10n');
-App::import('Core', 'Multibyte');
+App::uses('L10n', 'Core');
+App::uses('Multibyte', 'Core');
 
 /**
  * I18n handles translation of Text and time format strings.
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 4f5868412e2..1844507c3a3 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.4116
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'CakeRequest');
+App::uses('CakeRequest', 'Core');
 
 /**
  * Localization
diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index 3ce783c7629..39f2e37d3aa 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -19,7 +19,7 @@
  * @since         CakePHP(tm) v 1.2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ObjectCollection');
+App::uses('ObjectCollection', 'Core');
 
 /**
  * Model behavior collection class.
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index dbf5d3c3f29..360de5717a5 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -17,8 +17,8 @@
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Model');
-App::import('Core', 'ConnectionManager');
+App::uses('Model', 'Core');
+App::uses('ConnectionManager', 'Core');
 
 /**
  * Base Class for Schema management
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 40dc1e2bf87..59dd5d37fbe 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -19,8 +19,6 @@
  * @since         CakePHP(tm) v 0.10.x.1402
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
-include_once CONFIGS . 'database.php';
 
 /**
  * Manages loaded instances of DataSource objects
@@ -59,6 +57,7 @@ class ConnectionManager {
  *
  */
 	function __construct() {
+		include_once CONFIGS . 'database.php';
 		if (class_exists('DATABASE_CONFIG')) {
 			$this->config = new DATABASE_CONFIG();
 			$this->_getConnectionObjects();
@@ -102,6 +101,7 @@ public static function &getDataSource($name) {
 		$conn = $_this->_connectionsEnum[$name];
 		$class = $conn['classname'];
 
+		require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
 		if ($_this->loadDataSource($name) === null) {
 			trigger_error(sprintf(__("ConnectionManager::getDataSource - Could not load class %s"), $class), E_USER_ERROR);
 			$null = null;
diff --git a/cake/libs/router.php b/cake/libs/router.php
index b51f02134df..3840fdce637 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -18,8 +18,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'CakeRequest');
-App::import('Core', 'route/CakeRoute');
+App::uses('CakeRequest', 'Core');
+App::uses('CakeRoute', 'Core');
 
 /**
  * Parses the request URL into controller, action, and parameters.