diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 94fb8ad54b4..2558619a4f1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-31  David Malcolm  <dmalcolm@redhat.com>
+
+	Manual part of renaming of symtab_node_base to symtab_node.
+
+	* ipa-ref.h (symtab_node): Remove typedef to pointer type, as it
+	clashes with the preferred name for the base class.
+	(const_symtab_node): Remove redundant typedef.
+
 2013-10-31  Jakub Jelinek  <jakub@redhat.com>
 
 	* optabs.c (expand_vec_perm): Avoid vector mode punning
diff --git a/gcc/ipa-ref.h b/gcc/ipa-ref.h
index dc6e238568c..d5ea7ee363d 100644
--- a/gcc/ipa-ref.h
+++ b/gcc/ipa-ref.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 struct cgraph_node;
 struct varpool_node;
 class symtab_node_base;
-typedef symtab_node_base *symtab_node;
-typedef const symtab_node_base *const_symtab_node;
 
 
 /* How the reference is done.  */