diff --git a/src/c/assignment.d b/src/c/assignment.d
index 7492c4724..87e524231 100644
--- a/src/c/assignment.d
+++ b/src/c/assignment.d
@@ -93,9 +93,6 @@ cl_fmakunbound(cl_object fname)
 	}
 	if (SYMBOLP(fname)) {
 		ecl_clear_compiler_properties(sym);
-#ifdef PDE
-		si_rem_sysprop(fname, @'defun');
-#endif
 		SYM_FUN(sym) = Cnil;
 		ecl_symbol_type_set(sym, ecl_symbol_type(sym) & ~stp_macro);
 	} else {
@@ -116,15 +113,6 @@ ecl_clear_compiler_properties(cl_object sym)
 	}
 }
 
-#ifdef PDE
-void
-record_source_pathname(cl_object sym, cl_object def)
-{
-  if (ecl_symbol_value(@'si::*record-source-pathname-p*') != Cnil)
-    (void)funcall(3, @'si::record-source-pathname', sym, def);
-}
-#endif /* PDE */
-
 cl_object
 si_get_sysprop(cl_object sym, cl_object prop)
 {
diff --git a/src/c/main.d b/src/c/main.d
index 29ae88bff..0d0850a6c 100644
--- a/src/c/main.d
+++ b/src/c/main.d
@@ -414,9 +414,6 @@ cl_boot(int argc, char **argv)
 		CONS(make_constant_base_string("LISP"), @'si::load-source'),
 		CONS(Cnil, @'si::load-source'));
 	ECL_SET(@'si::*load-hooks*', aux);
-#ifdef PDE
-	ECL_SET(@'si::*record-source-pathname-p*', Cnil);
-#endif
 	init_error();
 	init_macros();
 
@@ -468,9 +465,7 @@ cl_boot(int argc, char **argv)
 #ifdef ECL_OLD_LOOP
 	ADD_FEATURE("OLD-LOOP");
 #endif
-#ifdef PDE
-	ADD_FEATURE("PDE");
-#endif
+	ADD_FEATURE("ECL-PDE");
 #ifdef unix
 	ADD_FEATURE("UNIX");
 #endif
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 62f164450..7483674f2 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -477,8 +477,7 @@ static cl_object VV[VM];
 			   (*compile-verbose* verbose)
 			   (*suppress-compiler-notes* (or *suppress-compiler-notes* (not verbose)))
 			   (*suppress-compiler-warnings* (or *suppress-compiler-warnings* (not verbose)))
-			   init-name
-			   #+PDE sys:*source-pathname*)
+			   init-name)
   (declare (notinline compiler-cc))
 
   #-dlopen
@@ -503,8 +502,6 @@ static cl_object VV[VM];
     (setf output-file *compile-file-truename*))
   (setf output-file (compile-file-pathname output-file :type (if system-p :object :fasl)))
 
-  #+PDE (setq sys:*source-pathname* *compile-file-truename*)
-
   (when (and system-p load)
     (error "Cannot load system files."))
 
@@ -549,10 +546,12 @@ Cannot compile ~a."
 	  (data-init))
 
       (with-open-file (*compiler-input* *compile-file-pathname*)
-	(do ((form (read *compiler-input* nil eof)
+	(do ((ext:*source-location* (cons *compile-file-pathname* 0))
+	     (form (read *compiler-input* nil eof)
 		   (read *compiler-input* nil eof)))
 	    ((eq form eof))
-	  (t1expr form)))
+	  (t1expr form)
+	  (incf (cdr ext:*source-location*))))
 
       (when (zerop *error-count*)
 	(when *compile-verbose* (format t "~&;;; End of Pass 1.  "))
diff --git a/src/h/object.h b/src/h/object.h
index 9e4f69ec7..f041dee9e 100644
--- a/src/h/object.h
+++ b/src/h/object.h
@@ -550,9 +550,6 @@ struct ecl_codeblock {
 	const char *data_text;		/*  string with objects to be defined  */
 	int	data_text_size;
 	cl_object next;			/*  next codeblock within same library */
-#ifdef PDE
-	int	source_pathname;
-#endif
 	cl_object name;
 	cl_object links;		/*  list of symbols with linking calls  */
 };