diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6cb19b09f..0e7f9415f 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-12  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+	* include/oleauto.h (VarR8FromDec, VarDecFromR8): Add prototypes.
+	* include/winbase.h (TerminateJobObject,
+	AssignProcessToJobObject): Likewise.
+	* include/servprov.h: New header.
+	* lib/test.c: Include servprov.h.
+
 2003-05-10  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/shlguid.h (CGID_ShellServiceObject): Declare.
@@ -145,7 +153,7 @@
 
 	* lib/uuid.c (IID_IHTML*): Add new GUID definitions.
 	* include/mshtml.h (IHTMLElementCollection, IHTMLLinkElement,
-	IHTMLImgElement): Add intetface definitions.
+	IHTMLImgElement): Add interface definitions.
 
 2003-03-29  Danny Smith  <dannysmith@users.sourceforge.net>
 
diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h
index 3e881cdea..d28067c7a 100644
--- a/winsup/w32api/include/oleauto.h
+++ b/winsup/w32api/include/oleauto.h
@@ -190,6 +190,7 @@ WINOLEAUTAPI VarR8FromDate(DATE,double*);
 WINOLEAUTAPI VarR8FromStr(OLECHAR*,LCID,unsigned long,double*);
 WINOLEAUTAPI VarR8FromDisp(LPDISPATCH*,LCID,double*);
 WINOLEAUTAPI VarR8FromBool(VARIANT_BOOL,double*);
+WINOLEAUTAPI VarR8FromDec(DECIMAL*,double*);
 WINOLEAUTAPI VarDateFromUI1(unsigned char,DATE*);
 WINOLEAUTAPI VarDateFromI2(short,DATE*);
 WINOLEAUTAPI VarDateFromI4(long,DATE*);
@@ -226,6 +227,7 @@ WINOLEAUTAPI VarBoolFromDate(DATE,VARIANT_BOOL*);
 WINOLEAUTAPI VarBoolFromCy(CY,VARIANT_BOOL*);
 WINOLEAUTAPI VarBoolFromStr(OLECHAR*,LCID,unsigned long,VARIANT_BOOL*);
 WINOLEAUTAPI VarBoolFromDisp(LPDISPATCH*,LCID,VARIANT_BOOL*);
+WINOLEAUTAPI VarDecFromR8(double,DECIMAL*);
 WINOLEAUTAPI_(ULONG) LHashValOfNameSysA(SYSKIND,LCID,const char*);
 WINOLEAUTAPI_(ULONG) LHashValOfNameSys(SYSKIND,LCID,const OLECHAR*);
 WINOLEAUTAPI LoadTypeLib(const OLECHAR*,LPTYPELIB*);
diff --git a/winsup/w32api/include/servprov.h b/winsup/w32api/include/servprov.h
new file mode 100644
index 000000000..b12e5d7a7
--- /dev/null
+++ b/winsup/w32api/include/servprov.h
@@ -0,0 +1,26 @@
+#ifndef _SERVPROV_H
+#define _SERVPROV_H
+#define _OLEIDL_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EXTERN_C const IID IID_IServiceProvider;
+#undef INTERFACE
+#define INTERFACE IServiceProvider
+DECLARE_INTERFACE_(IServiceProvider,IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 141c8f1b8..5b4b37080 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1039,6 +1039,8 @@ HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD);
 #if (_WIN32_WINNT >= 0x0500)
 HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR);
 HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);
+BOOL WINAPI TerminateJobObject(HANDLE,UINT);
+BOOL WINAPI AssignProcessToJobObject(HANDLE,HANDLE);
 #endif
 HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
 HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index de9a842b2..3ce1e4ad3 100644
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -88,6 +88,7 @@
 #include <rpcproxy.h>
 #include <exdisp.h>
 #include <mshtml.h>
+#include <servprov.h>
 
 #else
 #undef BOOL