diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
deleted file mode 100644
index 45e5e8a713..0000000000
--- a/wp-includes/template-functions.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$curpath = dirname(__FILE__).'/';
-
-/***** About-the-blog tags *****/
-require($curpath . 'template-functions-general.php');
-
-/***** Links *****/
-require($curpath . 'template-functions-links.php');
-
-/***** Author tags *****/
-require($curpath . 'template-functions-author.php');
-
-/***** Post tags *****/
-require($curpath . 'template-functions-post.php');
-
-/***** Category tags *****/
-require($curpath . 'template-functions-category.php');
-
-/***** Comment tags *****/
-require($curpath . 'comment-functions.php');
-
-require($curpath . 'feed-functions.php');
-
-?>
\ No newline at end of file
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 230851364a..97ea2724cb 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -1,8 +1,5 @@
 <?php
 
-/* This file sets various arrays and variables for use in WordPress */
-require(ABSPATH . 'wp-includes/version.php');
-
 // On which page are we ?
 $PHP_SELF = $_SERVER['PHP_SELF'];
 if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
diff --git a/wp-includes/wp-l10n.php b/wp-includes/wp-l10n.php
index 827ae1fa04..a5c0a5653c 100644
--- a/wp-includes/wp-l10n.php
+++ b/wp-includes/wp-l10n.php
@@ -1,6 +1,9 @@
 <?php
-require_once(ABSPATH . 'wp-includes/streams.php');
-require_once(ABSPATH . 'wp-includes/gettext.php');
+
+if ( defined('WPLANG') && '' != constant('WPLANG') ) {
+	require_once(ABSPATH . 'wp-includes/streams.php');
+	require_once(ABSPATH . 'wp-includes/gettext.php');
+}
 
 function get_locale() {
 	global $locale;
@@ -94,4 +97,4 @@ function load_theme_textdomain($domain) {
 	load_textdomain($domain, $mofile);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/wp-settings.php b/wp-settings.php
index 4c2870bbd0..aa351ed51f 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -35,15 +35,15 @@ define('WPINC', 'wp-includes');
 require_once (ABSPATH . WPINC . '/wp-db.php');
 
 // Table names
-$wpdb->posts               = $table_prefix . 'posts';
-$wpdb->users               = $table_prefix . 'users';
-$wpdb->categories          = $table_prefix . 'categories';
-$wpdb->post2cat            = $table_prefix . 'post2cat';
-$wpdb->comments            = $table_prefix . 'comments';
-$wpdb->links               = $table_prefix . 'links';
-$wpdb->linkcategories      = $table_prefix . 'linkcategories';
-$wpdb->options             = $table_prefix . 'options';
-$wpdb->postmeta            = $table_prefix . 'postmeta';
+$wpdb->posts            = $table_prefix . 'posts';
+$wpdb->users            = $table_prefix . 'users';
+$wpdb->categories       = $table_prefix . 'categories';
+$wpdb->post2cat         = $table_prefix . 'post2cat';
+$wpdb->comments         = $table_prefix . 'comments';
+$wpdb->links            = $table_prefix . 'links';
+$wpdb->linkcategories   = $table_prefix . 'linkcategories';
+$wpdb->options          = $table_prefix . 'options';
+$wpdb->postmeta         = $table_prefix . 'postmeta';
 
 if ( defined('CUSTOM_USER_TABLE') )
 	$wpdb->users = CUSTOM_USER_TABLE;
@@ -76,9 +76,16 @@ $wpdb->show_errors();
 require (ABSPATH . WPINC . '/functions-formatting.php');
 require (ABSPATH . WPINC . '/functions-post.php');
 require (ABSPATH . WPINC . '/classes.php');
-require (ABSPATH . WPINC . '/template-functions.php');
+require (ABSPATH . WPINC . '/template-functions-general.php');
+require (ABSPATH . WPINC . '/template-functions-links.php');
+require (ABSPATH . WPINC . '/template-functions-author.php');
+require (ABSPATH . WPINC . '/template-functions-post.php');
+require (ABSPATH . WPINC . '/template-functions-category.php');
+require (ABSPATH . WPINC . '/comment-functions.php');
+require (ABSPATH . WPINC . '/feed-functions.php');
 require (ABSPATH . WPINC . '/links.php');
 require (ABSPATH . WPINC . '/kses.php');
+require (ABSPATH . WPINC . '/version.php');
 
 if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
     $querystring_start = '?';