diff --git a/lib/ChangeLog b/lib/ChangeLog
index dbd4ac1f8a..9f3ea81b19 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* external_templates: change the requirements of the xfig and
+	rasterimage templates to "graphicx" instead of "graphics".
+
 2002-05-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* templates/IEEEtran.lyx: update to 1.2.0 format from Michael
diff --git a/lib/external_templates b/lib/external_templates
index 78ad5b2a47..3047a58521 100644
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -25,7 +25,7 @@ Template RasterImage
 		Product "\\includegraphics{$$Basename.eps}"
 		UpdateCommand "convert $$Parameters $$FName $$Basename.eps"
 		UpdateResult "$$Basename.eps"
-		Requirement "graphics"
+		Requirement "graphicx"
 	FormatEnd
 	Format Ascii
 		Product "$$Contents(\"$$Basename.asc\")"
@@ -70,7 +70,7 @@ Template XFig
 		Product "\\begin{picture}(0,0)\\includegraphics{$$Basename.eps}\\end{picture}\\input{$$Basename.pstex_t}"
 		UpdateCommand "python $$Sysdir/scripts/fig2pstex.py $$FName $$Parameters"
 		UpdateResult "$$Basename.eps"
-		Requirement "graphics"	
+		Requirement "graphicx"	
 	FormatEnd
 	Format Ascii
 		Product "$$Contents(\"$$Basename.asc\")"
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 6aa1383258..6da3ef3daf 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* insetinclude.C (uniqueID): 
+	* insetgraphics.C (uniqueID): renamed from unique_id, since this
+	conflicted with some AIX headers.
+
 2002-05-31  Juergen Vigna  <jug@sad.it>
 
 	* insetert.C (get_new_label): add '...' for multi-paragraph ert
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index e11a49a047..2f58bbe252 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -128,7 +128,7 @@ string const RemoveExtension(string const & filename)
 
 namespace {
 
-string const unique_id()
+string const uniqueID()
 {
 	static unsigned int seed = 1000;
 
@@ -143,7 +143,7 @@ string const unique_id()
 
 
 InsetGraphics::InsetGraphics()
-	: graphic_label(unique_id()),
+	: graphic_label(uniqueID()),
 	  cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
 
 {}
@@ -153,7 +153,7 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig,
 			     string const & filepath,
 			     bool same_id)
 	: Inset(ig, same_id),
-	  graphic_label(unique_id()),
+	  graphic_label(uniqueID()),
 	  cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
 {
 	setParams(ig.params(), filepath);
diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 6e1c520cbc..008d510e0d 100644
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -33,7 +33,7 @@ extern BufferList bufferlist;
 
 namespace {
 
-string const unique_id()
+string const uniqueID()
 {
 	static unsigned int seed = 1000;
 
@@ -48,12 +48,12 @@ string const unique_id()
 
 
 InsetInclude::InsetInclude(Params const & p)
-	: params_(p), include_label(unique_id())
+	: params_(p), include_label(uniqueID())
 {}
 
 
 InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
-	: include_label(unique_id())
+	: include_label(uniqueID())
 {
 	params_.cparams = p;
 	params_.masterFilename_ = b.fileName();