diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4068eab98..37e76e743 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-13  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* lib/uuid.c (CLSID_FileProtocol, CLSID_FtpProtocol, CLSID_GopherProtocol,
+	CLSID_HttpProtocol, CLSID_HttpSProtocol, CLSID_MkProtocol,
+	CLSID_PSUrlMonProxy, CLSID_StdURLMoniker): Remove.  Moved to
+	extras-uuid.c.
+	* lib/extras-uuid.c (CLSID_FileProtocol, CLSID_FtpProtocol, CLSID_GopherProtocol,
+	CLSID_HttpProtocol, CLSID_HttpSProtocol, CLSID_MkProtocol,
+	CLSID_PSUrlMonProxy, CLSID_StdURLMoniker): Added.
+	* lib/hlguids-uuid.c: State source of CLSIDs.
+
 2006-06-13  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* lib/Makefile.in: Added extras-uuid as an object and source.
diff --git a/winsup/w32api/lib/extras-uuid.c b/winsup/w32api/lib/extras-uuid.c
index a89c66e01..f09ba330f 100644
--- a/winsup/w32api/lib/extras-uuid.c
+++ b/winsup/w32api/lib/extras-uuid.c
@@ -24,3 +24,19 @@ DEFINE_GUID(IID_IWinInetInfo,0x79eac9d6,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0x
 DEFINE_OLEGUID(IID_IEnumSTATPROPSETSTG,0x13b,0,0);
 DEFINE_OLEGUID(IID_IEnumSTATPROPSTG,0x139,0,0);
 DEFINE_GUID(IID_IEnumSTATURL,0x3c374a42,0xbae4,0x11cf,0xbf,0x7d,0,0xaa,0,0x69,0x46,0xee);
+// file:, local: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_FileProtocol,0x79eac9e7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// ftp: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_FtpProtocol,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// gopher: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_GopherProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// http: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_HttpProtocol,0x79eac9e2,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// https: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_HttpSProtocol,0x79eac9e5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// mk: Asychronous Pluggable Protocol Handler CLSID
+DEFINE_GUID(CLSID_MkProtocol,0x79eac9e6,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// URLMoniker ProxyStub Factory CLSID
+DEFINE_GUID(CLSID_PSUrlMonProxy,0x79eac9f1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// URL Moniker CLSID
+DEFINE_GUID(CLSID_StdURLMoniker,0x79eac9e0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
diff --git a/winsup/w32api/lib/hlguids-uuid.c b/winsup/w32api/lib/hlguids-uuid.c
index 6a5d03743..05c90e526 100644
--- a/winsup/w32api/lib/hlguids-uuid.c
+++ b/winsup/w32api/lib/hlguids-uuid.c
@@ -9,5 +9,7 @@
 
 #define INITGUID
 #include <basetyps.h>
+// StdHlink CLSID
 DEFINE_GUID(CLSID_StdHlink,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+// StdHlinkBrowseContext CLSID
 DEFINE_GUID(CLSID_StdHlinkBrowseContext,0x79eac9d1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index d30f0d6c1..0a02f570e 100644
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -87,14 +87,6 @@ DEFINE_GUID(IID_IStubManager,0x6,0,0,0xc0,0,0,0,0,0,0,0x46);
 * DEFINE_GUID(CATID_SafeForScripting,0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0,0xaa,0,0x6c,0x42,0xc4);
 * DEFINE_GUID(CLSID_AllClasses,0x330,0,0,0xc0,0,0,0,0,0,0,0x46);
 * DEFINE_GUID(CLSID_CurrentUserClasses,0x332,0,0,0xc0,0,0,0,0,0,0,0x46);
-* DEFINE_GUID(CLSID_FileProtocol,0x79eac9e7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_FtpProtocol,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_GopherProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_HttpProtocol,0x79eac9e2,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_HttpSProtocol,0x79eac9e5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_MkProtocol,0x79eac9e6,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_PSUrlMonProxy,0x79eac9f1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-* DEFINE_GUID(CLSID_StdURLMoniker,0x79eac9e0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 * DEFINE_GUID(CLSID_StdURLProtocol,0x79eac9e1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 * DEFINE_GUID(FLAGID_Internet,0x96300da0,0x2bab,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
 * DEFINE_GUID(GUID_HasPathProperties,0x2de81,0,0,0xc0,0,0,0,0,0,0,0x46);