diff --git a/rtl/win32/wininc/ascdef.inc b/rtl/win32/wininc/ascdef.inc
index 25ce283f4f..36687741ed 100644
--- a/rtl/win32/wininc/ascdef.inc
+++ b/rtl/win32/wininc/ascdef.inc
@@ -283,8 +283,7 @@ function EnumDisplaySettings(lpszDeviceName:LPCSTR; iModeNum:DWORD; lpDevMode:LP
 function SystemParametersInfo(uiAction:UINT; uiParam:UINT; pvParam:PVOID; fWinIni:UINT):WINBOOL; external 'user32' name 'SystemParametersInfoA';
 function AddFontResource(_para1:LPCSTR):longint; external 'gdi32' name 'AddFontResourceA';
 function CopyMetaFile(_para1:HMETAFILE; _para2:LPCSTR):HMETAFILE; external 'gdi32' name 'CopyMetaFileA';
-function CreateFont(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCWSTR):HFONT;
-external 'gdi32' name 'CreateFontA';
+function CreateFont(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCSTR):HFONT; external 'gdi32' name 'CreateFontA';
 function CreateFontIndirect(_para1:LPLOGFONT):HFONT; external 'gdi32' name 'CreateFontIndirectA';
 function CreateIC(_para1:LPCSTR; _para2:LPCSTR; _para3:LPCSTR; _para4:LPDEVMODE):HDC; external 'gdi32' name 'CreateICA';
 function CreateMetaFile(_para1:LPCSTR):HDC; external 'gdi32' name 'CreateMetaFileA';
@@ -491,7 +490,10 @@ end;
 
 {
   $Log$
-  Revision 1.8  2002-12-12 17:34:35  peter
+  Revision 1.9  2004-05-02 14:46:45  marco
+   * some confusion over createfont, cleaned up (bug 3056)
+
+  Revision 1.8  2002/12/12 17:34:35  peter
     * Renaming INT type to WINT
 
   Revision 1.7  2002/09/15 17:53:44  peter
diff --git a/rtl/win32/wininc/ascfun.inc b/rtl/win32/wininc/ascfun.inc
index 44fc4fe38d..fef30a3496 100644
--- a/rtl/win32/wininc/ascfun.inc
+++ b/rtl/win32/wininc/ascfun.inc
@@ -283,7 +283,7 @@ function EnumDisplaySettingsA(lpszDeviceName:LPCSTR; iModeNum:DWORD; lpDevMode:L
 function SystemParametersInfoA(uiAction:UINT; uiParam:UINT; pvParam:PVOID; fWinIni:UINT):WINBOOL; external 'user32' name 'SystemParametersInfoA';
 function AddFontResourceA(_para1:LPCSTR):longint; external 'gdi32' name 'AddFontResourceA';
 function CopyMetaFileA(_para1:HMETAFILE; _para2:LPCSTR):HMETAFILE; external 'gdi32' name 'CopyMetaFileA';
-function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCWSTR):HFONT;
+function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCSTR):HFONT;
 external 'gdi32' name 'CreateFontA';
 function CreateFontIndirectA(_para1:LPLOGFONT):HFONT; external 'gdi32' name 'CreateFontIndirectA';
 function CreateICA(_para1:LPCSTR; _para2:LPCSTR; _para3:LPCSTR; _para4:LPDEVMODE):HDC; external 'gdi32' name 'CreateICA';
@@ -491,7 +491,10 @@ end;
 
 {
   $Log$
-  Revision 1.8  2002-12-12 17:34:35  peter
+  Revision 1.9  2004-05-02 14:46:45  marco
+   * some confusion over createfont, cleaned up (bug 3056)
+
+  Revision 1.8  2002/12/12 17:34:35  peter
     * Renaming INT type to WINT
 
   Revision 1.7  2002/09/15 17:53:44  peter
diff --git a/rtl/win32/wininc/unidef.inc b/rtl/win32/wininc/unidef.inc
index 12963475f4..7862d5c9f6 100644
--- a/rtl/win32/wininc/unidef.inc
+++ b/rtl/win32/wininc/unidef.inc
@@ -351,8 +351,6 @@ function CreateDialogIndirect(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndPa
 function DialogBox(hInstance:HINST; lpTemplate:LPCWSTR; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 function DialogBoxIndirect(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 function CreateDC(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; _para4:pDEVMODE):HDC; external 'gdi32' name 'CreateDCW';
-function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCSTR):HFONT;
-  external 'gdi32' name 'CreateFontA';
 function VerInstallFile(uFlags:DWORD; szSrcFileName:LPWSTR; szDestFileName:LPWSTR; szSrcDir:LPWSTR; szDestDir:LPWSTR;szCurDir:LPWSTR; szTmpFile:LPWSTR; lpuTmpFileLen:PUINT):DWORD; external 'version' name 'VerInstallFileW';
 function GetFileVersionInfoSize(lptstrFilename:LPWSTR; lpdwHandle:LPDWORD):DWORD; external 'version' name 'GetFileVersionInfoSizeW';
 function GetFileVersionInfo(lptstrFilename:LPWSTR; dwHandle:DWORD; dwLen:DWORD; lpData:LPVOID):WINBOOL; external 'version' name 'GetFileVersionInfoW';
@@ -494,7 +492,10 @@ end;
 
 {
   $Log$
-  Revision 1.7  2002-12-12 17:34:36  peter
+  Revision 1.8  2004-05-02 14:46:45  marco
+   * some confusion over createfont, cleaned up (bug 3056)
+
+  Revision 1.7  2002/12/12 17:34:36  peter
     * Renaming INT type to WINT
 
   Revision 1.6  2002/09/15 17:53:45  peter
diff --git a/rtl/win32/wininc/unifun.inc b/rtl/win32/wininc/unifun.inc
index 1449fb233c..c19a64f6de 100644
--- a/rtl/win32/wininc/unifun.inc
+++ b/rtl/win32/wininc/unifun.inc
@@ -351,8 +351,6 @@ function CreateDialogIndirectW(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndP
 function DialogBoxW(hInstance:HINST; lpTemplate:LPCWSTR; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 function DialogBoxIndirectW(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 function CreateDCW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; _para4:pDEVMODE):HDC; external 'gdi32' name 'CreateDCW';
-function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;_para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;_para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCSTR):HFONT;
-  external 'gdi32' name 'CreateFontA';
 function VerInstallFileW(uFlags:DWORD; szSrcFileName:LPWSTR; szDestFileName:LPWSTR; szSrcDir:LPWSTR; szDestDir:LPWSTR;szCurDir:LPWSTR; szTmpFile:LPWSTR; lpuTmpFileLen:PUINT):DWORD; external 'version' name 'VerInstallFileW';
 function GetFileVersionInfoSizeW(lptstrFilename:LPWSTR; lpdwHandle:LPDWORD):DWORD; external 'version' name 'GetFileVersionInfoSizeW';
 function GetFileVersionInfoW(lptstrFilename:LPWSTR; dwHandle:DWORD; dwLen:DWORD; lpData:LPVOID):WINBOOL; external 'version' name 'GetFileVersionInfoW';
@@ -494,7 +492,10 @@ end;
 
 {
   $Log$
-  Revision 1.7  2002-12-12 17:34:36  peter
+  Revision 1.8  2004-05-02 14:46:46  marco
+   * some confusion over createfont, cleaned up (bug 3056)
+
+  Revision 1.7  2002/12/12 17:34:36  peter
     * Renaming INT type to WINT
 
   Revision 1.6  2002/09/15 17:53:45  peter