diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index 0a21469bdc..902fe0ce66 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -2,7 +2,7 @@
 
 // Template functions
 
-function comments_template( $show ) {
+function comments_template() {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment;
 
 	if ( is_single() || is_page() || $withcomments ) :
@@ -69,9 +69,9 @@ function comments_popup_script($width=400, $height=400, $file='') {
 
 		if (empty ($file)) {
 			if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
-				require( TEMPLATEPATH . '/comments-popup.php');
+				$wpcommentspopupfile = str_replace(ABSPATH, '', TEMPLATEPATH . '/comments-popup.php');
 			else
-				require( ABSPATH . 'wp-includes/wp-comments-popup.php');
+				$wpcommentspopupfile = 'wp-includes/wp-comments-popup.php';
 		} else {
 			$wpcommentspopupfile = $file;
 		}
diff --git a/wp-includes/wp-comments-popup.php b/wp-includes/wp-comments-popup.php
index d27bb42db7..d4ee201448 100644
--- a/wp-includes/wp-comments-popup.php
+++ b/wp-includes/wp-comments-popup.php
@@ -1,7 +1,7 @@
 <?php 
 /* Don't remove these lines. */
 $blog = 1;
-require ('wp-blog-header.php');
+require ('../wp-blog-header.php');
 add_filter('comment_text', 'popuplinks');
 foreach ($posts as $post) { start_wp();
 ?>